Support Python 3.14, drop 3.9 (#552)

Author: davidbrochart

.github/workflows/publish-release.yml

@@ -12,7 +12,7 @@ jobs:
   build:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
       - uses: astral-sh/setup-uv@v6
       - run: |
           uv build --all-packages
@@ -30,7 +30,10 @@ jobs:
       id-token: write
     steps:
     - name: Retrieve packages
-      uses: actions/download-artifact@v4
+      uses: actions/download-artifact@v5
+      with:
+        name: dist
+        path: dist
     - name: Upload packages
       uses: pypa/gh-action-pypi-publish@release/v1
 
@@ -41,7 +44,7 @@ jobs:
       permissions:
         contents: write
       steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
       - id: changelog
         uses: agronholm/release-notes@v1
         with:

.github/workflows/test.yml

@@ -18,41 +18,41 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - name: Checkout
-      uses: actions/checkout@v4
-    - uses: actions/setup-python@v5
+      uses: actions/checkout@v5
+    - uses: actions/setup-python@v6
       with:
-        python-version: '3.13'
+        python-version: '3.14'
         cache: 'pip'
     - name: Install hatch
       run: |
-        python3 -m pip install --upgrade pip
-        python3 -m pip install hatch "click <8.3.0"
+        python -m pip install --upgrade pip
+        python -m pip install hatch
     - name: Check types
       run: |
         hatch run dev:typecheck
 
   test:
     name: Tests
-    runs-on: ${{ matrix.os }}
+    runs-on: ${{ matrix.os }}-latest
     strategy:
       fail-fast: false
       matrix:
-        os: [ubuntu-latest, macos-latest, windows-latest]
-        python-version: [ '3.9', '3.10', '3.11', '3.12', '3.13' ]
+        os: [ubuntu, macos, windows]
+        python-version: [ '3.10', '3.11', '3.12', '3.13', '3.14' ]
 
     steps:
     - name: Checkout
-      uses: actions/checkout@v4
+      uses: actions/checkout@v5
 
-    - uses: actions/setup-python@v5
+    - uses: actions/setup-python@v6
       with:
         python-version: ${{ matrix.python-version }}
         cache: 'pip'
 
     - name: Install hatch
       run: |
-        python3 -m pip install --upgrade pip
-        python3 -m pip install hatch "click <8.3.0"
+        python -m pip install --upgrade pip
+        python -m pip install hatch
 
     - name: Run tests
       run: hatch run dev:test

jupyverse_api/jupyverse_api/asgi_websocket_transport.py

@@ -68,11 +68,11 @@ async def __aenter__(
             self._exit_stack = stack.pop_all()
         return retval
 
-    async def __aexit__(self, exc_type, exc_val, exc_tb) -> typing.Union[bool, None]:
+    async def __aexit__(self, exc_type, exc_val, exc_tb) -> bool | None:
         return await self._exit_stack.__aexit__(exc_type, exc_val, exc_tb)
 
     async def read(
-        self, max_bytes: int, timeout: typing.Optional[float] = None
+        self, max_bytes: int, timeout: float | None = None
     ) -> bytes:
         message: Message = await self.receive(timeout=timeout)
         type = message["type"]
@@ -82,10 +82,10 @@ async def read(
 
         event: wsproto.events.Event
         if type == "websocket.send":
-            data_str: typing.Optional[str] = message.get("text")
+            data_str: str | None = message.get("text")
             if data_str is not None:
                 event = wsproto.events.TextMessage(data_str)
-            data_bytes: typing.Optional[bytes] = message.get("bytes")
+            data_bytes: bytes | None = message.get("bytes")
             if data_bytes is not None:
                 event = wsproto.events.BytesMessage(data_bytes)
         elif type == "websocket.close":
@@ -94,7 +94,7 @@ async def read(
         return self.connection.send(event)
 
     async def write(
-        self, buffer: bytes, timeout: typing.Optional[float] = None
+        self, buffer: bytes, timeout: float | None = None
     ) -> None:
         self.connection.receive_data(buffer)
         for event in self.connection.events():
@@ -121,7 +121,7 @@ async def aclose(self) -> None:
     async def send(self, message: Message) -> None:
         self._receive_queue.put(message)
 
-    async def receive(self, timeout: typing.Optional[float] = None) -> Message:
+    async def receive(self, timeout: float | None = None) -> Message:
         while self._send_queue.empty():
             await anyio.sleep(0)
         return self._send_queue.get(timeout=timeout)
@@ -178,9 +178,9 @@ async def __aenter__(self) -> "ASGIWebSocketTransport":
 
     async def __aexit__(
         self,
-        exc_type: typing.Optional[type[BaseException]] = None,
-        exc_val: typing.Optional[BaseException] = None,
-        exc_tb: typing.Optional[TracebackType] = None,
+        exc_type: type[BaseException] | None = None,
+        exc_val: BaseException | None = None,
+        exc_tb: TracebackType | None = None,
     ) -> None:
         await super().__aexit__(exc_type, exc_val, exc_tb)
         await self.exit_stack.__aexit__(exc_type, exc_val, exc_tb)

jupyverse_api/jupyverse_api/auth/__init__.py

@@ -1,8 +1,8 @@
 from __future__ import annotations
 
 from abc import ABC, abstractmethod
-from collections.abc import Awaitable
-from typing import Any, Callable
+from collections.abc import Awaitable, Callable
+from typing import Any
 
 from jupyverse_api import Config
 

jupyverse_api/jupyverse_api/cli.py

@@ -2,17 +2,12 @@
 
 import io
 import json
-import sys
+from importlib.metadata import entry_points
 from typing import Any
 
 import rich_click as click
 from fps.cli._cli import main as fps_main
 
-if sys.version_info < (3, 10):
-    from importlib_metadata import entry_points
-else:
-    from importlib.metadata import entry_points
-
 
 @click.command()  # type: ignore
 @click.option(

jupyverse_api/pyproject.toml

@@ -26,7 +26,6 @@ classifiers = [
   "Programming Language :: Python :: Implementation :: PyPy",
 ]
 dependencies = [
-  "importlib_metadata >=3.6; python_version<'3.10'",
   "pydantic >=2,<3",
   "fastapi >=0.95.0,<1",
   "fps >=0.5.2,<0.6.0",

plugins/auth/fps_auth/routes.py

@@ -3,8 +3,8 @@
 import contextlib
 import json
 import random
-from collections.abc import Awaitable
-from typing import Any, Callable
+from collections.abc import Awaitable, Callable
+from typing import Any
 
 from fastapi import APIRouter, Depends
 from jupyverse_api.app import App

plugins/auth_fief/fps_auth_fief/routes.py

@@ -1,8 +1,8 @@
 from __future__ import annotations
 
 import json
-from collections.abc import Awaitable
-from typing import Any, Callable
+from collections.abc import Awaitable, Callable
+from typing import Any
 
 import httpx
 from fastapi import APIRouter, Depends, Query, Request, Response

plugins/auth_jupyterhub/fps_auth_jupyterhub/routes.py

@@ -2,10 +2,10 @@
 
 import json
 import os
-from collections.abc import Awaitable
+from collections.abc import Awaitable, Callable
 from datetime import datetime
 from functools import partial
-from typing import Annotated, Any, Callable
+from typing import Annotated, Any
 
 from anyio import TASK_STATUS_IGNORED, Lock, create_task_group, sleep
 from anyio.abc import TaskStatus

plugins/kernel_subprocess/fps_kernel_subprocess/connect.py

@@ -5,7 +5,6 @@
 import socket
 import tempfile
 import uuid
-from typing import Union
 
 import zmq
 from zmq_anyio import Socket
@@ -20,7 +19,7 @@
 
 context = zmq.Context()
 
-cfg_t = dict[str, Union[str, int]]
+cfg_t = dict[str, str | int]
 
 
 def get_port(ip: str) -> int: