Merge "Upgrade flake8-import-order version to 0.17.1"
diff --git a/ironic_tempest_plugin/services/introspection_client.py b/ironic_tempest_plugin/services/introspection_client.py
index f82aed6..6076dd3 100644
--- a/ironic_tempest_plugin/services/introspection_client.py
+++ b/ironic_tempest_plugin/services/introspection_client.py
@@ -10,11 +10,12 @@
# License for the specific language governing permissions and limitations
# under the License.
-from ironic_tempest_plugin.services.baremetal import base
from tempest import clients
from tempest.common import credentials_factory as common_creds
from tempest import config
+from ironic_tempest_plugin.services.baremetal import base
+
CONF = config.CONF
diff --git a/ironic_tempest_plugin/tests/scenario/introspection_manager.py b/ironic_tempest_plugin/tests/scenario/introspection_manager.py
index 3eb3f43..71fa001 100644
--- a/ironic_tempest_plugin/tests/scenario/introspection_manager.py
+++ b/ironic_tempest_plugin/tests/scenario/introspection_manager.py
@@ -14,7 +14,6 @@
import time
from oslo_serialization import jsonutils as json
-
import six
import tempest
from tempest import config
@@ -24,8 +23,7 @@
import ironic_tempest_plugin
from ironic_tempest_plugin import exceptions
-from ironic_tempest_plugin.services import \
- introspection_client
+from ironic_tempest_plugin.services import introspection_client
from ironic_tempest_plugin.tests.api.admin.api_microversion_fixture import \
APIMicroversionFixture as IronicMicroversionFixture
from ironic_tempest_plugin.tests.scenario.baremetal_manager import \
diff --git a/test-requirements.txt b/test-requirements.txt
index 7864a21..682db80 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -6,6 +6,7 @@
stestr>=1.0.0 # Apache-2.0
coverage!=4.4,>=4.0 # Apache-2.0
+flake8-import-order>=0.17.1 # LGPLv3
sphinx!=1.6.6,!=1.6.7,>=1.6.2 # BSD
openstackdocstheme>=1.20.0 # Apache-2.0
diff --git a/tox.ini b/tox.ini
index 8c34e01..0f5ad24 100644
--- a/tox.ini
+++ b/tox.ini
@@ -46,7 +46,10 @@
# [E129] Visually indented line with same indent as next logical line.
# [W503] Line break occurred before a binary operator. Conflicts with W504.
ignore = E129,W503
-
show-source = True
builtins = _
exclude=.venv,.git,.tox,dist,doc,*lib/python*,*egg,build
+import-order-style = pep8
+application-import-names = ironic_tempest_plugin
+filename = *.py
+