Upgrade GitHub Actions and PyPy

celery · Dec 19, 2023 · 446d350 · 446d350
1 parent d98a0e8
commit 446d350
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 10 deletions.
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -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', 'pypy3.9']
 
     services:
       rabbitmq:
@@ -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

diff --git a/requirements/test-django42.txt b/requirements/test-django42.txt
@@ -1 +1 @@
-django>=4.2b1,<5.0
+django>=4.2,<5.0
diff --git a/requirements/test-django50.txt b/requirements/test-django50.txt
@@ -0,0 +1 @@
+django>=5.0,<5.1
diff --git a/tox.ini b/tox.ini
@@ -5,21 +5,22 @@ python =
     3.10: py310
     3.11: py311
     3.12: py312
-    pypy-3.9: pypy3
+    pypy3.9: 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
@@ -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
@@ -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