diff --git a/CHANGELOG.rst b/CHANGELOG.rst index 320312d..04f4601 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -32,6 +32,8 @@ vNext Other ~~~~~ +* Test against Django 4.2 prerelease, Python 3.11 (with Django 4.2), + and PyPy 3.9. * Use black, isort and doc8 to format code, enforced via pre-commit. (Thanks to `@tim-schilling`_.) diff --git a/setup.py b/setup.py index d4405c8..ba743b2 100644 --- a/setup.py +++ b/setup.py @@ -103,6 +103,7 @@ setup( "Programming Language :: Python :: 3.8", "Programming Language :: Python :: 3.9", "Programming Language :: Python :: 3.10", + "Programming Language :: Python :: 3.11", "License :: OSI Approved :: BSD License", "Topic :: Communications :: Email", "Topic :: Software Development :: Libraries :: Python Modules", @@ -113,6 +114,7 @@ setup( "Framework :: Django :: 3.2", "Framework :: Django :: 4.0", "Framework :: Django :: 4.1", + # not yet registered: "Framework :: Django :: 4.2", "Environment :: Web Environment", ], long_description=long_description, diff --git a/tox.ini b/tox.ini index 7a2d568..773abdc 100644 --- a/tox.ini +++ b/tox.ini @@ -10,19 +10,21 @@ envlist = docs # ... then test all the other supported combinations: # Django 4.1: Python 3.8, 3.9, 3.10 - django41-py{38,39,py38}-all + django41-py{38,39,py38,py39}-all # Django 4.0: Python 3.8, 3.9, 3.10 - django40-py{38,39,310,py38}-all + django40-py{38,39,310,py38,py39}-all # Django 3.2: Python 3.6, 3.7, 3.8, 3.9 - django32-py{36,37,38,39,py38}-all + django32-py{36,37,38,39,py38,py39}-all # Django 3.1: Python 3.6, 3.7, 3.8, 3.9 (added in 3.1.3) - django31-py{36,37,38,39,py38}-all + django31-py{36,37,38,39,py38,py39}-all # Django 3.0: Python 3.6, 3.7, 3.8, 3.9 (added in 3.0.11) - django30-py{37,38,39,py38}-all + django30-py{37,38,39,py38,py39}-all # ... then prereleases (if available) and current development: - djangoDev-py{38,39,310,311,py38}-all + # Django 4.2 alpha: Python 3.8, 3.9, 3.10, 3.11 + django42-py{38,39,310,311,py38,py39}-all + djangoDev-py{38,39,310,311,py38,py39}-all # ... then partial installation (limit extras): - django40-py310-{none,amazon_ses,postal} + django41-py310-{none,amazon_ses,postal} # ... then older versions of some dependencies: django32-py37-all-old_urllib3 @@ -33,6 +35,7 @@ deps = django32: django~=3.2.0 django40: django~=4.0.0 django41: django~=4.1.0 + django42: django~=4.2.0a0 djangoDev: https://github.com/django/django/tarball/main old_urllib3: urllib3<1.25 extras = @@ -57,6 +60,8 @@ ignore_outcome = # CI that wants to handle errors itself can set TOX_OVERRIDE_IGNORE_OUTCOME=false djangoDev: {env:TOX_OVERRIDE_IGNORE_OUTCOME:true} args_are_paths = false +# Upgrade pip/wheel/setuptools: +download = true commands_pre = python -VV python -c 'import django; print("Django", django.__version__)'