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.

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

Add Django 5.0 #1289

Merged
merged 2 commits into from
Feb 17, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
18 changes: 12 additions & 6 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,20 +11,26 @@ 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', '3.13-dev']
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, py3.12 and py3.13 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'
- python-version: '3.13-dev'
django-version: '3.2'

services:
Expand Down Expand Up @@ -115,7 +121,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
2 changes: 1 addition & 1 deletion .readthedocs.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ version: 2
build:
os: ubuntu-22.04
tools:
python: "3.11"
python: "3.12"

# Build documentation in the "docs/" directory with Sphinx
sphinx:
Expand Down
2 changes: 2 additions & 0 deletions CHANGES.rst
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,8 @@ Unreleased
version is lower than 4.2 (gh-1261)
- Small performance optimization of the ``clean-duplicate_history`` command (gh-1015)
- Support Simplified Chinese translation (gh-1281)
- Added support for Django 5.0 (gh-1283)
- Added support for Python 3.13 (gh-1289)

3.4.0 (2023-08-18)
------------------
Expand Down
6 changes: 3 additions & 3 deletions README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -42,9 +42,9 @@ 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
main 3.10, 3.11, 3.12-dev
4.2 3.8, 3.9, 3.10, 3.11, 3.12, 3.13-dev
5.0 3.10, 3.11, 3.12, 3.13-dev
main 3.10, 3.11, 3.12, 3.13-dev
========== ========================

Getting Help
Expand Down
6 changes: 3 additions & 3 deletions docs/index.rst
Original file line number Diff line number Diff line change
Expand Up @@ -42,9 +42,9 @@ 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
main 3.10, 3.11, 3.12-dev
4.2 3.8, 3.9, 3.10, 3.11, 3.12, 3.13-dev
5.0 3.10, 3.11, 3.12, 3.13-dev
main 3.10, 3.11, 3.12, 3.13-dev
========== =======================

Contribute
Expand Down
3 changes: 2 additions & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -39,15 +39,16 @@
"Intended Audience :: Developers",
"Framework :: Django",
"Framework :: Django :: 3.2",
"Framework :: Django :: 4.1",
"Framework :: Django :: 4.2",
"Framework :: Django :: 5.0",
"Programming Language :: Python",
"Programming Language :: Python :: 3",
"Programming Language :: Python :: 3.8",
"Programming Language :: Python :: 3.9",
"Programming Language :: Python :: 3.10",
"Programming Language :: Python :: 3.11",
"Programming Language :: Python :: 3.12",
"Programming Language :: Python :: 3.13",
"License :: OSI Approved :: BSD License",
],
python_requires=">=3.8",
Expand Down
10 changes: 7 additions & 3 deletions tox.ini
Original file line number Diff line number Diff line change
@@ -1,9 +1,12 @@
[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},
# DEV: Add `313` to the Python versions above (so that postgres is tested with 3.13)
# when `psycopg2-binary` supports 3.13
py313-dj{42,50,main}-{sqlite3,mysql,mariadb},
docs,
lint

Expand All @@ -14,12 +17,13 @@ python =
3.10: py310
3.11: py311, docs, lint
3.12: py312
3.13: py313

[gh-actions:env]
DJANGO =
3.2: dj32
4.1: dj41
4.2: dj42
5.0: dj50
main: djmain

[flake8]
Expand All @@ -32,8 +36,8 @@ exclude = __init__.py,simple_history/registry_tests/migration_test_app/migration
deps =
-rrequirements/test.txt
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
Loading