Merge "Use flake8-import-order"

ironic_python_agent/agent.py

@@ -19,6 +19,7 @@ import select
 import socket
 import threading
 import time
+from wsgiref import simple_server
 
 from oslo_concurrency import processutils
 from oslo_config import cfg
@@ -27,7 +28,6 @@ from oslo_utils import netutils
 import pkg_resources
 from six.moves.urllib import parse as urlparse
 from stevedore import extension
-from wsgiref import simple_server
 
 from ironic_python_agent.api import app
 from ironic_python_agent import encoding

ironic_python_agent/extensions/standby.py

@@ -14,13 +14,13 @@
 
 import hashlib
 import os
-import requests
-import six
 import time
 
 from oslo_concurrency import processutils
 from oslo_config import cfg
 from oslo_log import log
+import requests
+import six
 
 from ironic_lib import disk_utils
 from ironic_python_agent import errors

ironic_python_agent/tests/unit/extensions/test_image.py

@@ -13,11 +13,11 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-import mock
 import os
 import shutil
 import tempfile
 
+import mock
 from oslo_concurrency import processutils
 from oslotest import base as test_base
 

ironic_python_agent/tests/unit/test_agent.py

@@ -14,6 +14,7 @@
 
 import socket
 import time
+from wsgiref import simple_server
 
 import mock
 from oslo_concurrency import processutils
@@ -22,7 +23,6 @@ from oslo_serialization import jsonutils
 from oslotest import base as test_base
 import pkg_resources
 from stevedore import extension
-from wsgiref import simple_server
 
 from ironic_python_agent import agent
 from ironic_python_agent import encoding

ironic_python_agent/tests/unit/test_utils.py

@@ -21,13 +21,13 @@ import shutil
 import subprocess
 import tarfile
 import tempfile
-import testtools
 
 from ironic_lib import utils as ironic_utils
 import mock
 from oslo_concurrency import processutils
 from oslo_serialization import base64
 from oslotest import base as test_base
+import testtools
 
 from ironic_python_agent import errors
 from ironic_python_agent import utils

test-requirements.txt

@@ -9,6 +9,8 @@ python-subunit>=0.0.18 # Apache-2.0/BSD
 oslotest>=1.10.0 # Apache-2.0
 os-testr>=0.8.0 # Apache-2.0
 bashate>=0.2 # Apache-2.0
+flake8-import-order==0.11 # LGPLv3
+
 # Doc requirements
 doc8 # Apache-2.0
 sphinx>=1.5.1 # BSD

tox.ini

@@ -61,6 +61,7 @@ commands = sphinx-build -a -E -W -d releasenotes/build/doctrees -b html releasen
 [flake8]
 ignore = E129
 exclude = .venv,.git,.tox,dist,doc,*lib/python*,*egg,build,tools,imagebuild/tinyipa/tinyipafinal,imagebuild/tinyipa/tinyipabuild
+import-order-style = pep8
 # [H106] Don’t put vim configuration in source files.
 # [H203] Use assertIs(Not)None to check for None.
 # [H904] Delay string interpolations at logging calls.