Merge "Check import order"

ironicclient/osc/plugin.py

@@ -19,9 +19,10 @@
 import argparse
 import logging
 
-from ironicclient.common import http
 from osc_lib import utils
 
+from ironicclient.common import http
+
 LOG = logging.getLogger(__name__)
 
 CLIENT_CLASS = 'ironicclient.v1.client.Client'

ironicclient/tests/functional/osc/v1/test_baremetal_node_basic.py

@@ -12,8 +12,9 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-import ddt
 import json
+
+import ddt
 from tempest.lib.common.utils import data_utils
 
 from ironicclient.tests.functional.osc.v1 import base

ironicclient/tests/functional/osc/v1/test_baremetal_portgroup_basic.py

@@ -13,7 +13,6 @@
 #    under the License.
 
 import ddt
-
 from tempest.lib.common.utils import data_utils
 
 from ironicclient.tests.functional.osc.v1 import base

ironicclient/tests/unit/common/test_http.py

@@ -16,11 +16,10 @@
 from http import client as http_client
 import time
 
+from keystoneauth1 import exceptions as kexc
 import mock
 from oslo_serialization import jsonutils
 
-from keystoneauth1 import exceptions as kexc
-
 from ironicclient.common import filecache
 from ironicclient.common import http
 from ironicclient import exc

ironicclient/tests/unit/osc/v1/test_baremetal_chassis.py

@@ -15,8 +15,8 @@
 #
 
 import copy
-import mock
 
+import mock
 from osc_lib.tests import utils as oscutils
 
 from ironicclient import exc

ironicclient/tests/unit/osc/v1/test_baremetal_create.py

@@ -12,7 +12,6 @@
 #
 
 import mock
-
 from osc_lib.tests import utils as oscutils
 
 from ironicclient.osc.v1 import baremetal_create

ironicclient/tests/unit/osc/v1/test_baremetal_node.py

@@ -15,8 +15,8 @@
 #
 
 import copy
-import mock
 
+import mock
 from osc_lib.tests import utils as oscutils
 
 from ironicclient.common import utils as commonutils

ironicclient/tests/unit/test_client.py

@@ -11,7 +11,6 @@
 #    under the License.
 
 import mock
-
 from openstack import config
 
 from ironicclient import client as iroclient

ironicclient/tests/unit/v1/test_create_resources.py

@@ -11,6 +11,7 @@
 #   under the License.
 
 import builtins
+
 import jsonschema
 import mock
 

lower-constraints.txt

@@ -20,6 +20,7 @@ extras==1.0.0
 fasteners==0.7.0
 fixtures==3.0.0
 flake8==2.5.5
+flake8-import-order==0.17.1
 future==0.16.0
 hacking==3.0.0
 idna==2.6

test-requirements.txt

@@ -4,6 +4,7 @@
 hacking>=3.0.0,<3.1.0 # Apache-2.0
 coverage!=4.4,>=4.0 # Apache-2.0
 doc8>=0.6.0 # Apache-2.0
+flake8-import-order>=0.17.1 # LGPLv3
 fixtures>=3.0.0 # Apache-2.0/BSD
 requests-mock>=1.2.0 # Apache-2.0
 mock>=2.0.0 # BSD

tox.ini

@@ -81,6 +81,9 @@ exclude = .venv,.git,.tox,dist,doc,*lib/python*,*egg,build,tools
 # [H210] Require 'autospec', 'spec', or 'spec_set' in mock.patch/mock.patch.object calls
 # [H904] Delay string interpolations at logging calls.
 enable-extensions=H106,H203,H204,H205,H210,H904
+filename = *.py
+import-order-style = pep8
+application-import-names = ironicclient
 
 [hacking]
 import_exceptions = testtools.matchers, ironicclient.common.i18n