Sort imports

Author: Hugo Osvaldo Barrera

setup.py

@@ -8,7 +8,6 @@
 from setuptools import find_packages
 from setuptools import setup
 
-
 requirements = [
     # https://github.com/mitsuhiko/click/issues/200
     "click>=5.0,<9.0",

tests/conftest.py

@@ -8,8 +8,8 @@
 import click_log
 import pytest
 from hypothesis import HealthCheck
-from hypothesis import settings
 from hypothesis import Verbosity
+from hypothesis import settings
 
 
 @pytest.fixture(autouse=True)

tests/storage/__init__.py

@@ -7,15 +7,16 @@
 import aiostream
 import pytest
 
-from .. import assert_item_equals
-from .. import EVENT_TEMPLATE
-from .. import normalize_item
-from .. import TASK_TEMPLATE
-from .. import VCARD_TEMPLATE
 from vdirsyncer import exceptions
 from vdirsyncer.storage.base import normalize_meta_value
 from vdirsyncer.vobject import Item
 
+from .. import EVENT_TEMPLATE
+from .. import TASK_TEMPLATE
+from .. import VCARD_TEMPLATE
+from .. import assert_item_equals
+from .. import normalize_item
+
 
 def get_server_mixin(server_name):
     from . import __name__ as base

tests/storage/dav/__init__.py

@@ -5,12 +5,12 @@
 import aiostream
 import pytest
 
-from .. import get_server_mixin
-from .. import StorageTests
 from tests import assert_item_equals
 from vdirsyncer import exceptions
 from vdirsyncer.vobject import Item
 
+from .. import StorageTests
+from .. import get_server_mixin
 
 dav_server = os.environ.get("DAV_SERVER", "skip")
 ServerMixin = get_server_mixin(dav_server)

tests/storage/dav/test_caldav.py

@@ -6,15 +6,16 @@
 import pytest
 from aioresponses import aioresponses
 
-from . import dav_server
-from . import DAVStorageTests
-from .. import format_item
 from tests import EVENT_TEMPLATE
 from tests import TASK_TEMPLATE
 from tests import VCARD_TEMPLATE
 from vdirsyncer import exceptions
 from vdirsyncer.storage.dav import CalDAVStorage
 
+from .. import format_item
+from . import DAVStorageTests
+from . import dav_server
+
 
 class TestCalDAVStorage(DAVStorageTests):
     storage_class = CalDAVStorage

tests/storage/dav/test_carddav.py

@@ -1,8 +1,9 @@
 import pytest
 
-from . import DAVStorageTests
 from vdirsyncer.storage.dav import CardDAVStorage
 
+from . import DAVStorageTests
+
 
 class TestCardDAVStorage(DAVStorageTests):
     storage_class = CardDAVStorage

tests/storage/etesync/test_main.py

@@ -5,10 +5,10 @@
 import pytest
 import requests
 
-from .. import StorageTests
 from vdirsyncer.storage.etesync import EtesyncCalendars
 from vdirsyncer.storage.etesync import EtesyncContacts
 
+from .. import StorageTests
 
 pytestmark = pytest.mark.skipif(
     os.getenv("ETESYNC_TESTS", "") != "true", reason="etesync tests disabled"

tests/storage/test_filesystem.py

@@ -3,10 +3,11 @@
 import aiostream
 import pytest
 
-from . import StorageTests
 from vdirsyncer.storage.filesystem import FilesystemStorage
 from vdirsyncer.vobject import Item
 
+from . import StorageTests
+
 
 class TestFilesystemStorage(StorageTests):
     storage_class = FilesystemStorage

tests/storage/test_http.py

@@ -1,6 +1,6 @@
 import pytest
-from aioresponses import aioresponses
 from aioresponses import CallbackResult
+from aioresponses import aioresponses
 
 from tests import normalize_item
 from vdirsyncer.exceptions import UserError

tests/storage/test_http_with_singlefile.py

@@ -1,13 +1,14 @@
 import aiostream
 import pytest
-from aioresponses import aioresponses
 from aioresponses import CallbackResult
+from aioresponses import aioresponses
 
 import vdirsyncer.storage.http
-from . import StorageTests
 from vdirsyncer.storage.base import Storage
 from vdirsyncer.storage.singlefile import SingleFileStorage
 
+from . import StorageTests
+
 
 class CombinedStorage(Storage):
     """A subclass of HttpStorage to make testing easier. It supports writes via