From 2e684a041efbc70ada8b5f935d97d75ed080ad75 Mon Sep 17 00:00:00 2001 From: Kaifeng Wang Date: Fri, 15 Mar 2019 16:47:51 +0800 Subject: [PATCH] Find misteriously missing pep8 import check import order is not checked, now it's a history. Change-Id: I362bb1a1c876410d9f27508ba198ccb49336af0f --- ironic_inspector_client/shell.py | 1 + ironic_inspector_client/test/functional.py | 10 ++++------ ironic_inspector_client/test/test_shell.py | 6 +++--- ironic_inspector_client/test/test_v1.py | 2 +- test-requirements.txt | 1 + tox.ini | 8 ++++++++ 6 files changed, 18 insertions(+), 10 deletions(-) diff --git a/ironic_inspector_client/shell.py b/ironic_inspector_client/shell.py index 3977339..79ca772 100644 --- a/ironic_inspector_client/shell.py +++ b/ironic_inspector_client/shell.py @@ -27,6 +27,7 @@ import yaml import ironic_inspector_client from ironic_inspector_client import resource as res + API_NAME = 'baremetal_introspection' API_VERSION_OPTION = 'inspector_api_version' DEFAULT_API_VERSION = '1' diff --git a/ironic_inspector_client/test/functional.py b/ironic_inspector_client/test/functional.py index 3013682..676d518 100644 --- a/ironic_inspector_client/test/functional.py +++ b/ironic_inspector_client/test/functional.py @@ -11,25 +11,23 @@ # See the License for the specific language governing permissions and # limitations under the License. -import eventlet -eventlet.monkey_patch() - import copy import json -import mock import os import sys import tempfile import unittest -import six - +import eventlet +eventlet.monkey_patch() # noqa from ironic_inspector.common import swift from ironic_inspector import introspection_state as istate from ironic_inspector.test import functional from keystoneauth1 import session as ks_session from keystoneauth1 import token_endpoint +import mock from oslo_concurrency import processutils +import six import ironic_inspector_client as client from ironic_inspector_client import shell diff --git a/ironic_inspector_client/test/test_shell.py b/ironic_inspector_client/test/test_shell.py index 4864a6d..8890ffd 100644 --- a/ironic_inspector_client/test/test_shell.py +++ b/ironic_inspector_client/test/test_shell.py @@ -11,14 +11,14 @@ # See the License for the specific language governing permissions and # limitations under the License. -import sys - import collections +import sys +import tempfile + import mock from osc_lib import exceptions from osc_lib.tests import utils import six -import tempfile from ironic_inspector_client import shell from ironic_inspector_client import v1 diff --git a/ironic_inspector_client/test/test_v1.py b/ironic_inspector_client/test/test_v1.py index b44d28c..f35f7a7 100644 --- a/ironic_inspector_client/test/test_v1.py +++ b/ironic_inspector_client/test/test_v1.py @@ -12,13 +12,13 @@ # limitations under the License. import collections -import six import unittest from keystoneauth1 import session import mock from oslo_utils import netutils from oslo_utils import uuidutils +import six import ironic_inspector_client from ironic_inspector_client.common import http diff --git a/test-requirements.txt b/test-requirements.txt index 13ef714..fd278ea 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -4,6 +4,7 @@ coverage!=4.4,>=4.0 # Apache-2.0 doc8>=0.6.0 # Apache-2.0 fixtures>=3.0.0 # Apache-2.0/BSD +flake8-import-order>=0.13 # LGPLv3 hacking>=1.0.0,<1.1.0 # Apache-2.0 mock>=2.0.0 # BSD requests-mock>=1.2.0 # Apache-2.0 diff --git a/tox.ini b/tox.ini index 854f8f9..1e38a9c 100644 --- a/tox.ini +++ b/tox.ini @@ -66,7 +66,15 @@ deps = commands = sphinx-build -W -b html doc/source doc/build/html [flake8] +import-order-style = pep8 +application-import-names = ironic_inspector_client max-complexity=15 +# [H106] Don't put vim configuration in source files. +# [H203] Use assertIs(Not)None to check for None. +# [H204] Use assert(Not)Equal to check for equality. +# [H205] Use assert(Greater|Less)(Equal) for comparison. +# [H904] Delay string interpolations at logging calls. +enable-extensions=H106,H203,H204,H205,H904 [hacking] import_exceptions = ironic_inspector_client.common.i18n