Skip to content

Commit

Permalink
Added support for Python 3.13
Browse files Browse the repository at this point in the history
3.13 can't be tested with postgres, as `psycopg2-binary` doesn't
currently support 3.13 - see e.g.
https://github.com/ddabble/django-simple-history/actions/runs/7937535510/job/21674900984.
I still think it's better to add early support of 3.13 and temporarily
test without postgres, since all the other packages (and our code)
currently work with 3.13.

Also bumped the Python version in `.readthedocs.yaml` to 3.12, as it's
the latest, stable version available.

Also removed the recently dropped Django 4.1 from `setup.py` and
`tox.ini`, and added Django 5.0 to `setup.py`.
  • Loading branch information
ddabble committed Feb 17, 2024
1 parent aee3e1c commit 607cdcc
Show file tree
Hide file tree
Showing 7 changed files with 18 additions and 12 deletions.
7 changes: 4 additions & 3 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ jobs:
strategy:
fail-fast: false
matrix:
python-version: ['3.8', '3.9', '3.10', '3.11', '3.12']
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:
Expand All @@ -25,12 +25,13 @@ jobs:
- python-version: '3.9'
django-version: 'main'

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

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

services:

Expand Down
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
1 change: 1 addition & 0 deletions CHANGES.rst
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ Unreleased
- 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.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
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.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
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
5 changes: 4 additions & 1 deletion tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,9 @@ envlist =
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,6 +17,7 @@ python =
3.10: py310
3.11: py311, docs, lint
3.12: py312
3.13: py313

[gh-actions:env]
DJANGO =
Expand All @@ -32,7 +36,6 @@ 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
Expand Down

0 comments on commit 607cdcc

Please sign in to comment.