Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fixtures: drop compat code for no longer supported Django versions #1149

Merged
merged 1 commit into from
Sep 28, 2024
Merged

fixtures: drop compat code for no longer supported Django versions #1149

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 1 addition & 8 deletions pytest_django/fixtures.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -165,8 +165,6 @@ def _django_db_helper(
django_db_setup: None,
django_db_blocker: DjangoDbBlocker,
) -> Generator[None, None, None]:
from django import VERSION

if is_django_unittest(request):
yield
return
Expand Down Expand Up @@ -240,13 +238,9 @@ class PytestDjangoTestCase(test_case_class): # type: ignore[misc,valid-type]
@classmethod
def setUpClass(cls) -> None:
super(django.test.TestCase, cls).setUpClass()
if VERSION < (4, 1):
django.db.transaction.Atomic._ensure_durability = False

@classmethod
def tearDownClass(cls) -> None:
if VERSION < (4, 1):
django.db.transaction.Atomic._ensure_durability = True
super(django.test.TestCase, cls).tearDownClass()

PytestDjangoTestCase.setUpClass()
Expand All @@ -260,8 +254,7 @@ def tearDownClass(cls) -> None:

PytestDjangoTestCase.tearDownClass()

if VERSION >= (4, 0):
PytestDjangoTestCase.doClassCleanups()
PytestDjangoTestCase.doClassCleanups()

django_db_blocker.restore()

Expand Down