From a34eae63fb0056b378f5e967f6089b52bed5db14 Mon Sep 17 00:00:00 2001 From: Alex Morega Date: Thu, 6 Feb 2025 11:42:37 +0200 Subject: [PATCH 1/5] Upgrade to `actions/upload-artifact@v4` https://github.com/actions/upload-artifact/blob/main/docs/MIGRATION.md --- .github/workflows/ci.yml | 15 ++++++++------- .github/workflows/publish.yml | 4 ++-- 2 files changed, 10 insertions(+), 9 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 8cf619fb..5b2d09aa 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -50,9 +50,9 @@ jobs: run: tox --installpkg ./dist/*.whl - name: ⬆️ Upload coverage data - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: - name: coverage-data + name: coverage-data-${{ matrix.python-version }}-${{ matrix.db }} path: tests/.coverage* if-no-files-found: ignore retention-days: 1 @@ -100,9 +100,9 @@ jobs: run: tox --installpkg ./dist/*.whl - name: ⬆️ Upload coverage data - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: - name: coverage-data + name: coverage-data-${{ matrix.python-version }}-${{ matrix.db }} path: tests/.coverage* if-no-files-found: ignore retention-days: 1 @@ -122,9 +122,10 @@ jobs: - run: python -Im pip install --upgrade coverage[toml] - name: ⬇️ Download coverage data - uses: actions/download-artifact@v3 + uses: actions/download-artifact@v4 with: - name: coverage-data + pattern: coverage-data-* + merge-multiple: true - name: ＋ Generate report run: | @@ -133,7 +134,7 @@ jobs: echo "## Coverage summary" >> $GITHUB_STEP_SUMMARY python -Im coverage report --format=markdown >> $GITHUB_STEP_SUMMARY - name: 📈 Upload HTML report - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: html-report path: htmlcov diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index ce4dc341..b8d9380d 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -28,7 +28,7 @@ jobs: - name: Build run: python -Im flit build - - uses: actions/upload-artifact@v3 + - uses: actions/upload-artifact@v4 with: path: ./dist @@ -43,7 +43,7 @@ jobs: # Mandatory for trusted publishing id-token: write steps: - - uses: actions/download-artifact@v3 + - uses: actions/download-artifact@v4 - name: 🚀 Publish package distributions to PyPI uses: pypa/gh-action-pypi-publish@release/v1 From a2cb8f9f4a1053b9662912f96a72cb9e8fd9df0d Mon Sep 17 00:00:00 2001 From: Alex Morega Date: Thu, 6 Feb 2025 11:47:34 +0200 Subject: [PATCH 2/5] Remove Py38 from testing matrix --- .github/workflows/ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 5b2d09aa..f953a6af 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -27,7 +27,7 @@ jobs: strategy: fail-fast: false matrix: - python-version: ['3.8', '3.9', '3.10', '3.11', '3.12'] + python-version: ['3.9', '3.10', '3.11', '3.12'] db: ['sqlite'] steps: @@ -63,7 +63,7 @@ jobs: strategy: fail-fast: false matrix: - python-version: ['3.8', '3.9', '3.10', '3.11', '3.12'] + python-version: ['3.9', '3.10', '3.11', '3.12'] db: ['postgres'] services: From e985ca4b3280aa07550b8cbfcd7bff737f1ad17f Mon Sep 17 00:00:00 2001 From: Alex Morega Date: Thu, 6 Feb 2025 17:28:52 +0200 Subject: [PATCH 3/5] Pin Wagtail version more closely --- tests/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/requirements.txt b/tests/requirements.txt index 59135be2..9fb372bc 100644 --- a/tests/requirements.txt +++ b/tests/requirements.txt @@ -4,7 +4,7 @@ ruff==0.0.287 # Runtime requirements Django>=4.2,<5.1 -wagtail>=4.1 +wagtail>=5.2,<6.3 graphene-django>=3.0.0 factory-boy==3.2.1 wagtail-factories>=4.1.0 From fdfd1f332aaa08797fb9c8524aed8139e747100e Mon Sep 17 00:00:00 2001 From: Alex Morega Date: Thu, 6 Feb 2025 18:11:57 +0200 Subject: [PATCH 4/5] Don't upgrade packages; update matrix --- tox.ini | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/tox.ini b/tox.ini index 30fa9bad..238cf1ac 100644 --- a/tox.ini +++ b/tox.ini @@ -2,8 +2,8 @@ min_version = 4.0 envlist = - py{38,39,310,311,312}-django{42}-wagtail{52,60} - py{310,311,312}-django{50}-wagtail{52,60} + py{38,39,310,311,312}-django{42}-wagtail{62} + py{310,311,312}-django{50}-wagtail{62} interactive [gh-actions] @@ -47,9 +47,11 @@ deps = django50: Django>=5.0,<5.1 wagtail52: wagtail>=5.2,<6.0 wagtail60: wagtail>=6.0,<6.1 + wagtail61: wagtail>=6.1,<6.2 + wagtail62: wagtail>=6.2,<6.3 interactive: wagtail>=5.2 -install_command = python -Im pip install -U {opts} {packages} +install_command = python -Im pip install {opts} {packages} commands = python -m coverage run manage.py test {posargs: -v1} --exclude-tag=needs-custom-settings From f69badbfd24876c52f8e9b6ea7906bc1c90c99da Mon Sep 17 00:00:00 2001 From: Alex Morega Date: Thu, 6 Feb 2025 18:44:26 +0200 Subject: [PATCH 5/5] Simplify tox configuration --- tox.ini | 5 ----- 1 file changed, 5 deletions(-) diff --git a/tox.ini b/tox.ini index 238cf1ac..0b77d4aa 100644 --- a/tox.ini +++ b/tox.ini @@ -45,14 +45,9 @@ deps = django42: Django>=4.2,<5.0 django50: Django>=5.0,<5.1 - wagtail52: wagtail>=5.2,<6.0 - wagtail60: wagtail>=6.0,<6.1 - wagtail61: wagtail>=6.1,<6.2 wagtail62: wagtail>=6.2,<6.3 interactive: wagtail>=5.2 -install_command = python -Im pip install {opts} {packages} - commands = python -m coverage run manage.py test {posargs: -v1} --exclude-tag=needs-custom-settings python manage.py test -v1 --tag=needs-custom-settings --settings=settings_custom_interfaces