Skip to content

Commit

Permalink
Merge pull request #153 from jazzband/152-dj51
Browse files Browse the repository at this point in the history
Add Django-5.1 support  #152
  • Loading branch information
shimizukawa authored Sep 16, 2024
2 parents f5b8ac9 + b5e7f6a commit e8750b7
Show file tree
Hide file tree
Showing 7 changed files with 13 additions and 5 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/test-examples-proj1.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down
6 changes: 5 additions & 1 deletion .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand All @@ -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'
Expand Down
1 change: 1 addition & 0 deletions CHANGES.rst
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ CHANGES
Features:

* #143 Add Django-5.0 support.
* #152 Add Django-5.1 support.

4.1.1 (2024/08/20)
------------------
Expand Down
2 changes: 1 addition & 1 deletion doc/index.rst
Original file line number Diff line number Diff line change
Expand Up @@ -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
=======
Expand Down
3 changes: 2 additions & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand All @@ -36,7 +37,7 @@ classifiers = [
"Topic :: Software Development :: Libraries :: Python Modules",
]
dependencies = [
"django<5.1",
"django<5.2",
"backports.zoneinfo;python_version<'3.9'",
]

Expand Down
1 change: 0 additions & 1 deletion tests/test_base.py
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
3 changes: 3 additions & 0 deletions tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -22,6 +23,7 @@ DJANGO =
4.0: dj40
4.2: dj42
5.0: dj50
5.1: dj51
main: djmain

[testenv]
Expand All @@ -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
Expand Down

0 comments on commit e8750b7

Please sign in to comment.