Support Django 5.2, Upgrade to Poetry 2.x (#504)

* add django 5.2b1 to CI matrix to illustrate #503

* add django 5.2 compatible postgres db to docker compose

* tweak unittest to illustrate #503 bug

* pass lint

* second attempt to make the linter happy

* are you kidding me? lol

* codecov-action file is deprecated - use files isntead

* Fix unit target in makefile, spaces instead of tabs meant tests were not being run. Use alternate port for second postgres container. Override setUpClass to illustrate the bug

* fix #503. We simply convert the _pre_setup to a classmethod. Its fine that it only runs once for all tests on the class. The receivers are restored to the originals each time.

* upgrade to poetry 2.x

* silence deprecation warning by removing unnecessary i18n setting

* switch _pre_setup definition based on django version

* because we now have different code paths depending on django versions we need to aggregate our coverage files from all CI jobs to see the real total

* fail CI if aggregated coverage is less than 100

* make coverage file name artifacts unique

* add missing poetry instal to coverage-combine

* fix coverage tool combine invocations to use poetry run

* Update pyproject.toml

Co-authored-by: sobolevn <[email protected]>

* revert back to failing on <100% test coverage - exempt _pre_setup from coverage

* fix requires-python - uv balked at the carrot format?

* remove coverage aggregation

* update lock file

---------

Co-authored-by: sobolevn <[email protected]>

Author: bckohan

.github/workflows/test.yml

@@ -27,10 +27,11 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        python-version: ['3.10', '3.11', '3.12']
+        python-version: ['3.10', '3.11', '3.12', '3.13']
         django-version:
           - 'Django~=4.2.0'
           - 'Django~=5.0.0'
+          - 'Django==5.2b1'
         docker-compose-services: ['']
         additional-dependencies: ['']
         env: [{}]
@@ -50,6 +51,14 @@ jobs:
             env:
               DJANGO_DATABASE_ENGINE: 'django.db.backends.postgresql'
               DJANGO_DATABASE_PORT: 5432
+          
+          - python-version: '3.13'
+            django-version: 'Django==5.2b1'
+            docker-compose-services: postgresql-db-17
+            additional-dependencies: psycopg
+            env:
+              DJANGO_DATABASE_ENGINE: 'django.db.backends.postgresql'
+              DJANGO_DATABASE_PORT: 5433
           # TODO: reenable
           # - python-version: '3.12'
           #   django-version: 'Django~=5.0.0'
@@ -130,7 +139,8 @@ jobs:
       - name: Upload coverage to Codecov
         uses: codecov/codecov-action@v5
         with:
-          file: ./coverage.xml
+          files:
+            ./coverage.xml
 
       - name: Stop docker-compose services
         if: ${{ always() && matrix.docker-compose-services }}

Makefile

@@ -7,8 +7,8 @@ lint:
 
 .PHONY: unit
 unit:
-  # We need one more test run to make sure that `--nomigrations` work:
-  poetry run pytest -p no:cov -o addopts="" --nomigrations
+	# We need one more test run to make sure that `--nomigrations` work:
+	poetry run pytest -p no:cov -o addopts="" --nomigrations
 	poetry run pytest
 
 .PHONY: package

django_test_app/django_test_app/settings.py

@@ -123,8 +123,6 @@
 
 USE_I18N = True
 
-USE_L10N = True
-
 USE_TZ = True
 
 

django_test_migrations/contrib/unittest_case.py

@@ -1,5 +1,6 @@
-from typing import ClassVar, Optional
+from typing import Any, ClassVar, List, Optional
 
+import django
 from django.db.migrations.state import ProjectState
 from django.db.models.signals import post_migrate, pre_migrate
 from django.test import TransactionTestCase, tag
@@ -21,6 +22,10 @@ class MigratorTestCase(TransactionTestCase):
     migrate_from: ClassVar[MigrationSpec]
     migrate_to: ClassVar[MigrationSpec]
 
+    # hold original receivers to restore them after each test
+    _pre_migrate_receivers: List[Any]
+    _post_migrate_receivers: List[Any]
+
     def setUp(self) -> None:
         """
         Regular ``unittest`` styled setup case.
@@ -54,11 +59,21 @@ def tearDown(self) -> None:
         self._migrator.reset()
         super().tearDown()
 
-    def _pre_setup(self) -> None:
-        self._pre_migrate_receivers, pre_migrate.receivers = (  # noqa: WPS414
+    @classmethod
+    def _store_receivers(cls) -> None:
+        cls._pre_migrate_receivers, pre_migrate.receivers = (  # noqa: WPS414
             pre_migrate.receivers, [],
         )
-        self._post_migrate_receivers, post_migrate.receivers = (  # noqa: WPS414
+        cls._post_migrate_receivers, post_migrate.receivers = (  # noqa: WPS414
             post_migrate.receivers, [],
         )
-        super()._pre_setup()  # type: ignore[misc]
+
+    if django.VERSION[:2] < (5, 2):  # noqa: WPS604 # pragma: no cover
+        def _pre_setup(self) -> None:
+            self._store_receivers()
+            super()._pre_setup()  # type: ignore[misc]
+    else:  # pragma: no cover
+        @classmethod
+        def _pre_setup(cls) -> None:  # type: ignore[misc] # noqa: WPS614,WPS440
+            cls._store_receivers()
+            super()._pre_setup()  # type: ignore[misc]

docker-compose.yml

@@ -11,6 +11,15 @@ services:
       - POSTGRES_PASSWORD=passwd123
       - POSTGRES_DB=db
 
+  postgresql-db-17:
+    image: postgres:17
+    ports:
+      - "5433:5432"
+    environment:
+      - POSTGRES_USER=django
+      - POSTGRES_PASSWORD=passwd123
+      - POSTGRES_DB=db
+
   mysql-db:
     image: mysql:8
     ports:

poetry.lock

@@ -1,11 +1,12 @@
-[tool.poetry]
+[project]
 name = "django-test-migrations"
 version = "1.4.0"
+requires-python = ">=3.9,<4.0"
 description = "Test django schema and data migrations, including ordering"
 license = "MIT"
-
+license-files = [ "LICENSE" ]
 authors = [
-  "sobolevn <[email protected]>"
+  {name = "sobolevn", email = "[email protected]"},
 ]
 
 readme = "README.md"
@@ -38,17 +39,20 @@ classifiers = [
   "Framework :: Django :: 4.1",
   "Framework :: Django :: 4.2",
   "Framework :: Django :: 5.0",
+  "Framework :: Django :: 5.1",
+  "Framework :: Django :: 5.2",
+]
+
+dependencies = [
+  "typing_extensions>=4.0"
 ]
 
-[tool.poetry.plugins.pytest11]
+[project.entry-points."pytest11"]
 django_test_migrations = "django_test_migrations.contrib.pytest_plugin"
 
-[tool.poetry.dependencies]
-python = "^3.9"
-typing_extensions = ">=4.0"
 
 [tool.poetry.group.dev.dependencies]
-django = "^4.2"
+django = ">=4.2,<6.0"
 
 mypy = "^1.11"
 django-stubs = "^5.0"
@@ -65,7 +69,7 @@ pytest-mock = "^3.14"
 
 
 [build-system]
-requires = ["poetry-core>=1.9.0"]
+requires = ["poetry-core>=2.1.0"]
 build-backend = "poetry.core.masonry.api"
 
 

pyproject.toml

@@ -8,6 +8,11 @@ class TestDirectMigration(MigratorTestCase):
     migrate_from = ('main_app', '0002_someitem_is_clean')
     migrate_to = ('main_app', '0003_update_is_clean')
 
+    @classmethod
+    def setUpClass(cls):
+        """Override parent's setUpClass to trigger #503."""
+        super().setUpClass()
+
     def prepare(self):
         """Prepare some data before the migration."""
         SomeItem = self.old_state.apps.get_model('main_app', 'SomeItem')