min python 3.10 changes

Author: kingbuzzman

.github/workflows/main.yml

@@ -1,170 +0,0 @@
-name: main
-
-on:
-  push:
-    branches:
-      - main
-    tags:
-      - "*"
-  pull_request:
-
-concurrency:
-  group: ${{ github.workflow }}-${{ github.ref }}
-  cancel-in-progress: ${{ github.ref != 'refs/heads/main' }}
-
-env:
-  PYTEST_ADDOPTS: "--color=yes"
-
-# Set permissions at the job level.
-permissions: {}
-
-jobs:
-  test:
-    runs-on: ubuntu-24.04
-    continue-on-error: ${{ matrix.allow_failure }}
-    timeout-minutes: 15
-    permissions:
-      contents: read
-      security-events: write
-    env:
-      TOXENV: ${{ matrix.name }}
-    steps:
-      - uses: actions/checkout@v5
-        with:
-          persist-credentials: false
-
-      - uses: actions/setup-python@v6
-        with:
-          python-version: ${{ matrix.python }}
-
-      - name: Setup mysql
-        if: contains(matrix.name, 'mysql')
-        run: |
-          sudo systemctl start mysql.service
-          echo "TEST_DB_USER=root" >> $GITHUB_ENV
-          echo "TEST_DB_PASSWORD=root" >> $GITHUB_ENV
-
-      - name: Setup postgresql
-        if: contains(matrix.name, 'postgres')
-        run: |
-          sudo systemctl start postgresql.service
-          sudo -u postgres createuser --createdb $USER
-
-      - name: Install dependencies
-        run: |
-          python -m pip install uv
-          uv tool install tox==4.28.4 --with tox-uv
-
-      - name: Run tox
-        run: tox
-
-      - name: Upload zizmor SARIF report into the GitHub repo code scanning
-        if: contains(matrix.name, 'linting')
-        uses: github/codeql-action/upload-sarif@v4
-        with:
-          sarif_file: zizmor.sarif
-          category: zizmor
-
-      - name: Report coverage
-        if: contains(matrix.name, 'coverage')
-        uses: codecov/codecov-action@v5
-        with:
-          fail_ci_if_error: true
-          files: ./coverage.xml
-          token: ${{ secrets.CODECOV_TOKEN }}
-
-    strategy:
-      fail-fast: false
-      matrix:
-        include:
-        - name: linting,docs
-          python: '3.13'
-          allow_failure: false
-
-        # Explicitly test min pytest.
-        - name: py313-dj52-sqlite-pytestmin-coverage
-          python: '3.13'
-          allow_failure: false
-
-        - name: py314-djmain-postgres-xdist-coverage
-          python: '3.14'
-          allow_failure: true
-
-        - name: py314-dj52-postgres-xdist-coverage
-          python: '3.14'
-          allow_failure: false
-
-        - name: py313-dj52-postgres-xdist-coverage
-          python: '3.13'
-          allow_failure: false
-
-        - name: py313-dj51-postgres-xdist-coverage
-          python: '3.13'
-          allow_failure: false
-
-        - name: py312-dj42-postgres-xdist-coverage
-          python: '3.12'
-          allow_failure: false
-
-        - name: py311-dj50-postgres-xdist-coverage
-          python: '3.11'
-          allow_failure: false
-
-        - name: py311-dj42-postgres-xdist-coverage
-          python: '3.11'
-          allow_failure: false
-
-        - name: py310-dj52-postgres-xdist-coverage
-          python: '3.10'
-          allow_failure: false
-
-        - name: py310-dj51-postgres-xdist-coverage
-          python: '3.10'
-          allow_failure: false
-
-        - name: py310-dj42-postgres-xdist-coverage
-          python: '3.10'
-          allow_failure: false
-
-        - name: py311-dj51-mysql-coverage
-          python: '3.11'
-          allow_failure: false
-
-        - name: py310-dj42-mysql-coverage
-          python: '3.10'
-          allow_failure: false
-
-        - name: py313-djmain-sqlite-coverage
-          python: '3.13'
-          allow_failure: true
-
-        - name: py313-dj52-sqlite-coverage
-          python: '3.13'
-          allow_failure: false
-
-        - name: py312-dj51-sqlite-xdist-coverage
-          python: '3.12'
-          allow_failure: false
-
-        - name: py311-dj42-sqlite-xdist-coverage
-          python: '3.11'
-          allow_failure: false
-
-        # pypy3: not included with coverage reports (much slower then).
-        - name: pypy3-dj42-postgres
-          python: 'pypy3.10'
-          allow_failure: false
-
-  check:  # This job does nothing and is only used for the branch protection
-    if: always()
-
-    needs:
-    - test
-
-    runs-on: ubuntu-24.04
-
-    steps:
-    - name: Decide whether the needed jobs succeeded or failed
-      uses: re-actors/alls-green@2765efec08f0fd63e83ad900f5fd75646be69ff6
-      with:
-        jobs: ${{ toJSON(needs) }}

pytest_django/asserts.py

@@ -5,7 +5,7 @@
 from __future__ import annotations
 
 from functools import wraps
-from typing import TYPE_CHECKING, Any, Callable
+from typing import TYPE_CHECKING
 
 from django import VERSION
 from django.test import LiveServerTestCase, SimpleTestCase, TestCase, TransactionTestCase
@@ -24,6 +24,15 @@ class MessagesTestCase(MessagesTestMixin, TestCase):
 else:
     test_case = TestCase("run")
 
+if TYPE_CHECKING:
+    from collections.abc import Callable, Collection, Iterator, Sequence
+    from contextlib import AbstractContextManager
+    from typing import overload, Any
+
+    from django import forms
+    from django.db.models import Model, QuerySet, RawQuerySet
+    from django.http.response import HttpResponseBase
+
 
 def _wrapper(name: str) -> Callable[..., Any]:
     func = getattr(test_case, name)
@@ -55,14 +64,6 @@ def assertion_func(*args: Any, **kwargs: Any) -> Any:
 
 
 if TYPE_CHECKING:
-    from collections.abc import Collection, Iterator, Sequence
-    from contextlib import AbstractContextManager
-    from typing import overload
-
-    from django import forms
-    from django.db.models import Model, QuerySet, RawQuerySet
-    from django.http.response import HttpResponseBase
-
     def assertRedirects(
         response: HttpResponseBase,
         expected_url: str,

pytest_django/fixtures.py

@@ -3,7 +3,7 @@
 from __future__ import annotations
 
 import os
-from collections.abc import Generator, Iterable, Sequence
+from collections.abc import Callable, Generator, Iterable, Sequence
 from contextlib import AbstractContextManager, contextmanager
 from functools import partial
 from typing import TYPE_CHECKING, Protocol
@@ -16,16 +16,16 @@
 
 
 if TYPE_CHECKING:
-    from typing import Any, Callable, Literal, Optional, Union
+    from typing import Any, Literal, Union
 
     import django
     import django.test
 
     from . import DjangoDbBlocker
     from .django_compat import _User, _UserModel
 
-    _DjangoDbDatabases = Optional[Union[Literal["__all__"], Iterable[str]]]
-    _DjangoDbAvailableApps = Optional[list[str]]
+    _DjangoDbDatabases = Union[Literal["__all__"] | Iterable[str]]
+    _DjangoDbAvailableApps = list[str] | None
     # transaction, reset_sequences, databases, serialized_rollback, available_apps
     _DjangoDb = tuple[bool, bool, _DjangoDbDatabases, bool, _DjangoDbAvailableApps]