Upgrade isort to version 5

It's now pinned to its major version, so that a new major release won't
break our CI again.

Author: threema-danilo

README.rst

@@ -145,7 +145,7 @@ imports (``isort``), do a static type analysis and run the project's tests:
 .. code-block:: bash
 
     flake8 .
-    isort -rc .
+    isort .
     MYPYPATH=${PWD}/stubs mypy saltyrtc examples
     py.test
 

RELEASING.md

@@ -7,7 +7,7 @@ Signing key: https://lgrahl.de/pub/pgp-key.txt
 
    ```bash
    flake8 .
-   isort -rc -c . || isort -rc -df
+   isort -c . || isort -df
    rm -rf .mypy_cache && MYPYPATH=${PWD}/stubs mypy saltyrtc examples
    py.test
    ```

examples/debug.py

@@ -1,13 +1,13 @@
-import asyncio
-import os
-import ssl  # noqa
-import sys
 from typing import Any  # noqa
 from typing import Coroutine  # noqa
 from typing import List  # noqa
 from typing import Optional
 
+import asyncio
 import logbook.more
+import os
+import ssl  # noqa
+import sys
 
 import saltyrtc.server
 from saltyrtc.server.typing import ServerSecretPermanentKey  # noqa

examples/restartable.py

@@ -1,14 +1,14 @@
-import asyncio
-import os
-import signal
-import ssl  # noqa
-import sys
 from typing import Any  # noqa
 from typing import Coroutine  # noqa
 from typing import List  # noqa
 from typing import Optional
 
+import asyncio
 import logbook.more
+import os
+import signal
+import ssl  # noqa
+import sys
 
 import saltyrtc.server
 from saltyrtc.server.typing import ServerSecretPermanentKey  # noqa

saltyrtc/server/__init__.py

@@ -4,6 +4,16 @@
 """
 import itertools
 
+from . import (
+    common,
+    events,
+    exception,
+    message,
+    protocol,
+    server,
+    task,
+    util,
+)
 from .common import *  # noqa
 from .events import *  # noqa
 from .exception import *  # noqa
@@ -13,8 +23,6 @@
 from .task import *  # noqa
 from .util import *  # noqa
 
-from . import common, events, exception, message, protocol, server, task, util
-
 __all__ = tuple(itertools.chain(
     ('bin', 'typing'),
     common.__all__,

saltyrtc/server/bin.py

@@ -1,19 +1,19 @@
 """
 The command line interface for the SaltyRTC signalling server.
 """
-import asyncio
-import enum
-import os
-import signal
-import stat
 from typing import Coroutine  # noqa
 from typing import List  # noqa
 from typing import Optional  # noqa
 from typing import Sequence  # noqa
 from typing import Any
 
+import asyncio
 import click
+import enum
 import libnacl.public
+import os
+import signal
+import stat
 
 from . import (
     __version__ as _version,

saltyrtc/server/common.py

@@ -2,13 +2,14 @@
 This package will be moved to `saltyrtc.common` as soon as a SaltyRTC
 client is being written.
 """
-import enum
 from typing import (
     TYPE_CHECKING,
     Any,
     cast,
 )
 
+import enum
+
 from .exception import MessageError
 from .typing import (
     Nonce,

saltyrtc/server/events.py

@@ -1,8 +1,9 @@
-import collections
-import enum
 from typing import Dict  # noqa
 from typing import List
 
+import collections
+import enum
+
 from .typing import EventCallback
 
 __all__ = (

saltyrtc/server/message.py

@@ -1,7 +1,3 @@
-import abc
-import binascii
-import io
-import struct
 from typing import ClassVar  # noqa
 from typing import (
     TYPE_CHECKING,
@@ -13,7 +9,11 @@
     cast,
 )
 
+import abc
+import binascii
+import io
 import libnacl
+import struct
 import umsgpack
 
 from .common import (

saltyrtc/server/protocol.py

@@ -1,6 +1,3 @@
-import asyncio
-import os
-import struct
 # noinspection PyUnresolvedReferences
 from typing import Dict  # noqa
 from typing import Set  # noqa
@@ -14,8 +11,11 @@
     cast,
 )
 
+import asyncio
 import libnacl
 import libnacl.public
+import os
+import struct
 import websockets
 
 from . import util

saltyrtc/server/server.py

@@ -1,8 +1,3 @@
-import asyncio
-import binascii
-import functools
-import ssl
-from collections import OrderedDict
 from typing import Awaitable  # noqa
 from typing import ClassVar  # noqa
 from typing import Dict  # noqa
@@ -22,7 +17,12 @@
     cast,
 )
 
+import asyncio
+import binascii
+import functools
+import ssl
 import websockets
+from collections import OrderedDict
 from websockets.typing import Subprotocol
 
 from . import util

saltyrtc/server/task.py

@@ -1,6 +1,3 @@
-import asyncio
-import enum
-import functools
 from typing import (
     Any,
     Callable,
@@ -10,6 +7,10 @@
     Union,
 )
 
+import asyncio
+import enum
+import functools
+
 from . import util
 from .exception import (
     Disconnected,

saltyrtc/server/typing.py

@@ -17,6 +17,7 @@
 if TYPE_CHECKING:
     # noinspection PyUnresolvedReferences
     import logbook  # noqa
+
     # noinspection PyUnresolvedReferences
     from .events import Event  # noqa
 

saltyrtc/server/util.py

@@ -2,10 +2,6 @@
 This module provides utility functions for the SaltyRTC Signalling
 Server.
 """
-import asyncio
-import binascii
-import logging
-import ssl
 # noinspection PyUnresolvedReferences
 from typing import Coroutine  # noqa
 from typing import (
@@ -19,8 +15,12 @@
     cast,
 )
 
+import asyncio
+import binascii
 import libnacl
 import libnacl.public
+import logging
+import ssl
 
 from .typing import (
     LogbookLevel,

setup.py

@@ -2,7 +2,6 @@
 import os
 import platform
 import sys
-
 from setuptools import setup
 
 
@@ -54,7 +53,7 @@ def read(file):
     'pytest-cov>=2.5.1,<3',
     'pytest-mock>=1.10.0,<2',
     'flake8>=3.7.8',
-    'isort>=4.3.21',
+    'isort>=5,<6',
     'collective.checkdocs>=0.2',
     'Pygments>=2.2.0',  # required by checkdocs
     'ordered-set>=3.0.1',  # required by TestServer class

tests/conftest.py

@@ -1,19 +1,18 @@
 import asyncio
 import functools
+import libnacl.public
+import logbook
+import ordered_set
 import os
+import pytest
 import socket
 import ssl
 import struct
 import subprocess
 import sys
-from contextlib import closing
-
-import libnacl.public
-import logbook
-import ordered_set
-import pytest
 import umsgpack
 import websockets
+from contextlib import closing
 
 from saltyrtc.server import (
     NONCE_FORMATTER,

tests/test_cli.py

@@ -1,11 +1,10 @@
 import binascii
 import os
+import pytest
 import signal
 import stat
 import subprocess
 
-import pytest
-
 from saltyrtc.server import (
     Server,
     __version__ as _version,

tests/test_protocol.py

@@ -3,7 +3,6 @@
 compliant to the SaltyRTC protocol.
 """
 import asyncio
-
 import libnacl.public
 import pytest
 import websockets

tests/test_server.py

@@ -4,7 +4,6 @@
 """
 import asyncio
 import collections
-
 import pytest
 
 from saltyrtc.server import (