Update ruff config and sort imports

Author: TheByronHimes

.pyproject_generation/pyproject_template.toml

@@ -42,6 +42,7 @@ fixable = [
     "UP", # e.g. List -> list
     "I", # sort imports
     "D", # pydocstyle
+    "RUF022", # sort items in __all__
 ]
 ignore = [
     "E111", # indentation with invalid multiple (for formatter)
@@ -60,6 +61,8 @@ ignore = [
     "D107", # missing docstring in __init__
     "D206", # indent-with-spaces (for formatter)
     "D300", # triple-single-quotes (for formatter)
+    "UP040", # type statement (not yet supported by mypy)
+    "PLC0206", # Extracting value from dictionary without calling `.items()`
 ]
 select = [
     "C90", # McCabe Complexity

examples/auth_demo/auth_demo/auth/config.py

@@ -16,7 +16,7 @@
 
 """Configuration of the auth context."""
 
-__all__ = ["DemoAuthContext", "DemoAuthConfig"]
+__all__ = ["DemoAuthConfig", "DemoAuthContext"]
 
 from typing import Any, cast
 

examples/ghga_auth/ghga_auth/policies.py

@@ -32,7 +32,7 @@
     require_auth_context_using_credentials,
 )
 
-__all__ = ["OptionalAuthContext", "UserAuthContext", "AdminAuthContext"]
+__all__ = ["AdminAuthContext", "OptionalAuthContext", "UserAuthContext"]
 
 
 async def get_auth_context(

pyproject.toml

@@ -89,6 +89,7 @@ fixable = [
     "UP",
     "I",
     "D",
+    "RUF022",
 ]
 ignore = [
     "E111",
@@ -107,6 +108,8 @@ ignore = [
     "D107",
     "D206",
     "D300",
+    "UP040",
+    "PLC0206",
 ]
 select = [
     "C90",

src/ghga_service_commons/api/api.py

@@ -47,12 +47,12 @@
 __all__ = [
     "CORRELATION_ID_HEADER_NAME",
     "ApiConfigBase",
-    "set_header_correlation_id",
-    "get_validated_correlation_id",
-    "correlation_id_middleware",
+    "UnexpectedCorrelationIdError",
     "configure_app",
+    "correlation_id_middleware",
+    "get_validated_correlation_id",
     "run_server",
-    "UnexpectedCorrelationIdError",
+    "set_header_correlation_id",
 ]
 
 # unofficial, but frequently used header name

src/ghga_service_commons/api/mock_router.py

@@ -29,9 +29,9 @@
 from ghga_service_commons.httpyexpect.server.exceptions import HttpException
 
 __all__ = [
+    "HttpException",
     "MockRouter",
     "assert_all_responses_were_requested",
-    "HttpException",
 ]
 
 BRACKET_PATTERN = re.compile(r"{.*?}")

src/ghga_service_commons/api/testing.py

@@ -21,7 +21,7 @@
 
 import httpx
 
-__all__ = ["get_free_port", "AsyncTestClient"]
+__all__ = ["AsyncTestClient", "get_free_port"]
 
 
 def get_free_port() -> int:

src/ghga_service_commons/http/correlation.py

@@ -25,7 +25,7 @@
 
 CORRELATION_ID_HEADER_NAME = "X-Request-Id"
 
-__all__ = ["attach_correlation_id_to_requests", "AsyncClient"]
+__all__ = ["AsyncClient", "attach_correlation_id_to_requests"]
 
 
 async def _cid_request_hook(request, generate_correlation_id: bool):

src/ghga_service_commons/httpyexpect/client/__init__.py

@@ -18,7 +18,7 @@
 exceptions.
 """
 
-__all__ = ["Response", "ExceptionMapping", "ResponseTranslator"]
+__all__ = ["ExceptionMapping", "Response", "ResponseTranslator"]
 
 from ghga_service_commons.httpyexpect.client.custom_types import Response
 from ghga_service_commons.httpyexpect.client.mapping import ExceptionMapping

src/ghga_service_commons/httpyexpect/client/mapping.py

@@ -39,7 +39,7 @@
     validate_exception_id,
 )
 
-__all__ = ["EXCEPTION_FACTORY_PARAMS", "FactoryKit", "ExceptionMapping"]
+__all__ = ["EXCEPTION_FACTORY_PARAMS", "ExceptionMapping", "FactoryKit"]
 
 EXCEPTION_FACTORY_PARAMS = ("status_code", "exception_id", "description", "data")