Upgrade to aiohttp 3.12.15 (merge commit)

Merge branch 'fix/typing' into 'main'
* Upgrade to aiohttp 3.12.15

See merge request https://gitlab.ci.csc.fi/sds-dev/sd-connect/swift-browser-ui/-/merge_requests/448

Approved-by: Monika Radaviciute <mradavic@csc.fi>
Co-authored-by: Timo Nurminen <timo.nurminen@csc.fi>
Merged by Timo Nurminen <tnurmine@csc.fi>

Author: Timo Nurminen

.gitlab-ci.yml

@@ -84,7 +84,7 @@ wasm-test:
     - gem install ceedling
   script:
     - cd swift_browser_ui_frontend/wasm
-    - ceedling
+    - ceedling --verbosity debug
 
 # This job creates the automated releases
 release-job:

pyproject.toml

@@ -22,7 +22,7 @@ classifiers = [
 ]
 dependencies = [
     "aiohttp-session==2.12.1",
-    "aiohttp==3.11.18",
+    "aiohttp==3.12.15",
     "redis==5.2.1",
     "asyncpg==0.30.0",
     "certifi==2025.1.31",

requirements.txt

@@ -1,4 +1,4 @@
-aiohttp==3.11.18
+aiohttp==3.12.15
 aiohttp-session==2.12.1
 redis==5.2.1
 asyncpg==0.30.0

swift_browser_ui/common/common_handlers.py

@@ -6,7 +6,7 @@
 
 
 async def handle_delete_preflight(
-    _: typing.Union[aiohttp.web.Request, None]
+    _: typing.Union[aiohttp.web.Request, None],
 ) -> aiohttp.web.Response:
     """Serve correct response headers to allowed DELETE preflight query."""
     resp = aiohttp.web.Response(
@@ -19,7 +19,7 @@ async def handle_delete_preflight(
 
 
 async def handle_put_get_preflight(
-    _: typing.Union[aiohttp.web.Request, None]
+    _: typing.Union[aiohttp.web.Request, None],
 ) -> aiohttp.web.Response:
     """Serve correct response headers to an allowed PUT preflight query."""
     resp = aiohttp.web.Response(

swift_browser_ui/request/server.py

@@ -101,7 +101,7 @@ async def on_prepare(
 
 
 def run_server_devel(
-    app: typing.Coroutine[typing.Any, typing.Any, aiohttp.web.Application]
+    app: typing.Coroutine[typing.Any, typing.Any, aiohttp.web.Application],
 ) -> None:
     """Run the server in development mode (without HTTPS)."""
     aiohttp.web.run_app(app, access_log=logging.getLogger("aiohttp.access"), port=9091)

swift_browser_ui/sharing/server.py

@@ -107,7 +107,7 @@ async def on_prepare(
 
 
 def run_server_devel(
-    app: typing.Coroutine[typing.Any, typing.Any, aiohttp.web.Application]
+    app: typing.Coroutine[typing.Any, typing.Any, aiohttp.web.Application],
 ) -> None:
     """Run the server in development mode (without HTTPS)."""
     aiohttp.web.run_app(app, access_log=logging.getLogger("aiohttp.access"), port=9090)

swift_browser_ui/ui/_convenience.py

@@ -42,7 +42,7 @@ async def sign(
 
 
 def disable_cache(
-    response: typing.Union[aiohttp.web.Response, aiohttp.web.FileResponse]
+    response: typing.Union[aiohttp.web.Response, aiohttp.web.FileResponse],
 ) -> typing.Union[aiohttp.web.Response, aiohttp.web.FileResponse]:
     """Add cache disabling headers to an aiohttp response."""
     response.headers["Cache-Control"] = "no-cache, no-store, must-revalidate"

swift_browser_ui/ui/login.py

@@ -152,7 +152,7 @@ async def handle_login(
 
 
 async def sso_query_begin(
-    request: typing.Union[aiohttp.web.Request, None]
+    request: typing.Union[aiohttp.web.Request, None],
 ) -> typing.Union[aiohttp.web.Response, aiohttp.web.FileResponse]:
     """Display login page and initiate federated keystone authentication."""
     # Return the form based login page if the service isn't trusted
@@ -179,7 +179,7 @@ async def sso_query_begin(
 
 
 async def sso_query_begin_oidc(
-    request: typing.Union[aiohttp.web.Request, None]
+    request: typing.Union[aiohttp.web.Request, None],
 ) -> typing.Union[aiohttp.web.Response, aiohttp.web.FileResponse]:
     """Initiate a federated Keystone authentication with OIDC."""
     response: typing.Union[aiohttp.web.Response, aiohttp.web.FileResponse]

swift_browser_ui/ui/server.py

@@ -366,7 +366,7 @@ def run_server_secure(
 
 
 def run_server_insecure(
-    app: typing.Coroutine[typing.Any, typing.Any, aiohttp.web.Application]
+    app: typing.Coroutine[typing.Any, typing.Any, aiohttp.web.Application],
 ) -> None:
     """Run the server without https enabled."""
     aiohttp.web.run_app(

swift_browser_ui/upload/server.py

@@ -169,7 +169,7 @@ async def kill_client(app: aiohttp.web.Application) -> None:
 
 
 def run_server(
-    app: typing.Coroutine[typing.Any, typing.Any, aiohttp.web.Application]
+    app: typing.Coroutine[typing.Any, typing.Any, aiohttp.web.Application],
 ) -> None:
     """Run the server."""
     aiohttp.web.run_app(