From 20b922357ea36d8468c22a91951f7e949bbf0771 Mon Sep 17 00:00:00 2001 From: Riccardo Pittau Date: Fri, 1 May 2020 23:11:56 +0200 Subject: [PATCH] Add pep8 import order check Set flake8-import-order version to 0.17.1 Full py3 compatible version. Add all Python3 modules to stdlib list. Change-Id: I787202eee18c99aaa659e0267235f4c413a389e9 --- lower-constraints.txt | 1 + osc_lib/api/api.py | 5 ++--- osc_lib/cli/client_config.py | 1 - osc_lib/cli/format_columns.py | 1 + osc_lib/command/commandmanager.py | 3 +-- osc_lib/tests/fakes.py | 2 +- osc_lib/tests/test_clientmanager.py | 1 - osc_lib/tests/test_logs.py | 3 +-- osc_lib/tests/test_shell.py | 4 ++-- osc_lib/tests/utils/__init__.py | 2 -- osc_lib/tests/utils/test_utils.py | 2 +- osc_lib/utils/__init__.py | 2 +- test-requirements.txt | 1 + tox.ini | 3 +++ 14 files changed, 15 insertions(+), 16 deletions(-) diff --git a/lower-constraints.txt b/lower-constraints.txt index 0f028a0..2f3f308 100644 --- a/lower-constraints.txt +++ b/lower-constraints.txt @@ -18,6 +18,7 @@ extras==1.0.0 fasteners==0.7.0 fixtures==3.0.0 flake8==2.2.4 +flake8-import-order==0.17.1 future==0.16.0 futurist==1.2.0 gitdb==0.6.4 diff --git a/osc_lib/api/api.py b/osc_lib/api/api.py index aeb36d3..39c8e3e 100644 --- a/osc_lib/api/api.py +++ b/osc_lib/api/api.py @@ -13,11 +13,10 @@ """Base API Library""" -import simplejson as json -import six - from keystoneauth1 import exceptions as ksa_exceptions from keystoneauth1 import session as ksa_session +import simplejson as json +import six from osc_lib import exceptions from osc_lib.i18n import _ diff --git a/osc_lib/cli/client_config.py b/osc_lib/cli/client_config.py index c0e38c1..f434df3 100644 --- a/osc_lib/cli/client_config.py +++ b/osc_lib/cli/client_config.py @@ -17,7 +17,6 @@ import logging from openstack.config import exceptions as sdk_exceptions from openstack.config import loader as config - from oslo_utils import strutils import six diff --git a/osc_lib/cli/format_columns.py b/osc_lib/cli/format_columns.py index 0088abc..ef2bcc5 100644 --- a/osc_lib/cli/format_columns.py +++ b/osc_lib/cli/format_columns.py @@ -16,6 +16,7 @@ """Formattable column for specify content type""" from cliff import columns + from osc_lib import utils diff --git a/osc_lib/command/commandmanager.py b/osc_lib/command/commandmanager.py index c190e33..f20dadd 100644 --- a/osc_lib/command/commandmanager.py +++ b/osc_lib/command/commandmanager.py @@ -15,9 +15,8 @@ """Modify cliff.CommandManager""" -import pkg_resources - import cliff.commandmanager +import pkg_resources class CommandManager(cliff.commandmanager.CommandManager): diff --git a/osc_lib/tests/fakes.py b/osc_lib/tests/fakes.py index 7a11133..90de447 100644 --- a/osc_lib/tests/fakes.py +++ b/osc_lib/tests/fakes.py @@ -13,11 +13,11 @@ # under the License. # -import six import sys from unittest import mock from keystoneauth1 import fixture +import six AUTH_TOKEN = "foobar" diff --git a/osc_lib/tests/test_clientmanager.py b/osc_lib/tests/test_clientmanager.py index 5a10a37..a97bb48 100644 --- a/osc_lib/tests/test_clientmanager.py +++ b/osc_lib/tests/test_clientmanager.py @@ -23,7 +23,6 @@ from keystoneauth1.identity.v3 import k2k from keystoneauth1 import loading from keystoneauth1 import noauth from keystoneauth1 import token_endpoint - from openstack.config import cloud_config from openstack.config import defaults from openstack import connection diff --git a/osc_lib/tests/test_logs.py b/osc_lib/tests/test_logs.py index e4ebdb4..3c19569 100644 --- a/osc_lib/tests/test_logs.py +++ b/osc_lib/tests/test_logs.py @@ -11,9 +11,8 @@ # under the License. # -from unittest import mock - import logging +from unittest import mock from osc_lib import logs from osc_lib.tests import utils diff --git a/osc_lib/tests/test_shell.py b/osc_lib/tests/test_shell.py index 743032c..130490b 100644 --- a/osc_lib/tests/test_shell.py +++ b/osc_lib/tests/test_shell.py @@ -16,13 +16,13 @@ import copy import os import sys -import testtools from unittest import mock +import testtools + from osc_lib import shell from osc_lib.tests import utils -from openstack.config import loader as config # noqa DEFAULT_AUTH_URL = "http://127.0.0.1:5000/v2.0/" DEFAULT_PROJECT_ID = "xxxx-yyyy-zzzz" diff --git a/osc_lib/tests/utils/__init__.py b/osc_lib/tests/utils/__init__.py index 239adfa..aaf2f1c 100644 --- a/osc_lib/tests/utils/__init__.py +++ b/osc_lib/tests/utils/__init__.py @@ -23,10 +23,8 @@ from unittest import mock from cliff import columns as cliff_columns import fixtures from keystoneauth1 import loading - from openstack.config import cloud_region from openstack.config import defaults - from oslo_utils import importutils from requests_mock.contrib import fixture import six diff --git a/osc_lib/tests/utils/test_utils.py b/osc_lib/tests/utils/test_utils.py index 45b85a9..cd72d67 100644 --- a/osc_lib/tests/utils/test_utils.py +++ b/osc_lib/tests/utils/test_utils.py @@ -13,12 +13,12 @@ # under the License. # -import six import time from unittest import mock import uuid from cliff import columns as cliff_columns +import six from osc_lib.cli import format_columns from osc_lib import exceptions diff --git a/osc_lib/utils/__init__.py b/osc_lib/utils/__init__.py index 03065dd..041524a 100644 --- a/osc_lib/utils/__init__.py +++ b/osc_lib/utils/__init__.py @@ -19,12 +19,12 @@ import copy import getpass import logging import os -import six import time import warnings from cliff import columns as cliff_columns from oslo_utils import importutils +import six from osc_lib import exceptions from osc_lib.i18n import _ diff --git a/test-requirements.txt b/test-requirements.txt index 2aab805..b2a7a62 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -13,6 +13,7 @@ testrepository>=0.0.18 # Apache-2.0/BSD testtools>=2.2.0 # MIT osprofiler>=1.4.0 # Apache-2.0 bandit>=1.1.0 # Apache-2.0 +flake8-import-order>=0.17.1 # LGPLv3 # Documentation openstackdocstheme>=1.18.1 # Apache-2.0 diff --git a/tox.ini b/tox.ini index afc2f3c..e10c758 100644 --- a/tox.ini +++ b/tox.ini @@ -61,6 +61,9 @@ exclude = .git,.tox,dist,doc,*lib/python*,*egg,build,tools # If 'ignore' is not set there are default errors and warnings that are set # Doc: http://flake8.readthedocs.org/en/latest/config.html#default ignore = W504 +import-order-style = pep8 +application-import-names = osc_lib +filename = *.py [testenv:lower-constraints] deps =