diff --git a/ironic_lib/disk_utils.py b/ironic_lib/disk_utils.py index 98917f3a..9dad45a3 100644 --- a/ironic_lib/disk_utils.py +++ b/ironic_lib/disk_utils.py @@ -18,10 +18,8 @@ import logging import math import os import re -import requests import shlex import shutil -import six import stat import tempfile import time @@ -32,6 +30,8 @@ from oslo_serialization import base64 from oslo_utils import excutils from oslo_utils import imageutils from oslo_utils import units +import requests +import six from ironic_lib.common.i18n import _ from ironic_lib.common.i18n import _LE diff --git a/ironic_lib/exception.py b/ironic_lib/exception.py index de4e0412..bdcb14bd 100644 --- a/ironic_lib/exception.py +++ b/ironic_lib/exception.py @@ -23,10 +23,10 @@ SHOULD include dedicated exception logging. """ import logging -import six from oslo_config import cfg from oslo_utils import excutils +import six from ironic_lib.common.i18n import _ from ironic_lib.common.i18n import _LE diff --git a/ironic_lib/tests/test_disk_utils.py b/ironic_lib/tests/test_disk_utils.py index 5d05f236..85e53335 100644 --- a/ironic_lib/tests/test_disk_utils.py +++ b/ironic_lib/tests/test_disk_utils.py @@ -14,12 +14,12 @@ # under the License. import gzip -import mock import os import shutil import stat import tempfile +import mock from oslo_concurrency import processutils from oslo_config import cfg from oslo_serialization import base64 diff --git a/test-requirements.txt b/test-requirements.txt index 20d1d202..22102ee2 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -4,6 +4,7 @@ coverage>=4.0 # Apache-2.0 eventlet!=0.18.3,>=0.18.2 # MIT +flake8-import-order==0.11 # LGPLv3 hacking<0.12,>=0.11.0 # Apache-2.0 mock>=2.0 # BSD os-testr>=0.8.0 # Apache-2.0 diff --git a/tox.ini b/tox.ini index 197cef41..2437105b 100644 --- a/tox.ini +++ b/tox.ini @@ -18,6 +18,7 @@ commands = ostestr {posargs} show-source = True ignore = E129 exclude = .venv,.tox,dist,doc,*.egg,.update-venv +import-order-style = pep8 [testenv:pep8] commands =