Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Updated test matrix to test against Django 5.2 explicitly #1441

Merged
merged 3 commits into from
Jan 23, 2025
Merged

Updated test matrix to test against Django 5.2 explicitly #1441

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
37f99b7
Updated test matrix to test against Django 5.2 explicitly
tim-schilling Jan 23, 2025
2b03035
Apply suggestions from code review
tim-schilling Jan 23, 2025
f94173e
Some extra changes for supporting Django 5.2
ddabble Jan 23, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 9 additions & 2 deletions .github/workflows/test.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,15 +12,22 @@ jobs:
fail-fast: false
matrix:
python-version: ['3.9', '3.10', '3.11', '3.12', '3.13']
django-version: ['4.2', '5.0', '5.1', 'main']
django-version: ['4.2', '5.0', '5.1', '5.2', 'main']

exclude:
# Exclude py3.9 for Django main and 5+
# Exclude py3.9 for Django >= 5.0,
# and py3.10 and py3.11 for Django > 5.2
- python-version: '3.9'
django-version: '5.0'
- python-version: '3.9'
django-version: '5.1'
- python-version: '3.9'
django-version: '5.2'
- python-version: '3.9'
django-version: 'main'
- python-version: '3.10'
django-version: 'main'
- python-version: '3.11'
django-version: 'main'

services:
Expand Down
1 change: 1 addition & 0 deletions CHANGES.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ Unreleased
- Added pagination to ``SimpleHistoryAdmin`` (gh-1277)
- Fixed issue with history button not working when viewing historical entries in the
admin (gh-527)
- Added support for Django 5.2 (gh-1441)

3.7.0 (2024-05-29)
------------------
Expand Down
3 changes: 2 additions & 1 deletion README.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,8 @@ This app supports the following combinations of Django and Python:
4.2 3.9, 3.10, 3.11, 3.12, 3.13
5.0 3.10, 3.11, 3.12, 3.13
5.1 3.10, 3.11, 3.12, 3.13
main 3.10, 3.11, 3.12, 3.13
5.2 3.10, 3.11, 3.12, 3.13
main 3.12, 3.13
========== ========================

Getting Help
Expand Down
3 changes: 2 additions & 1 deletion docs/index.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,8 @@ This app supports the following combinations of Django and Python:
4.2 3.9, 3.10, 3.11, 3.12, 3.13
5.0 3.10, 3.11, 3.12, 3.13
5.1 3.10, 3.11, 3.12, 3.13
main 3.10, 3.11, 3.12, 3.13
5.2 3.10, 3.11, 3.12, 3.13
main 3.12, 3.13
========== =======================

Contribute
Expand Down
2 changes: 2 additions & 0 deletions pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,8 @@ classifiers = [
"Framework :: Django",
"Framework :: Django :: 4.2",
"Framework :: Django :: 5.0",
"Framework :: Django :: 5.1",
"Framework :: Django :: 5.2",
"Intended Audience :: Developers",
"License :: OSI Approved :: BSD License",
"Programming Language :: Python",
Expand Down
5 changes: 4 additions & 1 deletion tox.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
[tox]
envlist =
py{39,310,311,312,313}-dj42-{sqlite3,postgres,mysql,mariadb},
py{310,311,312,313}-dj{50,51,main}-{sqlite3,postgres,mysql,mariadb},
py{310,311,312,313}-dj{50,51,52}-{sqlite3,postgres,mysql,mariadb},
py{312,313}-dj{main}-{sqlite3,postgres,mysql,mariadb},
docs,
lint

Expand All @@ -18,6 +19,7 @@ DJANGO =
4.2: dj42
5.0: dj50
5.1: dj51
5.2: dj52
main: djmain

[flake8]
Expand All @@ -32,6 +34,7 @@ deps =
dj42: Django>=4.2,<4.3
dj50: Django>=5.0,<5.1
dj51: Django>=5.1,<5.2
dj52: Django>=5.2a1,<5.3 # Use a1 to allow testing of the release candidates
djmain: https://github.com/django/django/tarball/main
postgres: -rrequirements/postgres.txt
mysql: -rrequirements/mysql.txt
Expand Down
Loading