From d0a2e13f10e517daf90e10e394362545ffcfa6c1 Mon Sep 17 00:00:00 2001 From: "John L. Villalovos" Date: Thu, 16 Feb 2017 09:35:28 -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: I821fd7467f6c5cc1487149297f26e4ad539cf25d --- ironic/conductor/manager.py | 2 +- ironic/drivers/modules/console_utils.py | 2 +- ironic/objects/fields.py | 2 +- ironic/tests/unit/db/sqlalchemy/test_migrations.py | 2 +- ironic/tests/unit/drivers/modules/oneview/test_deploy.py | 2 +- ironic/tests/unit/drivers/modules/test_console_utils.py | 2 +- ironic/tests/unit/objects/test_chassis.py | 1 + ironic/tests/unit/objects/test_node.py | 1 + ironic/tests/unit/objects/test_objects.py | 2 +- ironic/tests/unit/objects/test_port.py | 1 + ironic/tests/unit/objects/test_portgroup.py | 1 + test-requirements.txt | 1 + tox.ini | 1 + 13 files changed, 13 insertions(+), 7 deletions(-) diff --git a/ironic/conductor/manager.py b/ironic/conductor/manager.py index eb1bdbbf2a..c22513cfb2 100644 --- a/ironic/conductor/manager.py +++ b/ironic/conductor/manager.py @@ -44,7 +44,6 @@ notifying Neutron of a change, etc. import collections import datetime -from six.moves import queue import tempfile import eventlet @@ -55,6 +54,7 @@ from oslo_log import log import oslo_messaging as messaging from oslo_utils import excutils from oslo_utils import uuidutils +from six.moves import queue from ironic.common import driver_factory from ironic.common import exception diff --git a/ironic/drivers/modules/console_utils.py b/ironic/drivers/modules/console_utils.py index 55358a66e7..07a6b800f6 100644 --- a/ironic/drivers/modules/console_utils.py +++ b/ironic/drivers/modules/console_utils.py @@ -21,7 +21,6 @@ Ironic console utilities. import errno import os -import psutil import signal import subprocess import time @@ -31,6 +30,7 @@ from oslo_log import log as logging from oslo_service import loopingcall from oslo_utils import fileutils from oslo_utils import netutils +import psutil from ironic.common import exception from ironic.common.i18n import _, _LE, _LW diff --git a/ironic/objects/fields.py b/ironic/objects/fields.py index 2927596db5..3e57a79a85 100644 --- a/ironic/objects/fields.py +++ b/ironic/objects/fields.py @@ -16,9 +16,9 @@ import ast import hashlib import inspect -import six from oslo_versionedobjects import fields as object_fields +import six from ironic.common import utils diff --git a/ironic/tests/unit/db/sqlalchemy/test_migrations.py b/ironic/tests/unit/db/sqlalchemy/test_migrations.py index 8d5a82790e..af11d8b150 100644 --- a/ironic/tests/unit/db/sqlalchemy/test_migrations.py +++ b/ironic/tests/unit/db/sqlalchemy/test_migrations.py @@ -36,9 +36,9 @@ For postgres on Ubuntu this can be done with the following commands: import collections import contextlib -import fixtures from alembic import script +import fixtures import mock from oslo_db import exception as db_exc from oslo_db.sqlalchemy import enginefacade diff --git a/ironic/tests/unit/drivers/modules/oneview/test_deploy.py b/ironic/tests/unit/drivers/modules/oneview/test_deploy.py index db9098f2b0..1278600595 100644 --- a/ironic/tests/unit/drivers/modules/oneview/test_deploy.py +++ b/ironic/tests/unit/drivers/modules/oneview/test_deploy.py @@ -14,10 +14,10 @@ # License for the specific language governing permissions and limitations # under the License. -import mock import time import types +import mock from oslo_utils import importutils from ironic.common import driver_factory diff --git a/ironic/tests/unit/drivers/modules/test_console_utils.py b/ironic/tests/unit/drivers/modules/test_console_utils.py index 893df722f7..d4e9a13231 100644 --- a/ironic/tests/unit/drivers/modules/test_console_utils.py +++ b/ironic/tests/unit/drivers/modules/test_console_utils.py @@ -19,7 +19,6 @@ import errno import os -import psutil import random import signal import string @@ -30,6 +29,7 @@ from ironic_lib import utils as ironic_utils import mock from oslo_config import cfg from oslo_utils import netutils +import psutil from ironic.common import exception from ironic.drivers.modules import console_utils diff --git a/ironic/tests/unit/objects/test_chassis.py b/ironic/tests/unit/objects/test_chassis.py index 199f92a632..626c9ec596 100644 --- a/ironic/tests/unit/objects/test_chassis.py +++ b/ironic/tests/unit/objects/test_chassis.py @@ -14,6 +14,7 @@ # under the License. import datetime + import mock from oslo_utils import uuidutils from testtools import matchers diff --git a/ironic/tests/unit/objects/test_node.py b/ironic/tests/unit/objects/test_node.py index 0a0dc09242..072777813b 100644 --- a/ironic/tests/unit/objects/test_node.py +++ b/ironic/tests/unit/objects/test_node.py @@ -14,6 +14,7 @@ # under the License. import datetime + import mock from testtools import matchers diff --git a/ironic/tests/unit/objects/test_objects.py b/ironic/tests/unit/objects/test_objects.py index af5edcde62..09ce53d072 100644 --- a/ironic/tests/unit/objects/test_objects.py +++ b/ironic/tests/unit/objects/test_objects.py @@ -15,8 +15,8 @@ import contextlib import datetime import gettext -import iso8601 +import iso8601 import mock from oslo_versionedobjects import base as object_base from oslo_versionedobjects import exception as object_exception diff --git a/ironic/tests/unit/objects/test_port.py b/ironic/tests/unit/objects/test_port.py index de5adb1627..5461939155 100644 --- a/ironic/tests/unit/objects/test_port.py +++ b/ironic/tests/unit/objects/test_port.py @@ -14,6 +14,7 @@ # under the License. import datetime + import mock from testtools import matchers diff --git a/ironic/tests/unit/objects/test_portgroup.py b/ironic/tests/unit/objects/test_portgroup.py index b1b65e7aba..42e8c0a550 100644 --- a/ironic/tests/unit/objects/test_portgroup.py +++ b/ironic/tests/unit/objects/test_portgroup.py @@ -11,6 +11,7 @@ # under the License. import datetime + import mock from testtools import matchers diff --git a/test-requirements.txt b/test-requirements.txt index a2a46dcb95..3982bad4e6 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -19,6 +19,7 @@ testresources>=0.2.4 # Apache-2.0/BSD testscenarios>=0.4 # Apache-2.0/BSD WebTest>=2.0 # MIT bashate>=0.2 # Apache-2.0 +flake8-import-order==0.11 # LGPLv3 # Doc requirements sphinx>=1.5.1 # BSD diff --git a/tox.ini b/tox.ini index 02d8d26dbd..be020996a8 100644 --- a/tox.ini +++ b/tox.ini @@ -94,6 +94,7 @@ commands = {posargs} [flake8] ignore = E129 exclude = .venv,.git,.tox,dist,doc,*lib/python*,*egg,build +import-order-style = pep8 max-complexity=17 # [H106] Don’t put vim configuration in source files. # [H203] Use assertIs(Not)None to check for None.