From 389cab712e3204261132f780696bded1e7ce67d4 Mon Sep 17 00:00:00 2001 From: Riccardo Pittau Date: Mon, 20 Apr 2020 10:04:17 +0200 Subject: [PATCH] Check import order Restore pep 8check for import order. Set 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: I989a84e362a18225c6f79580b22bb028d3e265ff --- ironicclient/osc/plugin.py | 3 ++- .../tests/functional/osc/v1/test_baremetal_node_basic.py | 3 ++- .../tests/functional/osc/v1/test_baremetal_portgroup_basic.py | 1 - ironicclient/tests/unit/common/test_http.py | 3 +-- ironicclient/tests/unit/osc/v1/test_baremetal_chassis.py | 2 +- ironicclient/tests/unit/osc/v1/test_baremetal_create.py | 1 - ironicclient/tests/unit/osc/v1/test_baremetal_node.py | 2 +- ironicclient/tests/unit/test_client.py | 1 - ironicclient/tests/unit/v1/test_create_resources.py | 1 + lower-constraints.txt | 1 + test-requirements.txt | 1 + tox.ini | 3 +++ 12 files changed, 13 insertions(+), 9 deletions(-) diff --git a/ironicclient/osc/plugin.py b/ironicclient/osc/plugin.py index 832578e94..1747eeaf2 100644 --- a/ironicclient/osc/plugin.py +++ b/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' diff --git a/ironicclient/tests/functional/osc/v1/test_baremetal_node_basic.py b/ironicclient/tests/functional/osc/v1/test_baremetal_node_basic.py index 809c7573d..f8ef6d95c 100644 --- a/ironicclient/tests/functional/osc/v1/test_baremetal_node_basic.py +++ b/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 diff --git a/ironicclient/tests/functional/osc/v1/test_baremetal_portgroup_basic.py b/ironicclient/tests/functional/osc/v1/test_baremetal_portgroup_basic.py index ee5b5a552..97941f60f 100644 --- a/ironicclient/tests/functional/osc/v1/test_baremetal_portgroup_basic.py +++ b/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 diff --git a/ironicclient/tests/unit/common/test_http.py b/ironicclient/tests/unit/common/test_http.py index 9f603365b..5b5e77489 100644 --- a/ironicclient/tests/unit/common/test_http.py +++ b/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 diff --git a/ironicclient/tests/unit/osc/v1/test_baremetal_chassis.py b/ironicclient/tests/unit/osc/v1/test_baremetal_chassis.py index 502f86dc7..94fa03a47 100644 --- a/ironicclient/tests/unit/osc/v1/test_baremetal_chassis.py +++ b/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 diff --git a/ironicclient/tests/unit/osc/v1/test_baremetal_create.py b/ironicclient/tests/unit/osc/v1/test_baremetal_create.py index 893de9f12..69da2e2ae 100644 --- a/ironicclient/tests/unit/osc/v1/test_baremetal_create.py +++ b/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 diff --git a/ironicclient/tests/unit/osc/v1/test_baremetal_node.py b/ironicclient/tests/unit/osc/v1/test_baremetal_node.py index 04139da1d..ee16a76a8 100644 --- a/ironicclient/tests/unit/osc/v1/test_baremetal_node.py +++ b/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 diff --git a/ironicclient/tests/unit/test_client.py b/ironicclient/tests/unit/test_client.py index 048afbc5e..2b9f377ce 100644 --- a/ironicclient/tests/unit/test_client.py +++ b/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 diff --git a/ironicclient/tests/unit/v1/test_create_resources.py b/ironicclient/tests/unit/v1/test_create_resources.py index 455877f82..c12af70a4 100644 --- a/ironicclient/tests/unit/v1/test_create_resources.py +++ b/ironicclient/tests/unit/v1/test_create_resources.py @@ -11,6 +11,7 @@ # under the License. import builtins + import jsonschema import mock diff --git a/lower-constraints.txt b/lower-constraints.txt index 918571e19..ef7d3a994 100644 --- a/lower-constraints.txt +++ b/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 diff --git a/test-requirements.txt b/test-requirements.txt index de50d724b..c31e982dd 100644 --- a/test-requirements.txt +++ b/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 diff --git a/tox.ini b/tox.ini index 3b3a322c2..d262bfced 100644 --- a/tox.ini +++ b/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