Remove leftover Django < 3.2 support

Author: bluetech

pytest_django/fixtures.py

@@ -2,15 +2,13 @@
 import os
 from contextlib import contextmanager
 from functools import partial
-from typing import (
-    Any, Callable, Generator, Iterable, List, Optional, Tuple, Union,
-)
+from typing import Any, Generator, Iterable, List, Optional, Tuple, Union
 
 import pytest
 
 from . import live_server_helper
 from .django_compat import is_django_unittest
-from .lazy_django import get_django_version, skip_if_no_django
+from .lazy_django import skip_if_no_django
 
 
 TYPE_CHECKING = False
@@ -216,12 +214,12 @@ class PytestDjangoTestCase(test_case_class):  # type: ignore[misc,valid-type]
             @classmethod
             def setUpClass(cls) -> None:
                 super(django.test.TestCase, cls).setUpClass()
-                if (3, 2) <= VERSION < (4, 1):
+                if VERSION < (4, 1):
                     django.db.transaction.Atomic._ensure_durability = False
 
             @classmethod
             def tearDownClass(cls) -> None:
-                if (3, 2) <= VERSION < (4, 1):
+                if VERSION < (4, 1):
                     django.db.transaction.Atomic._ensure_durability = True
                 super(django.test.TestCase, cls).tearDownClass()
 
@@ -616,36 +614,8 @@ def django_assert_max_num_queries(pytestconfig):
     return partial(_assert_num_queries, pytestconfig, exact=False)
 
 
-@contextmanager
-def _capture_on_commit_callbacks(
-    *,
-    using: Optional[str] = None,
-    execute: bool = False
-):
-    from django.db import DEFAULT_DB_ALIAS, connections
-    from django.test import TestCase
-
-    if using is None:
-        using = DEFAULT_DB_ALIAS
-
-    # Polyfill of Django code as of Django 3.2.
-    if get_django_version() < (3, 2):
-        callbacks: List[Callable[[], Any]] = []
-        start_count = len(connections[using].run_on_commit)
-        try:
-            yield callbacks
-        finally:
-            run_on_commit = connections[using].run_on_commit[start_count:]
-            callbacks[:] = [func for sids, func in run_on_commit]
-            if execute:
-                for callback in callbacks:
-                    callback()
-
-    else:
-        with TestCase.captureOnCommitCallbacks(using=using, execute=execute) as callbacks:
-            yield callbacks
-
-
 @pytest.fixture(scope="function")
 def django_capture_on_commit_callbacks():
-    return _capture_on_commit_callbacks
+    from django.test import TestCase
+
+    return TestCase.captureOnCommitCallbacks

tests/test_database.py

@@ -1,7 +1,6 @@
 import pytest
 from django.db import connection, transaction
 
-from pytest_django.lazy_django import get_django_version
 from pytest_django_test.app.models import Item, SecondItem
 
 
@@ -194,7 +193,6 @@ def test_fin(self, fin: None) -> None:
         # Check finalizer has db access (teardown will fail if not)
         pass
 
-    @pytest.mark.skipif(get_django_version() < (3, 2), reason="Django >= 3.2 required")
     def test_durable_transactions(self, all_dbs: None) -> None:
         with transaction.atomic(durable=True):
             item = Item.objects.create(name="foo")

tests/test_fixtures.py

@@ -16,7 +16,6 @@
 from django.test.client import Client, RequestFactory
 from django.utils.encoding import force_str
 
-from pytest_django.lazy_django import get_django_version
 from pytest_django_test.app.models import Item
 
 
@@ -36,7 +35,6 @@ def test_client(client) -> None:
     assert isinstance(client, Client)
 
 
-@pytest.mark.skipif(get_django_version() < (3, 1), reason="Django >= 3.1 required")
 def test_async_client(async_client) -> None:
     from django.test.client import AsyncClient
 
@@ -85,7 +83,6 @@ def test_rf(rf) -> None:
     assert isinstance(rf, RequestFactory)
 
 
-@pytest.mark.skipif(get_django_version() < (3, 1), reason="Django >= 3.1 required")
 def test_async_rf(async_rf) -> None:
     from django.test.client import AsyncRequestFactory