Drop Python 3.9 support

Author: frankie567

.github/workflows/build.yml

@@ -3,12 +3,11 @@ name: Build
 on: [push, pull_request]
 
 jobs:
-
   test:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        python_version: [3.9, '3.10', '3.11', '3.12', '3.13']
+        python_version: ["3.10", "3.11", "3.12", "3.13", "3.14"]
 
     services:
       mongo:
@@ -17,60 +16,60 @@ jobs:
           - 27017:27017
 
     steps:
-    - uses: actions/checkout@v4
-    - name: Set up Python
-      uses: actions/setup-python@v5
-      with:
-        python-version: ${{ matrix.python_version }}
-    - name: Install dependencies
-      run: |
-        python -m pip install --upgrade pip
-        pip install hatch
-        hatch env create
-    - name: Lint and typecheck
-      run: |
-        hatch run lint-check
-    - name: Test
-      run: |
-        hatch run test-cov-xml
-    - uses: codecov/codecov-action@v5
-      with:
-        token: ${{ secrets.CODECOV_TOKEN }}
-        fail_ci_if_error: true
-        verbose: true
-    - name: Build and install it on system host
-      run: |
-        hatch build
-        pip install dist/fastapi_users_db_beanie-*.whl
-        python test_build.py
+      - uses: actions/checkout@v4
+      - name: Set up Python
+        uses: actions/setup-python@v5
+        with:
+          python-version: ${{ matrix.python_version }}
+      - name: Install dependencies
+        run: |
+          python -m pip install --upgrade pip
+          pip install hatch
+          hatch env create
+      - name: Lint and typecheck
+        run: |
+          hatch run lint-check
+      - name: Test
+        run: |
+          hatch run test-cov-xml
+      - uses: codecov/codecov-action@v5
+        with:
+          token: ${{ secrets.CODECOV_TOKEN }}
+          fail_ci_if_error: true
+          verbose: true
+      - name: Build and install it on system host
+        run: |
+          hatch build
+          pip install dist/fastapi_users_db_beanie-*.whl
+          python test_build.py
 
   release:
     runs-on: ubuntu-latest
     needs: test
     if: startsWith(github.ref, 'refs/tags/')
 
     steps:
