From b5e7f6a078d0fd457758fc593fdff9e4296f88d8 Mon Sep 17 00:00:00 2001 From: Takayuki SHIMIZUKAWA Date: Mon, 16 Sep 2024 22:50:02 +0000 Subject: [PATCH] Add Django-5.1 support #152 --- .github/workflows/test-examples-proj1.yml | 2 +- .github/workflows/test.yml | 6 +++++- CHANGES.rst | 1 + doc/index.rst | 2 +- pyproject.toml | 3 ++- tests/test_base.py | 1 - tox.ini | 3 +++ 7 files changed, 13 insertions(+), 5 deletions(-) diff --git a/.github/workflows/test-examples-proj1.yml b/.github/workflows/test-examples-proj1.yml index 94b603e..d034d35 100644 --- a/.github/workflows/test-examples-proj1.yml +++ b/.github/workflows/test-examples-proj1.yml @@ -11,7 +11,7 @@ jobs: max-parallel: 5 matrix: python-version: ['3.10'] - django-version: ['3.2', '4.0', '4.2', '5.0'] + django-version: ['3.2', '4.0', '4.2', '5.0', '5.1'] include: - django-version: 'main' python-version: '3.10' diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 43df145..e730e29 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -11,7 +11,7 @@ jobs: max-parallel: 5 matrix: python-version: ['3.8', '3.9', '3.10', '3.11', '3.12'] - django-version: ['3.2', '4.0', '4.2', '5.0'] + django-version: ['3.2', '4.0', '4.2', '5.0', '5.1'] exclude: - python-version: '3.11' django-version: '3.2' @@ -21,6 +21,10 @@ jobs: python-version: '3.8' - django-version: '5.0' python-version: '3.9' + - django-version: '5.1' + python-version: '3.8' + - django-version: '5.1' + python-version: '3.9' - django-version: 'main' python-version: '3.8' - django-version: 'main' diff --git a/CHANGES.rst b/CHANGES.rst index 9223d86..b5242f1 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -7,6 +7,7 @@ CHANGES Features: * #143 Add Django-5.0 support. +* #152 Add Django-5.1 support. 4.1.1 (2024/08/20) ------------------ diff --git a/doc/index.rst b/doc/index.rst index 4323f91..f9662db 100644 --- a/doc/index.rst +++ b/doc/index.rst @@ -44,7 +44,7 @@ Support versions This product is tested with: * Python-3.8, 3.9, 3.10, 3.11, 3.12 -* Django-3.2, 4.0, 4.2, 5.0 +* Django-3.2, 4.0, 4.2, 5.0, 5.1 License ======= diff --git a/pyproject.toml b/pyproject.toml index e63daca..191b0f2 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -24,6 +24,7 @@ classifiers = [ "Framework :: Django :: 4.0", "Framework :: Django :: 4.2", "Framework :: Django :: 5.0", + "Framework :: Django :: 5.1", "Intended Audience :: Developers", "License :: OSI Approved :: Apache Software License", "Programming Language :: Python", @@ -36,7 +37,7 @@ classifiers = [ "Topic :: Software Development :: Libraries :: Python Modules", ] dependencies = [ - "django<5.1", + "django<5.2", "backports.zoneinfo;python_version<'3.9'", ] diff --git a/tests/test_base.py b/tests/test_base.py index baffd6c..626d9d1 100644 --- a/tests/test_base.py +++ b/tests/test_base.py @@ -216,7 +216,6 @@ def set_up_test_model( # Make the "current" state. model_options = { 'swappable': 'TEST_SWAP_MODEL', - 'index_together': [['weight', 'pink']] if index_together else [], 'unique_together': [['pink', 'weight']] if unique_together else [], } if options: diff --git a/tox.ini b/tox.ini index 059842e..338e3db 100644 --- a/tox.ini +++ b/tox.ini @@ -4,6 +4,7 @@ envlist = py{38,39,310,311,312}-dj40 py{38,39,310,311,312}-dj42 py{310,311,312}-dj50 + py{310,311,312}-dj51 lint check skipsdist = True @@ -22,6 +23,7 @@ DJANGO = 4.0: dj40 4.2: dj42 5.0: dj50 + 5.1: dj51 main: djmain [testenv] @@ -37,6 +39,7 @@ deps = dj40: Django>=4.0,<4.1 dj42: Django>=4.2,<5.0 dj50: Django>=5.0,<5.1 + dj51: Django>=5.1,<5.2 djmain: https://github.com/django/django/archive/main.tar.gz setenv = DJANGO_SETTINGS_MODULE = settings