Skip to content

Commit

Permalink
Upgrade GitHub Actions and PyPy 3.10 and Django 5.0 (celery#699)
Browse files Browse the repository at this point in the history
* Upgrade GitHub Actions and PyPy

* Let's drop Django v5 on PyPy v3.10.
  • Loading branch information
cclauss committed Dec 19, 2023
1 parent d98a0e8 commit 90dc233
Show file tree
Hide file tree
Showing 4 changed files with 14 additions and 11 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ jobs:
strategy:
fail-fast: false
matrix:
python-version: ['3.8', '3.9', '3.10', '3.11', '3.12', 'pypy-3.9']
python-version: ['3.8', '3.9', '3.10', '3.11', '3.12', 'pypy-3.10']

services:
rabbitmq:
Expand All @@ -21,9 +21,9 @@ jobs:
- "5672:5672"

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: Set up Python ${{ matrix.python-version }}
uses: actions/setup-python@v3
uses: actions/setup-python@v5
with:
python-version: ${{ matrix.python-version }}
- name: Install dependencies
Expand Down
2 changes: 1 addition & 1 deletion requirements/test-django42.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
django>=4.2b1,<5.0
django>=4.2,<5.0
1 change: 1 addition & 0 deletions requirements/test-django50.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
django>=5.0,<5.1
16 changes: 9 additions & 7 deletions tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -5,22 +5,23 @@ python =
3.10: py310
3.11: py311
3.12: py312
pypy-3.9: pypy3
pypy-3.10: pypy3

[gh-actions:env]
DJANGO =
3.2: django32
4.1: django41
4.2: django42
5.0: django50

[tox]
envlist =
py38-django{32,41,42}
py39-django{32,41,42}
py310-django{32,41,42}
py311-django{41,42}
py312-django{41,42}
pypy3-django{32,41,42}
py310-django{32,41,42,50}
py311-django{41,42,50}
py312-django{41,42,50}
pypy3-django{32,41,42,50}
flake8
apicheck
linkcheck
Expand All @@ -38,6 +39,7 @@ deps=
django32: -r{toxinidir}/requirements/test-django32.txt
django41: -r{toxinidir}/requirements/test-django41.txt
django42: -r{toxinidir}/requirements/test-django42.txt
django50: -r{toxinidir}/requirements/test-django50.txt

linkcheck,apicheck: -r{toxinidir}/requirements/docs.txt
flake8,pydocstyle: -r{toxinidir}/requirements/pkgutils.txt
Expand Down Expand Up @@ -72,7 +74,7 @@ commands =
basepython = python3.9
usedevelop = true
commands =
pip install -U https://github.com/celery/celery/zipball/master#egg=celery
pip install -U https://github.com/celery/kombu/zipball/master#egg=kombu
pip install --upgrade https://github.com/celery/celery/zipball/main#egg=celery
pip install --upgrade https://github.com/celery/kombu/zipball/main#egg=kombu
pip install Django
pytest -x --cov=django_celery_beat --cov-report=xml --no-cov-on-fail

0 comments on commit 90dc233

Please sign in to comment.