Skip to content

Commit

Permalink
Add Django 5.0
Browse files Browse the repository at this point in the history
Drop Django 4.1

Fixes #1283
  • Loading branch information
tim-schilling committed Dec 22, 2023
1 parent 7626143 commit 64883f9
Show file tree
Hide file tree
Showing 5 changed files with 16 additions and 9 deletions.
15 changes: 10 additions & 5 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,20 +11,25 @@ jobs:
strategy:
fail-fast: false
matrix:
python-version: ['3.8', '3.9', '3.10', '3.11', '3.12-dev']
django-version: ['3.2', '4.1', '4.2', 'main']
python-version: ['3.8', '3.9', '3.10', '3.11', '3.12']
django-version: ['3.2', '4.2', '5.0', 'main']

exclude:
# Exclude py3.8 and py3.9 for Django main and 5.0
- python-version: '3.8'
django-version: '5.0'
- python-version: '3.9'
django-version: '5.0'
- python-version: '3.8'
django-version: 'main'

- python-version: '3.9'
django-version: 'main'

# Exclude py3.11 and py3.12 for Django 3.2
- python-version: '3.11'
django-version: '3.2'

- python-version: '3.12-dev'
- python-version: '3.12'
django-version: '3.2'

services:
Expand Down Expand Up @@ -115,7 +120,7 @@ jobs:
# Install this project in editable mode, so that its package metadata can be queried
pip install -e .
# Install the latest minor version of Django we support
pip install Django==4.2
pip install Django==5.0
- name: Check translation files are updated
run: python -m simple_history.tests.generated_file_checks.check_translations
1 change: 1 addition & 0 deletions CHANGES.rst
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ Unreleased
- Added temporary requirement on ``asgiref>=3.6`` while the minimum required Django
version is lower than 4.2 (gh-1261)
- Small performance optimization of the ``clean-duplicate_history`` command (gh-1015)
- Added support for Django 5.0 (gh-1283)

3.4.0 (2023-08-18)
------------------
Expand Down
2 changes: 1 addition & 1 deletion README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -42,8 +42,8 @@ This app supports the following combinations of Django and Python:
Django Python
========== ========================
3.2 3.8, 3.9, 3.10
4.1 3.8, 3.9, 3.10, 3.11, 3.12-dev
4.2 3.8, 3.9, 3.10, 3.11, 3.12-dev
5.0 3.10, 3.11, 3.12-dev
main 3.10, 3.11, 3.12-dev
========== ========================

Expand Down
2 changes: 1 addition & 1 deletion docs/index.rst
Original file line number Diff line number Diff line change
Expand Up @@ -42,8 +42,8 @@ This app supports the following combinations of Django and Python:
Django Python
========== =======================
3.2 3.8, 3.9, 3.10
4.1 3.8, 3.9, 3.10, 3.11, 3.12-dev
4.2 3.8, 3.9, 3.10, 3.11, 3.12-dev
5.0 3.10, 3.11, 3.12-dev
main 3.10, 3.11, 3.12-dev
========== =======================

Expand Down
5 changes: 3 additions & 2 deletions tox.ini
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
[tox]
envlist =
py{38,39,310}-dj32-{sqlite3,postgres,mysql,mariadb},
py{38,39,310,311,312}-dj41-{sqlite3,postgres,mysql,mariadb},
py{38,39,310,311,312}-dj42-{sqlite3,postgres,mysql,mariadb},
py{310,311,312}-dj50-{sqlite3,postgres,mysql,mariadb},
py{310,311,312}-djmain-{sqlite3,postgres,mysql,mariadb},
docs,
lint
Expand All @@ -18,8 +18,8 @@ python =
[gh-actions:env]
DJANGO =
3.2: dj32
4.1: dj41
4.2: dj42
5.0: dj50
main: djmain

[flake8]
Expand All @@ -34,6 +34,7 @@ deps =
dj32: Django>=3.2,<3.3
dj41: Django>=4.1,<4.2
dj42: Django>=4.2,<4.3
dj50: Django>=5.0,<5.1
djmain: https://github.com/django/django/tarball/main
postgres: -rrequirements/postgres.txt
mysql: -rrequirements/mysql.txt
Expand Down

0 comments on commit 64883f9

Please sign in to comment.