Merge "Use flake8-import-order plugin"

openstackclient/common/clientmanager.py

@@ -16,11 +16,11 @@
 """Manage access to the clients, including authenticating when needed."""
 
 import logging
-import pkg_resources
 import sys
 
 from osc_lib import clientmanager
 from osc_lib import shell
+import pkg_resources
 
 
 LOG = logging.getLogger(__name__)

openstackclient/compute/v2/server_event.py

@@ -16,10 +16,10 @@
 """Compute v2 Server operation event implementations"""
 
 import logging
-import six
 
 from osc_lib.command import command
 from osc_lib import utils
+import six
 
 from openstackclient.i18n import _
 

openstackclient/tests/functional/base.py

@@ -14,10 +14,10 @@ import os
 import re
 import shlex
 import subprocess
-import testtools
 
 from tempest.lib.cli import output_parser
 from tempest.lib import exceptions
+import testtools
 
 
 COMMON_DIR = os.path.dirname(os.path.abspath(__file__))

openstackclient/tests/unit/common/test_logs.py

@@ -15,6 +15,7 @@
 #                or Jun 2017.
 
 import logging
+
 import mock
 
 from openstackclient.common import logs

openstackclient/tests/unit/common/test_quota.py

@@ -11,8 +11,8 @@
 #   under the License.
 
 import copy
-import mock
 
+import mock
 from osc_lib import exceptions
 
 from openstackclient.common import quota

openstackclient/tests/unit/compute/v2/fakes.py

@@ -14,9 +14,10 @@
 #
 
 import copy
-import mock
 import uuid
 
+import mock
+
 from openstackclient.api import compute_v2
 from openstackclient.tests.unit import fakes
 from openstackclient.tests.unit.identity.v2_0 import fakes as identity_fakes

openstackclient/tests/unit/compute/v2/test_keypair.py

@@ -13,10 +13,10 @@
 #   under the License.
 #
 
-import mock
-from mock import call
 import uuid
 
+import mock
+from mock import call
 from osc_lib import exceptions
 from osc_lib import utils
 

openstackclient/tests/unit/compute/v2/test_server.py

@@ -15,9 +15,9 @@
 import argparse
 import collections
 import getpass
+
 import mock
 from mock import call
-
 from osc_lib import exceptions
 from osc_lib import utils as common_utils
 from oslo_utils import timeutils

openstackclient/tests/unit/compute/v2/test_usage.py

@@ -12,6 +12,7 @@
 #
 
 import datetime
+
 import mock
 
 from openstackclient.compute.v2 import usage

openstackclient/tests/unit/fakes.py

@@ -14,10 +14,10 @@
 #
 
 import json
-import mock
 import sys
 
 from keystoneauth1 import fixture
+import mock
 import requests
 import six
 

openstackclient/tests/unit/identity/v2_0/fakes.py

@@ -14,11 +14,11 @@
 #
 
 import copy
-import mock
 import uuid
 
 from keystoneauth1 import access
 from keystoneauth1 import fixture
+import mock
 
 from openstackclient.tests.unit import fakes
 from openstackclient.tests.unit import utils

openstackclient/tests/unit/identity/v2_0/test_role_assignment.py

@@ -12,8 +12,8 @@
 #
 
 import copy
-import mock
 
+import mock
 from osc_lib import exceptions
 
 from openstackclient.identity.v2_0 import role_assignment

openstackclient/tests/unit/identity/v3/fakes.py

@@ -14,11 +14,11 @@
 #
 
 import copy
-import mock
 import uuid
 
 from keystoneauth1 import access
 from keystoneauth1 import fixture
+import mock
 
 from openstackclient.tests.unit import fakes
 from openstackclient.tests.unit import utils

openstackclient/tests/unit/identity/v3/test_identity_provider.py

@@ -13,6 +13,7 @@
 #   under the License.
 
 import copy
+
 import mock
 
 from openstackclient.identity.v3 import identity_provider

openstackclient/tests/unit/identity/v3/test_mappings.py

@@ -13,8 +13,8 @@
 #   under the License.
 
 import copy
-import mock
 
+import mock
 from osc_lib import exceptions
 
 from openstackclient.identity.v3 import mapping

openstackclient/tests/unit/identity/v3/test_role.py

@@ -14,8 +14,8 @@
 #
 
 import copy
-import mock
 
+import mock
 from osc_lib import exceptions
 from osc_lib import utils
 

openstackclient/tests/unit/identity/v3/test_role_assignment.py

@@ -12,6 +12,7 @@
 #
 
 import copy
+
 import mock
 
 from openstackclient.identity.v3 import role_assignment

openstackclient/tests/unit/identity/v3/test_trust.py

@@ -12,8 +12,8 @@
 #
 
 import copy
-import mock
 
+import mock
 from osc_lib import exceptions
 from osc_lib import utils
 

openstackclient/tests/unit/identity/v3/test_user.py

@@ -14,8 +14,8 @@
 #
 
 import contextlib
-import mock
 
+import mock
 from osc_lib import exceptions
 from osc_lib import utils
 

openstackclient/tests/unit/image/v1/fakes.py

@@ -14,9 +14,10 @@
 #
 
 import copy
-import mock
 import uuid
 
+import mock
+
 from openstackclient.tests.unit import fakes
 from openstackclient.tests.unit import utils
 from openstackclient.tests.unit.volume.v1 import fakes as volume_fakes

openstackclient/tests/unit/image/v1/test_image.py

@@ -14,8 +14,8 @@
 #
 
 import copy
-import mock
 
