From ea97d2b73317aa19ea5e2f061154addaed92e0ea Mon Sep 17 00:00:00 2001 From: "John L. Villalovos" Date: Thu, 16 Feb 2017 10:11:06 -0800 Subject: [PATCH] Use flake8-import-order Use the flake8 plugin flake8-import-order to check import ordering. It can do it automatically and don't need reviewers to check it. Change-Id: I9ced9c297273db0eec6ab3995b663b1e8dffe87d --- ironic_inspector/dbsync.py | 2 +- ironic_inspector/main.py | 2 +- ironic_inspector/migrations/env.py | 3 ++- ironic_inspector/node_cache.py | 2 +- ironic_inspector/process.py | 3 +-- ironic_inspector/test/functional.py | 13 ++++++------- .../test/inspector_tempest_plugin/tests/manager.py | 2 +- ironic_inspector/test/unit/test_common_ironic.py | 2 +- ironic_inspector/test/unit/test_node_cache.py | 2 +- .../test/unit/test_plugins_discovery.py | 1 + test-requirements.txt | 1 + tox.ini | 1 + 12 files changed, 18 insertions(+), 16 deletions(-) diff --git a/ironic_inspector/dbsync.py b/ironic_inspector/dbsync.py index 3a021ff9b..4d168bd57 100644 --- a/ironic_inspector/dbsync.py +++ b/ironic_inspector/dbsync.py @@ -14,12 +14,12 @@ # under the License. import os -import six import sys from alembic import command as alembic_command from alembic import config as alembic_config from alembic import util as alembic_util +import six from oslo_config import cfg from oslo_log import log diff --git a/ironic_inspector/main.py b/ironic_inspector/main.py index 09fd14d75..85b34ae73 100644 --- a/ironic_inspector/main.py +++ b/ironic_inspector/main.py @@ -11,7 +11,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -import eventlet +import eventlet # noqa eventlet.monkey_patch() import functools diff --git a/ironic_inspector/migrations/env.py b/ironic_inspector/migrations/env.py index 3c9c88a1f..775d1f979 100644 --- a/ironic_inspector/migrations/env.py +++ b/ironic_inspector/migrations/env.py @@ -12,9 +12,10 @@ # License for the specific language governing permissions and limitations # under the License. -from alembic import context from logging.config import fileConfig +from alembic import context + from ironic_inspector import db # this is the Alembic Config object, which provides diff --git a/ironic_inspector/node_cache.py b/ironic_inspector/node_cache.py index 78db0ed16..64546aec4 100644 --- a/ironic_inspector/node_cache.py +++ b/ironic_inspector/node_cache.py @@ -18,7 +18,6 @@ import contextlib import copy import datetime import json -import six from automaton import exceptions as automaton_errors from ironicclient import exceptions @@ -29,6 +28,7 @@ from oslo_utils import excutils from oslo_utils import reflection from oslo_utils import timeutils from oslo_utils import uuidutils +import six from sqlalchemy.orm import exc as orm_errors from sqlalchemy import text diff --git a/ironic_inspector/process.py b/ironic_inspector/process.py index e7bc57546..4384cdde5 100644 --- a/ironic_inspector/process.py +++ b/ironic_inspector/process.py @@ -15,11 +15,10 @@ import copy import datetime +import json import os import eventlet -import json - from oslo_config import cfg from oslo_serialization import base64 from oslo_utils import excutils diff --git a/ironic_inspector/test/functional.py b/ironic_inspector/test/functional.py index 665a36f42..f0f6ab91a 100644 --- a/ironic_inspector/test/functional.py +++ b/ironic_inspector/test/functional.py @@ -11,28 +11,27 @@ # See the License for the specific language governing permissions and # limitations under the License. -import eventlet +import eventlet # noqa eventlet.monkey_patch() -import datetime -import time - import contextlib import copy +import datetime import json import os -import pytz import shutil -import six -from six.moves import urllib import tempfile +import time import unittest import mock from oslo_config import cfg from oslo_config import fixture as config_fixture from oslo_utils import timeutils +import pytz import requests +import six +from six.moves import urllib from ironic_inspector.common import ironic as ir_utils from ironic_inspector.common import swift diff --git a/ironic_inspector/test/inspector_tempest_plugin/tests/manager.py b/ironic_inspector/test/inspector_tempest_plugin/tests/manager.py index 5856716a1..343ac9fef 100644 --- a/ironic_inspector/test/inspector_tempest_plugin/tests/manager.py +++ b/ironic_inspector/test/inspector_tempest_plugin/tests/manager.py @@ -12,9 +12,9 @@ import json import os -import six import time +import six import tempest from tempest import config from tempest.lib.common.api_version_utils import LATEST_MICROVERSION diff --git a/ironic_inspector/test/unit/test_common_ironic.py b/ironic_inspector/test/unit/test_common_ironic.py index 12c69e071..c9b7ba2ae 100644 --- a/ironic_inspector/test/unit/test_common_ironic.py +++ b/ironic_inspector/test/unit/test_common_ironic.py @@ -11,11 +11,11 @@ # See the License for the specific language governing permissions and # limitations under the License. -import mock import socket import unittest from ironicclient import client +import mock from oslo_config import cfg from ironic_inspector.common import ironic as ir_utils diff --git a/ironic_inspector/test/unit/test_node_cache.py b/ironic_inspector/test/unit/test_node_cache.py index c70ae069a..d06371ad4 100644 --- a/ironic_inspector/test/unit/test_node_cache.py +++ b/ironic_inspector/test/unit/test_node_cache.py @@ -14,7 +14,6 @@ import copy import datetime import json -import six import unittest import automaton @@ -23,6 +22,7 @@ from oslo_config import cfg import oslo_db from oslo_utils import timeutils from oslo_utils import uuidutils +import six from ironic_inspector.common import ironic as ir_utils from ironic_inspector import db diff --git a/ironic_inspector/test/unit/test_plugins_discovery.py b/ironic_inspector/test/unit/test_plugins_discovery.py index 7acb38e90..656ba0766 100644 --- a/ironic_inspector/test/unit/test_plugins_discovery.py +++ b/ironic_inspector/test/unit/test_plugins_discovery.py @@ -11,6 +11,7 @@ # under the License. import copy + import mock from ironic_inspector.common import ironic as ir_utils diff --git a/test-requirements.txt b/test-requirements.txt index a7c17d79f..e62805490 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -3,6 +3,7 @@ # process, which may cause wedges in the gate later. coverage>=4.0 # Apache-2.0 doc8 # Apache-2.0 +flake8-import-order==0.11 # LGPLv3 hacking<0.13,>=0.12.0 # Apache-2.0 mock>=2.0 # BSD sphinx>=1.5.1 # BSD diff --git a/tox.ini b/tox.ini index 9c350f67b..136d0501f 100644 --- a/tox.ini +++ b/tox.ini @@ -51,6 +51,7 @@ max-complexity=15 # [H203] Use assertIs(Not)None to check for None. # [H904] Delay string interpolations at logging calls. enable-extensions=H106,H203,H904 +import-order-style = pep8 [hacking] import_exceptions = ironicclient.exceptions,ironic_inspector.common.i18n