Configure and run isort

akx · akx · commit 5b003eee5c0f · 2021-04-27T19:47:32.000+03:00
diff --git a/pyproject.toml b/pyproject.toml
@@ -2,3 +2,7 @@
 line-length = 99
 target-version = ['py36']
 skip-string-normalization = true
+
+[tool.isort]
+profile = "black"
+multi_line_output = 3
diff --git a/requirements-dev.in b/requirements-dev.in
@@ -2,6 +2,7 @@ black~=21.4b1; platform_python_implementation != "PyPy"
 flake8
 flake8-docstrings
 hacking
+isort
 mock
 pip-tools
 pytest
diff --git a/requirements-dev.txt b/requirements-dev.txt
@@ -34,6 +34,8 @@ idna==2.10
     # via requests
 iniconfig==1.1.1
     # via pytest
+isort==5.8.0
+    # via -r requirements-dev.in
 mccabe==0.6.1
     # via flake8
 mock==4.0.3
diff --git a/setup.py b/setup.py
@@ -1,9 +1,10 @@
 #!/usr/bin/env python
 
-from setuptools import setup
 import codecs
 import os.path
 
+from setuptools import setup
+
 
 def read(rel_path):
     here = os.path.abspath(os.path.dirname(__file__))
diff --git a/test/conftest.py b/test/conftest.py
@@ -1,9 +1,9 @@
 import json
 import os
-import pytest
-import responses
 import sys
 
+import pytest
+import responses
 
 # make files under helpers available for import
 HELPERS_PATH = os.path.join(os.path.dirname(__file__), 'helpers')
diff --git a/test/helpers/infra.py b/test/helpers/infra.py
@@ -1,7 +1,6 @@
-from upcloud_api import CloudManager, Storage, FirewallRule, Tag, IPAddress
+from upcloud_api import CloudManager, FirewallRule, IPAddress, Storage, Tag
 from upcloud_api.server import Server, login_user_block
 