+import mock
 from osc_lib import exceptions
 from osc_lib import utils
 

openstackclient/tests/unit/image/v2/fakes.py

@@ -14,11 +14,11 @@
 #
 
 import copy
-import mock
 import random
 import uuid
 
 from glanceclient.v2 import schemas
+import mock
 from osc_lib import utils as common_utils
 import warlock
 

openstackclient/tests/unit/image/v2/test_image.py

@@ -14,9 +14,9 @@
 #
 
 import copy
-import mock
 
 from glanceclient.v2 import schemas
+import mock
 from osc_lib import exceptions
 from osc_lib import utils as common_utils
 import warlock

openstackclient/tests/unit/integ/cli/test_shell.py

@@ -11,8 +11,8 @@
 #   under the License.
 
 import copy
-import mock
 
+import mock
 from osc_lib.tests import utils as osc_lib_utils
 
 from openstackclient import shell

openstackclient/tests/unit/network/test_common.py

@@ -12,6 +12,7 @@
 #
 
 import argparse
+
 import mock
 
 import openstack

openstackclient/tests/unit/network/v2/fakes.py

@@ -13,11 +13,12 @@
 
 import argparse
 import copy
-import mock
 from random import choice
 from random import randint
 import uuid
 
+import mock
+
 from openstackclient.tests.unit import fakes
 from openstackclient.tests.unit.identity.v3 import fakes as identity_fakes_v3
 from openstackclient.tests.unit import utils

openstackclient/tests/unit/network/v2/test_network.py

@@ -11,10 +11,10 @@
 #   under the License.
 #
 
-import mock
-from mock import call
 import random
 
+import mock
+from mock import call
 from osc_lib import exceptions
 from osc_lib import utils
 

openstackclient/tests/unit/network/v2/test_port.py

@@ -12,8 +12,8 @@
 #
 
 import argparse
-import mock
 
+import mock
 from mock import call
 from osc_lib import exceptions
 from osc_lib import utils

openstackclient/tests/unit/network/v2/test_subnet_pool.py

@@ -12,9 +12,9 @@
 #
 
 import argparse
+
 import mock
 from mock import call
-
 from osc_lib import exceptions
 from osc_lib import utils
 

openstackclient/tests/unit/object/v1/test_container.py

@@ -14,6 +14,7 @@
 #
 
 import copy
+
 import mock
 
 from openstackclient.api import object_store_v1 as object_store

openstackclient/tests/unit/object/v1/test_object.py

@@ -14,6 +14,7 @@
 #
 
 import copy
+
 import mock
 
 from openstackclient.api import object_store_v1 as object_store

openstackclient/tests/unit/test_shell.py

@@ -13,10 +13,10 @@
 #   under the License.
 #
 
-import mock
 import os
 import sys
 
+import mock
 from osc_lib.tests import utils as osc_lib_test_utils
 from oslo_utils import importutils
 import wrapt

openstackclient/tests/unit/utils.py

@@ -14,8 +14,9 @@
 #   under the License.
 #
 
-import fixtures
 import os
+
+import fixtures
 import testtools
 
 from openstackclient.tests.unit import fakes

openstackclient/tests/unit/volume/v1/fakes.py

@@ -14,10 +14,11 @@
 #
 
 import copy
-import mock
 import random
 import uuid
 
+import mock
+
 from openstackclient.tests.unit import fakes
 from openstackclient.tests.unit.identity.v2_0 import fakes as identity_fakes
 from openstackclient.tests.unit import utils

openstackclient/tests/unit/volume/v1/test_qos_specs.py

@@ -14,9 +14,9 @@
 #
 
 import copy
+
 import mock
 from mock import call
-
 from osc_lib import exceptions
 from osc_lib import utils
 

openstackclient/tests/unit/volume/v1/test_volume.py

@@ -14,9 +14,9 @@
 #
 
 import argparse
+
 import mock
 from mock import call
-
 from osc_lib import exceptions
 from osc_lib import utils
 

openstackclient/tests/unit/volume/v2/fakes.py

@@ -13,10 +13,10 @@
 #
 
 import copy
-import mock
 import random
 import uuid
 
+import mock
 from osc_lib import utils as common_utils
 
 from openstackclient.tests.unit import fakes

openstackclient/tests/unit/volume/v2/test_qos_specs.py

@@ -14,9 +14,9 @@
 #
 
 import copy
+
 import mock
 from mock import call
-
 from osc_lib import exceptions
 from osc_lib import utils
 

openstackclient/tests/unit/volume/v2/test_snapshot.py

@@ -13,9 +13,9 @@
 #
 
 import argparse
+
 import mock
 from mock import call
-
 from osc_lib import exceptions
 from osc_lib import utils
 

openstackclient/tests/unit/volume/v2/test_volume.py

@@ -13,9 +13,9 @@
 #
 
 import argparse
+
 import mock
 from mock import call
-
 from osc_lib import exceptions
 from osc_lib import utils
 

test-requirements.txt

@@ -5,6 +5,7 @@ hacking!=0.13.0,<0.14,>=0.12.0 # Apache-2.0
 
 coverage!=4.4,>=4.0 # Apache-2.0
 fixtures>=3.0.0 # Apache-2.0/BSD
+flake8-import-order==0.13 # LGPLv3
 mock>=2.0 # BSD
 openstackdocstheme>=1.16.0 # Apache-2.0
 oslotest>=1.10.0 # Apache-2.0

tox.ini

@@ -91,3 +91,4 @@ 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 = __
+import-order-style = pep8