From 23265e6c914dc30f8f652dbce098dad6fd761021 Mon Sep 17 00:00:00 2001 From: Charles O'Brien <45922710+charlesobrien@users.noreply.github.com> Date: Fri, 29 Mar 2024 03:45:37 -0400 Subject: [PATCH] add django 5.0 to CI/test matrix and project classifiers (#425) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * add django 5.0 to test matrix * Update test.yaml to add workflow dispatch * Update test.yaml - revert workflow_dispatch Ooops, didn’t mean to make that part of this change. * Update test.yaml - match Python-version to list va * constrain pytest to < 8 * add pypy3.9 exclusion for Django 5 * Add Django 5.0 to classifiers --------- Co-authored-by: Bruno Alla --- .github/workflows/test.yaml | 12 +++++++++--- requirements/default.txt | 2 +- requirements/docs.txt | 2 +- requirements/test-django32.txt | 2 +- requirements/test-django41.txt | 2 +- requirements/test-django42.txt | 2 +- requirements/test-django50.txt | 2 ++ requirements/test.txt | 2 +- setup.py | 1 + tox.ini | 6 ++++-- 10 files changed, 22 insertions(+), 11 deletions(-) create mode 100644 requirements/test-django50.txt diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml index f630089c..72a3d1e0 100644 --- a/.github/workflows/test.yaml +++ b/.github/workflows/test.yaml @@ -13,11 +13,17 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - python-version: [ 3.8, 3.9, "3.10", "3.11", "pypy3.9" ] - django: [ 32, 41, 42] + python-version: [ "3.8", "3.9", "3.10", "3.11", "pypy3.9" ] + django: [ "32", "41", "42", "50" ] exclude: - python-version: "3.11" - django: 32 + django: "32" + - python-version: "3.8" + django: "50" + - python-version: "3.9" + django: "50" + - python-version: "pypy3.9" + django: "50" services: postgres: diff --git a/requirements/default.txt b/requirements/default.txt index 725e9d5b..b61f5d4b 100644 --- a/requirements/default.txt +++ b/requirements/default.txt @@ -1,2 +1,2 @@ celery>=5.2.7,<6.0 -Django>=3.2.18 +Django>=3.2.25 diff --git a/requirements/docs.txt b/requirements/docs.txt index 64a778e5..c4f74989 100644 --- a/requirements/docs.txt +++ b/requirements/docs.txt @@ -1,3 +1,3 @@ sphinx_celery>=1.1 -Django>=3.2.18 +Django>=3.2.25 celery>=5.2.7,<6.0 diff --git a/requirements/test-django32.txt b/requirements/test-django32.txt index cd367a29..1794178c 100644 --- a/requirements/test-django32.txt +++ b/requirements/test-django32.txt @@ -1 +1 @@ -django>=3.2.18,<4.0 +django>=3.2.25,<4.0 diff --git a/requirements/test-django41.txt b/requirements/test-django41.txt index 8d2bca65..a5272e4e 100644 --- a/requirements/test-django41.txt +++ b/requirements/test-django41.txt @@ -1 +1 @@ -django>=4.1.7,<4.2 +django>=4.1.13,<4.2 diff --git a/requirements/test-django42.txt b/requirements/test-django42.txt index fc136582..04572300 100644 --- a/requirements/test-django42.txt +++ b/requirements/test-django42.txt @@ -1,2 +1,2 @@ -django>=4.2,<5.0 +django>=4.2.11,<5.0 psycopg>=3.1.8 # necessary due to https://docs.djangoproject.com/en/4.2/releases/4.2/#psycopg-3-support diff --git a/requirements/test-django50.txt b/requirements/test-django50.txt new file mode 100644 index 00000000..95ff591d --- /dev/null +++ b/requirements/test-django50.txt @@ -0,0 +1,2 @@ +django>=5.0.3,<5.1 +psycopg>=3.1.8 # necessary due to https://docs.djangoproject.com/en/4.2/releases/4.2/#psycopg-3-support diff --git a/requirements/test.txt b/requirements/test.txt index b1a0749b..72be052e 100644 --- a/requirements/test.txt +++ b/requirements/test.txt @@ -1,5 +1,5 @@ case>=1.3.1 -pytest>=6.2.5 +pytest>=6.2.5,<8 pytest-django>=4.5.2 pytest-benchmark pytz diff --git a/setup.py b/setup.py index 03f5a0ad..26ff32ca 100644 --- a/setup.py +++ b/setup.py @@ -46,6 +46,7 @@ def _pyimp(): Framework :: Django :: 4.0 Framework :: Django :: 4.1 Framework :: Django :: 4.2 + Framework :: Django :: 5.0 Operating System :: OS Independent Topic :: Communications Topic :: System :: Distributed Computing diff --git a/tox.ini b/tox.ini index 509f9cd1..45376c94 100644 --- a/tox.ini +++ b/tox.ini @@ -1,7 +1,7 @@ [tox] envlist = - py311-django{41,42} - py310-django{42,41,40,32} + py311-django{41,42,50} + py310-django{42,41,40,50,32} py39-django{42,41,40,32} py38-django{42,41,40,32} py37-django{32} @@ -19,6 +19,7 @@ DJANGO = 4.0: django40 3.2: django32 4.2: django42 + 5.0: django50 [testenv] deps= @@ -30,6 +31,7 @@ deps= django40: -r{toxinidir}/requirements/test-django40.txt django32: -r{toxinidir}/requirements/test-django32.txt django42: -r{toxinidir}/requirements/test-django42.txt + django50: -r{toxinidir}/requirements/test-django50.txt cov,integration: -r{toxinidir}/requirements/test-django.txt