From 556ce37df6505a374d49f06d050ae8dfade751d5 Mon Sep 17 00:00:00 2001
From: Riccardo Pittau <elfosardo@gmail.com>
Date: Tue, 21 Apr 2020 16:20:29 +0200
Subject: [PATCH] Upgrade flake8-import-order version to 0.17.1

Full py3 compatible version.
Add all Python3 modules to stdlib list.
Also includes fix to an enum34 dependency bug.

Change-Id: Ie260ace9bc1d8d5bc89e346c5eb4007fbbed2d14
---
 bifrost/inventory.py                                  | 2 +-
 bifrost/tests/functional/test_inventory_functional.py | 1 +
 bifrost/tests/unit/test_inventory.py                  | 1 -
 lower-constraints.txt                                 | 1 +
 playbooks/roles/bifrost-test-dhcp/files/test-dhcp.py  | 1 +
 test-requirements.txt                                 | 2 ++
 tox.ini                                               | 3 +++
 7 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/bifrost/inventory.py b/bifrost/inventory.py
index bf9d978e1..55d646ad5 100755
--- a/bifrost/inventory.py
+++ b/bifrost/inventory.py
@@ -19,10 +19,10 @@ import csv
 import json
 import os
 import sys
-import yaml
 
 from oslo_config import cfg
 from oslo_log import log
+import yaml
 
 try:
     import shade
diff --git a/bifrost/tests/functional/test_inventory_functional.py b/bifrost/tests/functional/test_inventory_functional.py
index 9e188e969..c94493c40 100644
--- a/bifrost/tests/functional/test_inventory_functional.py
+++ b/bifrost/tests/functional/test_inventory_functional.py
@@ -16,6 +16,7 @@
 # limitations under the License.
 
 import json
+
 import yaml
 
 from bifrost.tests import base
diff --git a/bifrost/tests/unit/test_inventory.py b/bifrost/tests/unit/test_inventory.py
index 409110d25..64db5175a 100644
--- a/bifrost/tests/unit/test_inventory.py
+++ b/bifrost/tests/unit/test_inventory.py
@@ -22,7 +22,6 @@ Tests for `inventory` module.
 from unittest import mock
 
 from bifrost import inventory
-
 from bifrost.tests import base
 
 
diff --git a/lower-constraints.txt b/lower-constraints.txt
index bfa256786..26e6afd47 100644
--- a/lower-constraints.txt
+++ b/lower-constraints.txt
@@ -15,6 +15,7 @@ dulwich==0.19.0
 extras==1.0.0
 fixtures==3.0.0
 flake8==2.5.5
+flake8-import-order==0.17.1
 hacking==0.12.0
 idna==2.6
 imagesize==1.0.0
diff --git a/playbooks/roles/bifrost-test-dhcp/files/test-dhcp.py b/playbooks/roles/bifrost-test-dhcp/files/test-dhcp.py
index f8567a91e..62fdec3c1 100644
--- a/playbooks/roles/bifrost-test-dhcp/files/test-dhcp.py
+++ b/playbooks/roles/bifrost-test-dhcp/files/test-dhcp.py
@@ -14,6 +14,7 @@
 # limitations under the License.
 
 from __future__ import print_function
+
 import csv
 import json
 import os
diff --git a/test-requirements.txt b/test-requirements.txt
index 64ddfa363..e806fc180 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -13,3 +13,5 @@ testscenarios>=0.4 # Apache-2.0/BSD
 testtools>=2.2.0 # MIT
 PyYAML>=3.12 # MIT
 Pygments>=2.2.0 # BSD license
+flake8-import-order>=0.17.1 # LGPLv3
+
diff --git a/tox.ini b/tox.ini
index 2fc920f19..5c43f991d 100644
--- a/tox.ini
+++ b/tox.ini
@@ -62,6 +62,9 @@ ignore = F403,H102,H303,W504
 # [H106] Don't put vim configuration in source files.
 enable-extensions=H106
 exclude=.venv,.git,.tox,dist,doc,*lib/python*,*egg,build,os_ironic.py,os_ironic_node.py,os_ironic_inspect.py,os_keystone_service.py
+import-order-style = pep8
+application-import-names = bifrost
+filename = *.py
 
 [testenv:lower-constraints]
 deps =