[pull] master from jazzband:master

.github/workflows/release.yml

@@ -11,12 +11,12 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
         with:
           fetch-depth: 0
 
       - name: Set up Python
-        uses: actions/setup-python@v2
+        uses: actions/setup-python@v5
         with:
           python-version: '3.10'
 

.github/workflows/test.yml

@@ -6,8 +6,8 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        python-version: ["3.7", "3.8", "3.9", "3.10", "3.11", "3.12"]
-        django-version: ["3.2", "4.2", "5.0"]
+        python-version: ["3.7", "3.8", "3.9", "3.10", "3.11", "3.12", "3.13"]
+        django-version: ["3.2", "4.2", "5.1"]
         exclude:
           # Python 3.7 is not compatible with 4.1
           - python-version: "3.7"
@@ -17,19 +17,21 @@ jobs:
             django-version: "3.2"
           - python-version: "3.12"
             django-version: "3.2"
-          # django 5.0 is not compatible with python 3.9 or lower
+          - python-version: "3.13"
+            django-version: "3.2"
+          # django 5.x is not compatible with python 3.9 or lower
           - python-version: "3.7"
-            django-version: "5.0"
+            django-version: "5.1"
           - python-version: "3.8"
-            django-version: "5.0"
+            django-version: "5.1"
           - python-version: "3.9"
-            django-version: "5.0"
+            django-version: "5.1"
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - name: Set up Python ${{ matrix.python-version }}
-        uses: actions/setup-python@v3
+        uses: actions/setup-python@v5
         with:
           python-version: ${{ matrix.python-version }}
           cache: 'pip'
@@ -39,9 +41,10 @@ jobs:
           pip install -r requirements.txt
           pip install "Django~=${{ matrix.django-version }}.0" .
 
-      - name: Run mypy
+      - name: Run type checking
         run: |
           python -m mypy dj_database_url
+          python -m pyright dj_database_url
 
       - name: Run Tests
         run: |
@@ -50,10 +53,11 @@ jobs:
           coverage report
           coverage xml
 
-      - uses: codecov/codecov-action@v3
+      - uses: codecov/codecov-action@v4
 
-      - name: Check mypy types installation
+      - name: Check types installation
         run: |
           pip install .
           cd tests
           python -m mypy .
+          python -m pyright .

dj_database_url/__init__.py

@@ -41,7 +41,7 @@
 # Register database schemes in URLs.
 for key in SCHEMES.keys():
     urlparse.uses_netloc.append(key)
-del key
+del key  # pyright: ignore[reportPossiblyUnboundVariable]
 
 
 # From https://docs.djangoproject.com/en/4.0/ref/settings/#databases
@@ -70,7 +70,7 @@ def config(
     conn_health_checks: bool = False,
     disable_server_side_cursors: bool = False,
     ssl_require: bool = False,
-    test_options: Optional[Dict] = None,
+    test_options: Optional[Dict[str, Any]] = None,
 ) -> DBConfig:
     """Returns configured DATABASE dictionary from DATABASE_URL."""
     s = os.environ.get(env, default)
@@ -101,7 +101,7 @@ def parse(
     conn_health_checks: bool = False,
     disable_server_side_cursors: bool = False,
     ssl_require: bool = False,
-    test_options: Optional[dict] = None,
+    test_options: Optional[Dict[str, Any]] = None,
 ) -> DBConfig:
     """Parses a database URL."""
     if url == "sqlite://:memory:":

pyproject.toml

@@ -6,3 +6,6 @@ show_error_codes=true
 disallow_untyped_defs=true
 disallow_untyped_calls=true
 warn_redundant_casts=true
+
+[tool.pyright]
+typeCheckingMode = "strict"

requirements.txt

@@ -1,2 +1,3 @@
 coverage
 mypy
+pyright

setup.py

@@ -1,6 +1,6 @@
 from pathlib import Path
 
-from setuptools import setup
+from setuptools import setup  # pyright: ignore[reportUnknownVariableType]
 
 readme = Path("README.rst").read_text()
 
@@ -31,7 +31,7 @@
         "Framework :: Django",
         "Framework :: Django :: 3.2",
         "Framework :: Django :: 4.2",
-        "Framework :: Django :: 5.0",
+        "Framework :: Django :: 5.1",
         "Intended Audience :: Developers",
         "License :: OSI Approved :: BSD License",
         "Operating System :: OS Independent",
@@ -46,5 +46,6 @@
         "Programming Language :: Python :: 3.10",
         "Programming Language :: Python :: 3.11",
         "Programming Language :: Python :: 3.12",
+        "Programming Language :: Python :: 3.13",
     ],
 )

tests/test_dj_database_url.py

@@ -1,3 +1,5 @@
+# pyright: reportTypedDictNotRequiredAccess=false
+
 import os
 import unittest
 from unittest import mock