From 446d3506ad17269aa3a6f595dbfbc9e31aaab885 Mon Sep 17 00:00:00 2001 From: Christian Clauss Date: Wed, 6 Dec 2023 22:53:27 +0100 Subject: [PATCH 1/2] Upgrade GitHub Actions and PyPy --- .github/workflows/test.yml | 6 +++--- requirements/test-django42.txt | 2 +- requirements/test-django50.txt | 1 + tox.ini | 14 ++++++++------ 4 files changed, 13 insertions(+), 10 deletions(-) create mode 100644 requirements/test-django50.txt diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 2fb73369..97199110 100644 --- 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 index fc8fea2b..00938415 100644 --- 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 new file mode 100644 index 00000000..db44a27d --- /dev/null +++ b/requirements/test-django50.txt @@ -0,0 +1 @@ +django>=5.0,<5.1 diff --git a/tox.ini b/tox.ini index 927430bd..132ffc63 100644 --- 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 From 2b15e9befea18889644e05a07a47cda582898f6e Mon Sep 17 00:00:00 2001 From: Christian Clauss Date: Tue, 19 Dec 2023 21:54:47 +0100 Subject: [PATCH 2/2] Let's drop Django v5 on PyPy v3.10. --- .github/workflows/test.yml | 2 +- tox.ini | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 97199110..93b6be3f 100644 --- 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', 'pypy3.9'] + python-version: ['3.8', '3.9', '3.10', '3.11', '3.12', 'pypy-3.10'] services: rabbitmq: diff --git a/tox.ini b/tox.ini index 132ffc63..53e7f41b 100644 --- a/tox.ini +++ b/tox.ini @@ -5,7 +5,7 @@ python = 3.10: py310 3.11: py311 3.12: py312 - pypy3.9: pypy3 + pypy-3.10: pypy3 [gh-actions:env] DJANGO =