-
 CLUSTER = {
     'web1': Server(
         core_number=1,
diff --git a/test/test_apidoc/test_10_ip_addresses.py b/test/test_apidoc/test_10_ip_addresses.py
@@ -1,7 +1,9 @@
-from upcloud_api import IPAddress, Server
-from conftest import Mock, read_from_file
 import json
+
 import responses
+from conftest import Mock, read_from_file
+
+from upcloud_api import IPAddress, Server
 
 
 class TestIP:
diff --git a/test/test_cloud_manager.py b/test/test_cloud_manager.py
@@ -1,6 +1,7 @@
-from conftest import Mock
 import json
+
 import responses
+from conftest import Mock
 
 
 class TestCloudManagerBasic:
diff --git a/test/test_firewall.py b/test/test_firewall.py
@@ -1,8 +1,9 @@
-from upcloud_api import FirewallRule
-
-from conftest import Mock
 import json
+
 import responses
+from conftest import Mock
+
+from upcloud_api import FirewallRule
 
 
 def firewall_rule_callback(request):
diff --git a/test/test_host.py b/test/test_host.py
@@ -1,5 +1,5 @@
-from conftest import Mock
 import responses
+from conftest import Mock
 
 
 class TestHost:
diff --git a/test/test_integration/test_integration_test.py b/test/test_integration/test_integration_test.py
@@ -1,12 +1,11 @@
-import os
-import pytest
 import multiprocessing
+import os
 
-from upcloud_api import CloudManager
-
-from infra import CLUSTER, TAGS, FIREWALL_RULES
+import pytest
+from infra import CLUSTER, FIREWALL_RULES, TAGS
 from infra_helpers import create_cluster, firewall_test, server_test, tag_servers_test
 
+from upcloud_api import CloudManager
 
 USERNAME = os.environ.get('UPCLOUD_API_USER')
 PASSWORD = os.environ.get('UPCLOUD_API_PASSWD')
diff --git a/test/test_ip_manager.py b/test/test_ip_manager.py
@@ -1,5 +1,5 @@
-from conftest import Mock
 import responses
+from conftest import Mock
 
 
 class TestIP:
diff --git a/test/test_network.py b/test/test_network.py
@@ -1,5 +1,5 @@
-from conftest import Mock
 import responses
+from conftest import Mock
 
 
 class TestNetwork:
diff --git a/test/test_object_storage.py b/test/test_object_storage.py
@@ -1,5 +1,5 @@
-from conftest import Mock
 import responses
+from conftest import Mock
 
 
 class TestObjectStorage:
diff --git a/test/test_server.py b/test/test_server.py
@@ -1,6 +1,6 @@
-from conftest import Mock
 import pytest
 import responses
+from conftest import Mock
 
 
 class TestServer:
diff --git a/test/test_server_creation.py b/test/test_server_creation.py
@@ -1,9 +1,10 @@
-from upcloud_api import Server, Storage, IPAddress, login_user_block
-
-from conftest import Mock
 import json
+
 import pytest
 import responses
+from conftest import Mock
+
+from upcloud_api import IPAddress, Server, Storage, login_user_block
 
 
 class TestCreateServer:
diff --git a/test/test_storage.py b/test/test_storage.py
@@ -1,5 +1,5 @@
-from conftest import Mock
 import responses
+from conftest import Mock
 
 
 class TestStorage:
diff --git a/test/test_tags.py b/test/test_tags.py
@@ -1,8 +1,9 @@
-from upcloud_api import Tag
-
-from conftest import Mock
 import json
+
 import responses
+from conftest import Mock
+
+from upcloud_api import Tag
 
 
 def tag_post_callback(request):
diff --git a/upcloud_api/__init__.py b/upcloud_api/__init__.py
@@ -13,18 +13,18 @@
 __license__ = 'MIT'
 __copyright__ = 'Copyright (c) 2015 UpCloud'
 
-from upcloud_api.upcloud_resource import UpCloudResource
-from upcloud_api.errors import UpCloudClientError, UpCloudAPIError
-from upcloud_api.storage import Storage
-from upcloud_api.storage_import import StorageImport
-from upcloud_api.ip_address import IPAddress
-from upcloud_api.server import Server, login_user_block
+from upcloud_api.cloud_manager.cloud_manager import CloudManager
+from upcloud_api.errors import UpCloudAPIError, UpCloudClientError
 from upcloud_api.firewall import FirewallRule
-from upcloud_api.tag import Tag
-from upcloud_api.network import Network
-from upcloud_api.interface import Interface
-from upcloud_api.router import Router
 from upcloud_api.host import Host
+from upcloud_api.interface import Interface
+from upcloud_api.ip_address import IPAddress
 from upcloud_api.ip_network import IpNetwork
+from upcloud_api.network import Network
 from upcloud_api.object_storage import ObjectStorage
-from upcloud_api.cloud_manager.cloud_manager import CloudManager
+from upcloud_api.router import Router
+from upcloud_api.server import Server, login_user_block
+from upcloud_api.storage import Storage
+from upcloud_api.storage_import import StorageImport
+from upcloud_api.tag import Tag
+from upcloud_api.upcloud_resource import UpCloudResource
diff --git a/upcloud_api/cloud_manager/__init__.py b/upcloud_api/cloud_manager/__init__.py
@@ -1,9 +1,9 @@
 from upcloud_api.cloud_manager.base import BaseAPI
 from upcloud_api.cloud_manager.firewall_mixin import FirewallManager
+from upcloud_api.cloud_manager.host_mixin import HostManager
 from upcloud_api.cloud_manager.ip_address_mixin import IPManager
+from upcloud_api.cloud_manager.network_mixin import NetworkManager
+from upcloud_api.cloud_manager.object_storage_mixin import ObjectStorageManager
 from upcloud_api.cloud_manager.server_mixin import ServerManager
 from upcloud_api.cloud_manager.storage_mixin import StorageManager
 from upcloud_api.cloud_manager.tag_mixin import TagManager
-from upcloud_api.cloud_manager.network_mixin import NetworkManager
-from upcloud_api.cloud_manager.host_mixin import HostManager
-from upcloud_api.cloud_manager.object_storage_mixin import ObjectStorageManager
diff --git a/upcloud_api/cloud_manager/base.py b/upcloud_api/cloud_manager/base.py
@@ -1,4 +1,5 @@
 import json
+
 import requests
 
 from upcloud_api import UpCloudAPIError, __version__
diff --git a/upcloud_api/cloud_manager/cloud_manager.py b/upcloud_api/cloud_manager/cloud_manager.py
@@ -2,14 +2,14 @@
 
 from upcloud_api.cloud_manager import (
     BaseAPI,
-    ServerManager,
-    IPManager,
-    StorageManager,
     FirewallManager,
-    TagManager,
-    NetworkManager,
     HostManager,
+    IPManager,
+    NetworkManager,
     ObjectStorageManager,
+    ServerManager,
+    StorageManager,
+    TagManager,
 )
 
 
diff --git a/upcloud_api/cloud_manager/network_mixin.py b/upcloud_api/cloud_manager/network_mixin.py
@@ -1,4 +1,4 @@
-from upcloud_api import Network, Interface, Router, IpNetwork
+from upcloud_api import Interface, IpNetwork, Network, Router
 
 
 class NetworkManager:
diff --git a/upcloud_api/server.py b/upcloud_api/server.py
@@ -1,6 +1,6 @@
 from time import sleep
 
-from upcloud_api import Storage, IPAddress
+from upcloud_api import IPAddress, Storage
 from upcloud_api.utils import try_it_n_times
 
 
diff --git a/upcloud_api/utils.py b/upcloud_api/utils.py
@@ -1,9 +1,10 @@
 import itertools
-from time import sleep
 from datetime import datetime
+from time import sleep
+
 from dateutil import tz
 
-from upcloud_api import UpCloudClientError, UpCloudAPIError
+from upcloud_api import UpCloudAPIError, UpCloudClientError
 
 
 def assignIfExists(opts, default=None, **kwargs):
