From 82523fcaced4586efd54f55d31c483c123a0edcb Mon Sep 17 00:00:00 2001 From: Katherine Domingo Date: Thu, 22 Feb 2024 18:38:23 +0800 Subject: [PATCH 1/4] Update documentation, test matrix --- CHANGELOG.md | 6 ++++++ pyproject.toml | 5 ++--- tox.ini | 11 +++++------ 3 files changed, 13 insertions(+), 9 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index de3d0da..3ceba6b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [Unreleased] +### Changed + +- Drop versions of Wagtail < 5.2 +- Add Wagtail 6.0 support +- Add Django 5.0 support + ## [0.7] - 2023-10-20 ### Added diff --git a/pyproject.toml b/pyproject.toml index ff61b6b..59c5131 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -20,19 +20,18 @@ classifiers = [ "Programming Language :: Python :: 3.12", "Framework :: Django", "Framework :: Django :: 3.2", - "Framework :: Django :: 4.1", "Framework :: Django :: 4.2", "Framework :: Django :: 5.0", "Framework :: Wagtail", - "Framework :: Wagtail :: 4", "Framework :: Wagtail :: 5", + "Framework :: Wagtail :: 6", "Topic :: Internet :: WWW/HTTP", "Topic :: Internet :: WWW/HTTP :: Dynamic Content", ] dynamic = ["version"] requires-python = ">=3.8" -dependencies = ["Wagtail>=4.1"] +dependencies = ["Wagtail>=5.2"] [project.optional-dependencies] testing = [ diff --git a/tox.ini b/tox.ini index 020e1c8..eb90a64 100644 --- a/tox.ini +++ b/tox.ini @@ -2,9 +2,9 @@ min_version = 4.11 env_list = - python{3.8,3.9,3.10}-dj{32}-wagtail{41,52} - python{3.11}-dj{41,42}-wagtail{52,60} - python{3.12}-dj{42,50}-wagtail{52,60} + python{3.8,3.9,3.10,3.11,3.12}-django3.2-wagtail5.2 + python{3.8,3.9,3.10,3.11}-django4.2-wagtail{5.2,6.0} + python{3.10,3.11,3.12}-django5.0-wagtail{5.2,6.0} [gh-actions] python = @@ -36,7 +36,6 @@ deps = django4.2: Django>=4.2, <5.0 django5.0: Django>=5.0, <5.1 - wagtail41: wagtail>=4.1,<4.2 wagtail5.2: wagtail>=5.2, <6.0 wagtail6.0: wagtail>=6.0, <6.1 @@ -45,7 +44,7 @@ commands = python -Im coverage run runtests.py test --deprecation all {posargs: -v 2} [testenv:coverage-report] -base_python = python3.11 +base_python = python3.12 package = skip deps = coverage>=7.0,<8.0 @@ -62,7 +61,7 @@ deps = [testenv:interactive] package = editable description = An interactive environment for local testing purposes -base_python = python3.11 +base_python = python3.12 commands_pre = python {toxinidir}/manage.py makemigrations From 54590ae6371c5cf3de1c279a6c9e4bf627827531 Mon Sep 17 00:00:00 2001 From: Katherine Domingo Date: Thu, 22 Feb 2024 18:52:34 +0800 Subject: [PATCH 2/4] Update Django code --- tests/urls.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/tests/urls.py b/tests/urls.py index 929cbb3..e48771e 100644 --- a/tests/urls.py +++ b/tests/urls.py @@ -1,5 +1,4 @@ -from django.conf.urls import include -from django.urls import path +from django.urls import include, path from wagtail import urls as wagtail_urls from wagtail.admin import urls as wagtailadmin_urls From 3d50ff7f3b07e4a24269a4032e9bf7a616472a68 Mon Sep 17 00:00:00 2001 From: Katherine Domingo Date: Thu, 22 Feb 2024 19:02:14 +0800 Subject: [PATCH 3/4] Bump GitHub action versions --- .github/workflows/publish.yml | 6 +++--- .github/workflows/test.yml | 15 ++++++++------- 2 files changed, 11 insertions(+), 10 deletions(-) diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 9a0e4ac..6d972dd 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -14,7 +14,7 @@ jobs: with: fetch-depth: 0 - - uses: actions/setup-python@v4 + - uses: actions/setup-python@v5 with: python-version: '3.11' cache: "pip" @@ -27,7 +27,7 @@ jobs: - name: 🏗️ Build run: python -Im flit build - - uses: actions/upload-artifact@v3 + - uses: actions/upload-artifact@v4 with: path: ./dist @@ -42,7 +42,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 diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index f50c9c6..1d3732e 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -33,7 +33,7 @@ jobs: - uses: actions/checkout@v4 - name: 🐍 Set up Python ${{ matrix.python-version }} - uses: actions/setup-python@v4 + uses: actions/setup-python@v5 with: python-version: ${{ matrix.python-version }} @@ -62,9 +62,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 }} path: .coverage.* if-no-files-found: ignore retention-days: 1 @@ -75,7 +75,7 @@ jobs: steps: - uses: actions/checkout@v4 - - uses: actions/setup-python@v4 + - uses: actions/setup-python@v5 with: # Use latest Python, so it understands all syntax. python-version: ${{env.PYTHON_LATEST}} @@ -83,9 +83,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: ＋ Combine coverage run: | @@ -96,7 +97,7 @@ jobs: python -Im coverage report --format=markdown >> $GITHUB_STEP_SUMMARY - name: 📈 Upload HTML report if check failed. - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: html-report path: htmlcov From 4af7d7bf65694b7ce603e39c81cc746d8cfdd4e3 Mon Sep 17 00:00:00 2001 From: Katherine Domingo Date: Fri, 23 Feb 2024 19:11:55 +0800 Subject: [PATCH 4/4] Update tox.ini, Remove some suite tests for Django 3.2 as it reaches EOL soon --- tox.ini | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tox.ini b/tox.ini index eb90a64..67704e4 100644 --- a/tox.ini +++ b/tox.ini @@ -2,9 +2,9 @@ min_version = 4.11 env_list = - python{3.8,3.9,3.10,3.11,3.12}-django3.2-wagtail5.2 + python{3.8,3.9,3.10}-django3.2-wagtail5.2 python{3.8,3.9,3.10,3.11}-django4.2-wagtail{5.2,6.0} - python{3.10,3.11,3.12}-django5.0-wagtail{5.2,6.0} + python{3.11,3.12}-django5.0-wagtail{5.2,6.0} [gh-actions] python =