Merge remote-tracking branch 'PeterJCLaw/master' into file-auth-backend

Author: RealOrangeOne

code_submitter/auth.py

@@ -1,11 +1,11 @@
-from typing_extensions import TypedDict
-
-import httpx
 import base64
 import logging
 import secrets
 import binascii
 from typing import cast, Dict, List, Tuple, Optional, Sequence
+from typing_extensions import TypedDict
+
+import httpx
 from ruamel.yaml import YAML
 from starlette.requests import HTTPConnection
 from starlette.responses import Response
@@ -109,22 +109,22 @@ def __init__(
 
     async def load_user(self, username: str, password: str) -> NemesisUserInfo:
         async with self.client as client:
-            respone = await client.get(
+            response = await client.get(
                 'user/{}'.format(username),
                 auth=(username, password),
             )
 
             try:
-                respone.raise_for_status()
+                response.raise_for_status()
             except httpx.HTTPError as e:
-                if e.response.status_code != 403:
+                if response.status_code != 403:
                     logger.exception(
                         "Failed to contact nemesis while trying to authenticate %r",
                         username,
                     )
                 raise AuthenticationError(e) from e
 
-            return cast(NemesisUserInfo, respone.json())
+            return cast(NemesisUserInfo, response.json())
 
     def strip_team(self, team: str) -> str:
         # All teams from nemesis *should* start with this prefix...

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,4 +1,5 @@
 import os
+
 import test_utils
 from starlette.requests import Request
 from starlette.responses import Response, JSONResponse

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