From 554d2b855504030e6be39285f6c7eae90d4623b5 Mon Sep 17 00:00:00 2001 From: Javier Buzzi Date: Tue, 17 Feb 2026 11:46:15 +0100 Subject: [PATCH 1/8] Remove old Django versions Removed deprecated Django framework classifiers. --- setup.cfg | 2 -- 1 file changed, 2 deletions(-) diff --git a/setup.cfg b/setup.cfg index 167a69a8..7d16b5bc 100644 --- a/setup.cfg +++ b/setup.cfg @@ -16,8 +16,6 @@ classifiers = Development Status :: 5 - Production/Stable Framework :: Django Framework :: Django :: 4.2 - Framework :: Django :: 5.0 - Framework :: Django :: 5.1 Framework :: Django :: 5.2 Intended Audience :: Developers License :: OSI Approved :: MIT License From f0020457f3fa224071aa2ab2f86bd7b2d3b287d5 Mon Sep 17 00:00:00 2001 From: Javier Buzzi Date: Tue, 17 Feb 2026 11:48:54 +0100 Subject: [PATCH 2/8] Update Django version dependencies in tox.ini --- tox.ini | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/tox.ini b/tox.ini index 5d6bb14d..4ea3ad78 100644 --- a/tox.ini +++ b/tox.ini @@ -8,9 +8,8 @@ envlist = py{39,310,311,312,313,py39,py310,py311} py{39,310,311,312,313}-django42-mongo-alchemy py{py310,py311}-django42-mongo-alchemy - py{310,311,312,313}-django51-mongo-alchemy - pypy310-django51-mongo-alchemy - py310-djangomain-mongo-alchemy + py{310,311,312,313}-django52-mongo-alchemy + pypy310-django52-mongo-alchemy [gh-actions] python = @@ -30,18 +29,13 @@ deps = mongo: mongomock # mongomock imports pkg_resources, provided by setuptools. mongo: setuptools>=66.1.1 - django{42,51,52,main}: Pillow + django{42,52,main}: Pillow django42: Django>=4.2,<5.0 - django51: Django>=5.1,<5.2 django52: Django>=5.2,<6 - djangomain: Django>5.1,<6.0 setenv = py: DJANGO_SETTINGS_MODULE=tests.djapp.settings -pip_pre = - djangomain: true - allowlist_externals = make commands = make test From 2db7ad30474eb56892045c9a636578bb9baf16c1 Mon Sep 17 00:00:00 2001 From: Javier Buzzi Date: Tue, 17 Feb 2026 11:49:57 +0100 Subject: [PATCH 3/8] Remove support for Django 5.0 and 5.1 --- docs/changelog.rst | 2 ++ 1 file changed, 2 insertions(+) diff --git a/docs/changelog.rst b/docs/changelog.rst index 8985587a..8cda51dd 100644 --- a/docs/changelog.rst +++ b/docs/changelog.rst @@ -7,6 +7,8 @@ ChangeLog ------------------ - Add support for Django 5.2 +- Remove support for Django 5.0 +- Remove support for Django 5.1 3.3.3 (2025-02-03) From e96bd28cc0ed47d7290891e2e07827bd7262d1c3 Mon Sep 17 00:00:00 2001 From: Javier Buzzi Date: Tue, 17 Feb 2026 11:52:31 +0100 Subject: [PATCH 4/8] Update --- tests/djapp/settings.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/djapp/settings.py b/tests/djapp/settings.py index 13f7d366..638953f6 100644 --- a/tests/djapp/settings.py +++ b/tests/djapp/settings.py @@ -30,6 +30,6 @@ SECRET_KEY = 'testing.' -# TODO: Will be the default after Django 5.0. Remove this setting when -# Django 5.0 is the last supported version. +# TODO: Will be the default after Django 4.2. Remove this setting when +# Django 4.2 is the last supported version. USE_TZ = True From 9957da14d4be010df1fbdb896e4de066caf6be59 Mon Sep 17 00:00:00 2001 From: Javier Buzzi Date: Tue, 17 Feb 2026 11:54:05 +0100 Subject: [PATCH 5/8] djangomain is confusing --- README.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.rst b/README.rst index cd926690..1ba79cd8 100644 --- a/README.rst +++ b/README.rst @@ -404,7 +404,7 @@ To test with a specific framework version, you may use a ``tox`` target: $ tox -e py310 # run tests inside a specific environment (django) - $ tox -e py310-djangomain + $ tox -e py310-django52 # run tests inside a specific environment (alchemy) $ tox -e py310-alchemy From 15dd374e3c77c72120c606874c7c36bc10a59ae7 Mon Sep 17 00:00:00 2001 From: Javier Buzzi Date: Tue, 17 Feb 2026 12:02:41 +0100 Subject: [PATCH 6/8] Fix pypy test issues Add step to install system dependencies for PyPy. --- .github/workflows/test.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index fa32c9bb..fa0372ff 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -36,6 +36,12 @@ jobs: python-version: ${{ matrix.python-version }} cache: pip + - name: Install system deps (only PyPy) + if: startsWith(matrix.python-version, 'pypy') + run: | + sudo apt-get update + sudo apt-get install -y libjpeg-dev zlib1g-dev pkg-config + - name: Install dependencies run: python -m pip install tox-gh-actions From 1dbbe272bf4e3b43f92a3facd29f6954308f2c3d Mon Sep 17 00:00:00 2001 From: Javier Buzzi Date: Tue, 17 Feb 2026 12:17:37 +0100 Subject: [PATCH 7/8] move mypy to lint, issue with pypy --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index f7404eba..7c341f47 100644 --- a/Makefile +++ b/Makefile @@ -54,7 +54,6 @@ testall: # DOC: Run tests for the currently installed version # Remove cgi warning when dropping support for Django 3.2. test: - mypy --ignore-missing-imports tests/test_typing.py python \ -b \ -X dev \ @@ -77,6 +76,7 @@ lint: $(FLAKE8) --ignore F401 $(PACKAGE)/__init__.py $(ISORT) --check-only --diff $(EXAMPLES_DIR) $(PACKAGE) $(SETUP_PY) $(TESTS_DIR) check-manifest + mypy --ignore-missing-imports tests/test_typing.py coverage: $(COVERAGE) erase From 8a4f8ba30a25145c2fb99e2d78db18c0eab207d9 Mon Sep 17 00:00:00 2001 From: Javier Buzzi Date: Tue, 17 Feb 2026 12:23:49 +0100 Subject: [PATCH 8/8] Oops --- tox.ini | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tox.ini b/tox.ini index 4ea3ad78..ee095e94 100644 --- a/tox.ini +++ b/tox.ini @@ -29,7 +29,7 @@ deps = mongo: mongomock # mongomock imports pkg_resources, provided by setuptools. mongo: setuptools>=66.1.1 - django{42,52,main}: Pillow + django{42,52}: Pillow django42: Django>=4.2,<5.0 django52: Django>=5.2,<6