From edd9a3c3c3570b4b35f20e66f0f42a420bc64d52 Mon Sep 17 00:00:00 2001 From: jelmert Date: Tue, 8 Apr 2025 09:43:46 +0200 Subject: [PATCH 1/4] Do not pin versions --- requirements-mypy.txt | 2 +- requirements-test.txt | 7 ++++--- tox.ini | 2 +- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/requirements-mypy.txt b/requirements-mypy.txt index a7b6bb9..ed46f7a 100644 --- a/requirements-mypy.txt +++ b/requirements-mypy.txt @@ -1,3 +1,3 @@ mypy==1.10.0 django-stubs==5.0.2 -pytest==7.4.3 +pytest diff --git a/requirements-test.txt b/requirements-test.txt index ee53835..337a246 100644 --- a/requirements-test.txt +++ b/requirements-test.txt @@ -1,4 +1,5 @@ -pytest==7.4.3 -pytest-django==4.5.2 -psycopg2-binary==2.9.9 +pytest +pytest-django +psycopg2-binary +psycopg pytest-cov==4.1.0 diff --git a/tox.ini b/tox.ini index dc53a96..db1bbbf 100644 --- a/tox.ini +++ b/tox.ini @@ -23,7 +23,7 @@ python = [testenv] deps = - time-machine==2.4.1 + time-machine -rrequirements-test.txt dj32: Django==3.2.* dj40: Django==4.0.* From a8e3298260a1485e8397dbf1718e04e66df3e9eb Mon Sep 17 00:00:00 2001 From: jelmert Date: Tue, 8 Apr 2025 09:44:42 +0200 Subject: [PATCH 2/4] Use postgres 14 --- .github/workflows/test.yml | 2 +- docker-compose.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 177cbf9..065a166 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -26,7 +26,7 @@ jobs: services: postgres: - image: postgres:13-alpine + image: postgres:14-alpine env: POSTGRES_USER: ${{ env.POSTGRES_USER }} POSTGRES_PASSWORD: ${{ env.POSTGRES_PASSWORD }} diff --git a/docker-compose.yml b/docker-compose.yml index 6e74ec8..5299dc3 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,6 +1,6 @@ services: postgres: - image: postgres:13-alpine + image: postgres:14-alpine environment: POSTGRES_HOST_AUTH_METHOD: trust POSTGRES_DB: modelutils From 2ad921c04d9a36d63cd08bd08767f81999d5e062 Mon Sep 17 00:00:00 2001 From: jelmert Date: Tue, 8 Apr 2025 09:49:47 +0200 Subject: [PATCH 3/4] Model.save keyword only --- tests/test_fields/test_field_tracker.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/tests/test_fields/test_field_tracker.py b/tests/test_fields/test_field_tracker.py index f2f2127..b823eb6 100644 --- a/tests/test_fields/test_field_tracker.py +++ b/tests/test_fields/test_field_tracker.py @@ -124,7 +124,12 @@ class FieldTrackerTests(FieldTrackerCommonMixin, TestCase): def test_save_with_args(self) -> None: self.instance.number = 1 - self.instance.save(False, False, None, None) + self.instance.save( + force_insert=False, + force_update=False, + using=None, + update_fields=None + ) self.assertChanged() def test_first_save(self) -> None: From 10c43ce7a6cccfd65e32382a8d8b7b95c6e09ab6 Mon Sep 17 00:00:00 2001 From: jelmert Date: Tue, 8 Apr 2025 09:39:27 +0200 Subject: [PATCH 4/4] Add formal support for Django 5.2 --- CHANGES.rst | 1 + setup.py | 1 + tox.ini | 2 ++ 3 files changed, 4 insertions(+) diff --git a/CHANGES.rst b/CHANGES.rst index ad37fed..69df303 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -4,6 +4,7 @@ Changelog To be released ------------------ - Add support for `Python 3.13` (GH-#628) +- Add formal support for `Django 5.2` (GH-#641) 5.0.0 (2024-09-01) ------------------ diff --git a/setup.py b/setup.py index 010293c..9eea6ed 100644 --- a/setup.py +++ b/setup.py @@ -52,6 +52,7 @@ setup( 'Framework :: Django :: 4.2', 'Framework :: Django :: 5.0', 'Framework :: Django :: 5.1', + 'Framework :: Django :: 5.2', ], zip_safe=False, package_data={ diff --git a/tox.ini b/tox.ini index db1bbbf..94f2b65 100644 --- a/tox.ini +++ b/tox.ini @@ -6,6 +6,7 @@ envlist = py{38,39,310,311}-dj{42} py{310,311,312}-dj{50} py{310,311,312}-dj{51} + py{310,311,312,313}-dj{51,52} py{310,311,312,313}-dj{main} flake8 isort @@ -31,6 +32,7 @@ deps = dj42: Django==4.2.* dj50: Django==5.0.* dj51: Django==5.1.* + dj52: Django==5.2.* djmain: https://github.com/django/django/archive/main.tar.gz ignore_outcome = djmain: True