Update to isort>5

This has some different config settings and slightly different
detection of first-party modules, so we need to pin it. This
commit also contains the relevant code fixes to keep isort happy.

Author: PeterJCLaw

script/linting/requirements.txt

@@ -8,3 +8,5 @@ flake8-isort
 flake8-mutable
 flake8-todo
 flake8-tuple
+
+isort>5

setup.cfg

@@ -29,12 +29,9 @@ multi_line_output = 3
 order_by_type = False
 
 default_section = THIRDPARTY
-known_standard_library = typing_extensions
+extra_standard_library = typing_extensions
 sections = FUTURE,STDLIB,THIRDPARTY,FIRSTPARTY,LOCALFOLDER
 
-not_skip =
-    __init__.py,
-
 
 [mypy]
 disallow_any_explicit = True

tests/test_utils.py

@@ -9,6 +9,7 @@
 from sqlalchemy import create_engine
 from alembic.config import Config  # type: ignore[import]
 from starlette.config import environ
+
 from code_submitter.auth import NemesisUserInfo, DummyNemesisBackend
 
 T = TypeVar('T')

tests/tests_app.py

@@ -5,6 +5,7 @@
 
 import test_utils
 from starlette.testclient import TestClient
+
 from code_submitter.tables import Archive, ChoiceHistory
 
 

tests/tests_auth.py

@@ -1,10 +1,11 @@
 import test_utils
 from starlette.requests import Request
-from code_submitter.auth import NemesisBackend, NemesisUserInfo
 from starlette.responses import Response, JSONResponse
 from starlette.applications import Starlette
 from starlette.authentication import AuthenticationError
 
+from code_submitter.auth import NemesisBackend, NemesisUserInfo
+
 
 class NemesisAuthTests(test_utils.AsyncTestCase):
     def setUp(self) -> None:

tests/tests_utils.py

@@ -3,6 +3,7 @@
 import datetime
 
 import test_utils
+
 from code_submitter import utils
 from code_submitter.tables import Archive, ChoiceHistory