-    - uses: actions/checkout@v4
-    - name: Set up Python
-      uses: actions/setup-python@v5
-      with:
-        python-version: 3.9
-    - name: Install dependencies
-      shell: bash
-      run: |
-        python -m pip install --upgrade pip
-        pip install hatch
-    - name: Build and publish on PyPI
-      env:
-        HATCH_INDEX_USER: ${{ secrets.HATCH_INDEX_USER }}
-        HATCH_INDEX_AUTH: ${{ secrets.HATCH_INDEX_AUTH }}
-      run: |
-        hatch build
-        hatch publish
-    - name: Create release
-      uses: ncipollo/release-action@v1
-      with:
-        draft: true
-        body: ${{ github.event.head_commit.message }}
-        artifacts: dist/*.whl,dist/*.tar.gz
-        token: ${{ secrets.GITHUB_TOKEN }}
+      - uses: actions/checkout@v4
+      - name: Set up Python
+        uses: actions/setup-python@v5
+        with:
+          python-version: "3.10"
+      - name: Install dependencies
+        shell: bash
+        run: |
+          python -m pip install --upgrade pip
+          pip install hatch
+      - name: Build and publish on PyPI
+        env:
+          HATCH_INDEX_USER: ${{ secrets.HATCH_INDEX_USER }}
+          HATCH_INDEX_AUTH: ${{ secrets.HATCH_INDEX_AUTH }}
+        run: |
+          hatch build
+          hatch publish
+      - name: Create release
+        uses: ncipollo/release-action@v1
+        with:
+          draft: true
+          body: ${{ github.event.head_commit.message }}
+          artifacts: dist/*.whl,dist/*.tar.gz
+          token: ${{ secrets.GITHUB_TOKEN }}

fastapi_users_db_beanie/__init__.py

@@ -1,6 +1,6 @@
 """FastAPI Users database adapter for Beanie."""
 
-from typing import Any, Generic, Optional, TypeVar
+from typing import Any, Generic, TypeVar
 
 import bson.errors
 from beanie import Document, PydanticObjectId
@@ -46,8 +46,8 @@ class BaseOAuthAccount(BaseModel):
     access_token: str
     account_id: str
     account_email: str
-    expires_at: Optional[int] = None
-    refresh_token: Optional[str] = None
+    expires_at: int | None = None
+    refresh_token: str | None = None
 
 
 class BeanieUserDatabase(
@@ -63,16 +63,16 @@ class BeanieUserDatabase(
     def __init__(
         self,
         user_model: type[UP_BEANIE],
-        oauth_account_model: Optional[type[BaseOAuthAccount]] = None,
+        oauth_account_model: type[BaseOAuthAccount] | None = None,
     ):
         self.user_model = user_model
         self.oauth_account_model = oauth_account_model
 
-    async def get(self, id: ID) -> Optional[UP_BEANIE]:
+    async def get(self, id: ID) -> UP_BEANIE | None:
         """Get a single user by id."""
         return await self.user_model.get(id)  # type: ignore
 
-    async def get_by_email(self, email: str) -> Optional[UP_BEANIE]:
+    async def get_by_email(self, email: str) -> UP_BEANIE | None:
         """Get a single user by email."""
         return await self.user_model.find_one(
             self.user_model.email == email,
@@ -81,7 +81,7 @@ async def get_by_email(self, email: str) -> Optional[UP_BEANIE]:
 
     async def get_by_oauth_account(
         self, oauth: str, account_id: str
-    ) -> Optional[UP_BEANIE]:
+    ) -> UP_BEANIE | None:
         """Get a single user by OAuth account id."""
         if self.oauth_account_model is None:
             raise NotImplementedError()

fastapi_users_db_beanie/access_token.py

@@ -2,7 +2,6 @@
 from typing import (
     Any,
     Generic,
-    Optional,
     TypeVar,
 )
 
@@ -39,8 +38,8 @@ def __init__(self, access_token_model: type[AP_BEANIE]):
         self.access_token_model = access_token_model
 
     async def get_by_token(
-        self, token: str, max_age: Optional[datetime] = None
-    ) -> Optional[AP_BEANIE]:
+        self, token: str, max_age: datetime | None = None
+    ) -> AP_BEANIE | None:
         query: dict[str, Any] = {"token": token}
         if max_age is not None:
             query["created_at"] = {"$gte": max_age}

pyproject.toml

@@ -4,7 +4,7 @@ asyncio_default_fixture_loop_scope = "function"
 addopts = "--ignore=test_build.py"
 
 [tool.ruff]
-target-version = "py39"
+target-version = "py310"
 
 [tool.ruff.lint]
 extend-select = ["I", "UP"]
@@ -75,17 +75,17 @@ classifiers = [
     "Framework :: FastAPI",
     "Framework :: AsyncIO",
     "Intended Audience :: Developers",
-    "Programming Language :: Python :: 3.9",
     "Programming Language :: Python :: 3.10",
     "Programming Language :: Python :: 3.11",
     "Programming Language :: Python :: 3.12",
     "Programming Language :: Python :: 3.13",
+    "Programming Language :: Python :: 3.14",
     "Programming Language :: Python :: 3 :: Only",
     "Topic :: Internet :: WWW/HTTP :: Session",
 ]
-requires-python = ">=3.9"
+requires-python = ">=3.10"
 dependencies = [
-    "fastapi-users >= 10.0.1",
+    "fastapi-users >= 15.0.1",
     "beanie >=1.11.0,<2.0.0",
 ]
 

tests/test_fastapi_users_db_beanie.py

@@ -1,5 +1,5 @@
 from collections.abc import AsyncGenerator
-from typing import Any, Optional
+from typing import Any
 
 import pymongo.errors
 import pytest
@@ -18,7 +18,7 @@
 
 
 class User(Document, BeanieBaseUser):
-    first_name: Optional[str] = None
+    first_name: str | None = None
 
 
 class OAuthAccount(BaseOAuthAccount):