Sort imports

I don't want to ever have to sort imports again. It's a poor use of
developer time. Automate this with a pre-commit hook, and check this on
CI.

Developers: I suggest you configure your editor to use
`reorder_python_imports`. It uses the standard sorting, and detects
first/third party libs well.

Author: Hugo Osvaldo Barrera

.pre-commit-config.yaml

@@ -14,6 +14,10 @@ repos:
     hooks:
       - id: flake8
         additional_dependencies: [flake8-import-order, flake8-bugbear]
+  - repo: https://github.com/asottile/reorder_python_imports
+    rev: v2.3.0
+    hooks:
+    -   id: reorder-python-imports
   - repo: local
     hooks:
       - id: update-travis

scripts/make_travisconf.py

@@ -1,5 +1,4 @@
 #!/usr/bin/env python
-
 import itertools
 import json
 

setup.py

@@ -4,9 +4,9 @@
 Please refer to https://vdirsyncer.pimutils.org/en/stable/packaging.html for
 how to package vdirsyncer.
 '''
-
-
-from setuptools import Command, find_packages, setup
+from setuptools import Command
+from setuptools import find_packages
+from setuptools import setup
 
 
 requirements = [

tests/__init__.py

@@ -1,14 +1,11 @@
 '''
 Test suite for vdirsyncer.
 '''
-
 import hypothesis.strategies as st
+import urllib3.exceptions
 
 from vdirsyncer.vobject import normalize_item
 
-import urllib3
-import urllib3.exceptions
-
 urllib3.disable_warnings(urllib3.exceptions.InsecureRequestWarning)
 
 

tests/conftest.py

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

tests/storage/__init__.py

@@ -1,21 +1,23 @@
 import random
-import uuid
-
 import textwrap
-from urllib.parse import quote as urlquote, unquote as urlunquote
+import uuid
+from urllib.parse import quote as urlquote
+from urllib.parse import unquote as urlunquote
 
 import hypothesis.strategies as st
-from hypothesis import given
-
 import pytest
+from hypothesis import given
 
+from .. import assert_item_equals
+from .. import EVENT_TEMPLATE
+from .. import normalize_item
+from .. import printable_characters_strategy
+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, TASK_TEMPLATE, VCARD_TEMPLATE, \
-    assert_item_equals, normalize_item, printable_characters_strategy
-
 
 def get_server_mixin(server_name):
     from . import __name__ as base

tests/storage/conftest.py

@@ -1,7 +1,7 @@
-import pytest
-
 import uuid
 
+import pytest
+
 
 @pytest.fixture
 def slow_create_collection(request):

tests/storage/dav/__init__.py

@@ -1,19 +1,15 @@
-import uuid
-
 import os
+import uuid
 
 import pytest
-
-import requests
 import requests.exceptions
 
+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, get_server_mixin
-
 
 dav_server = os.environ.get('DAV_SERVER', 'skip')
 ServerMixin = get_server_mixin(dav_server)

tests/storage/dav/test_caldav.py

@@ -2,18 +2,17 @@
 from textwrap import dedent
 
 import pytest
-
-import requests
 import requests.exceptions
 
-from tests import EVENT_TEMPLATE, TASK_TEMPLATE, VCARD_TEMPLATE
-
+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 DAVStorageTests, dav_server
-from .. import format_item
-
 
 class TestCalDAVStorage(DAVStorageTests):
     storage_class = CalDAVStorage

tests/storage/dav/test_carddav.py

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