Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Upgrade GitHub Actions and PyPy 3.10 and Django 5.0 #699

Merged
merged 2 commits into from
Dec 19, 2023
Merged

Upgrade GitHub Actions and PyPy 3.10 and Django 5.0 #699

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
446d350
Upgrade GitHub Actions and PyPy
cclauss Dec 6, 2023
2b15e9b
Let's drop Django v5 on PyPy v3.10.
cclauss Dec 19, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
6 changes: 3 additions & 3 deletions .github/workflows/test.yml
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
django>=5.0,<5.1
14 changes: 8 additions & 6 deletions tox.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,21 +5,22 @@ 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}
py310-django{32,41,42,50}
py311-django{41,42,50}
py312-django{41,42,50}
pypy3-django{32,41,42}
flake8
apicheck
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