Skip to content

Commit

Permalink
add django 5.0 to CI/test matrix and project classifiers (#425)
Browse files Browse the repository at this point in the history
* 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 <alla.brunoo@gmail.com>
  • Loading branch information
charlesobrien and browniebroke committed Mar 29, 2024
1 parent cb94489 commit 23265e6
Show file tree
Hide file tree
Showing 10 changed files with 22 additions and 11 deletions.
12 changes: 9 additions & 3 deletions .github/workflows/test.yaml
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion requirements/default.txt
@@ -1,2 +1,2 @@
celery>=5.2.7,<6.0
Django>=3.2.18
Django>=3.2.25
2 changes: 1 addition & 1 deletion 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
2 changes: 1 addition & 1 deletion requirements/test-django32.txt
@@ -1 +1 @@
django>=3.2.18,<4.0
django>=3.2.25,<4.0
2 changes: 1 addition & 1 deletion requirements/test-django41.txt
@@ -1 +1 @@
django>=4.1.7,<4.2
django>=4.1.13,<4.2
2 changes: 1 addition & 1 deletion 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
2 changes: 2 additions & 0 deletions 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
2 changes: 1 addition & 1 deletion 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
Expand Down
1 change: 1 addition & 0 deletions setup.py
Expand Up @@ -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
Expand Down
6 changes: 4 additions & 2 deletions 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}
Expand All @@ -19,6 +19,7 @@ DJANGO =
4.0: django40
3.2: django32
4.2: django42
5.0: django50

[testenv]
deps=
Expand All @@ -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

Expand Down

0 comments on commit 23265e6

Please sign in to comment.