From 076ce485d93987b38c6fa8cd77a81d7982d2cbaf Mon Sep 17 00:00:00 2001 From: Katherine Domingo Date: Thu, 22 Feb 2024 19:38:29 +0800 Subject: [PATCH 1/4] Update test matrix, update docs --- .github/workflows/test.yml | 20 ++++++++++++-------- .pre-commit-config.yaml | 2 +- CHANGELOG.md | 4 ++++ setup.py | 3 ++- 4 files changed, 19 insertions(+), 10 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 130df40..51ceaee 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -12,14 +12,18 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - python: ["3.11", "3.10", "3.9", "3.8"] - django: ["django>=3.2,<3.3", "django>=4.1,<4.2", "django>=4.2,<4.3"] - wagtail: ["wagtail>=4.1,<4.2", "wagtail>=5.1,<5.2", "wagtail>=5.2,<5.3"] + python: ["3.12", "3.11", "3.10", "3.9", "3.8"] + django: ["django>=3.2,<3.3", "django>=4.2,<4.3", "django>=5.0,<5.1"] + wagtail: ["wagtail>=5.2,<5.3", "wagtail>=6.0,<6.1"] exclude: - - python: "3.11" - django: django>=3.2,<3.3 - - django: django>=4.2,<4.3 - wagtail: wagtail>=4.1,<4.2 + - django: django>=3.2,<3.3 + wagtail: wagtail>=6.0,<6.1 + - python: "3.8" + django: django>=5.0,<5.1 + - python: "3.9" + django: django>=5.0,<5.1 + - python: "3.12" + django: django>=4.2,<4.3 steps: - uses: actions/checkout@v3 - uses: actions/setup-python@v3 @@ -37,4 +41,4 @@ jobs: - if: ${{ matrix.latest }} uses: codecov/codecov-action@v2 with: - name: Python 3.9 + name: Python 3.12 diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 928e87d..003d684 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -1,6 +1,6 @@ default_language_version: node: system - python: python3.9 + python: python3.12 repos: - repo: https://github.com/python/black rev: 22.3.0 diff --git a/CHANGELOG.md b/CHANGELOG.md index c1e09c1..e85d8e4 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,6 +8,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [Unreleased] +- Add support for Wagtail 6.0 +- Add support for Django 5.0 +- Drop support for Wagtail < 5.2 + ## 2.1.0 (2024-03-07) - Add support for Wagtail 5.1+ diff --git a/setup.py b/setup.py index 9e43467..fdec0e4 100644 --- a/setup.py +++ b/setup.py @@ -34,9 +34,10 @@ "Programming Language :: Python :: 3.9", "Programming Language :: Python :: 3.10", "Programming Language :: Python :: 3.11", + "Programming Language :: Python :: 3.12", "Framework :: Wagtail", - "Framework :: Wagtail :: 4", "Framework :: Wagtail :: 5", + "Framework :: Wagtail :: 6", ], extras_require={"testing": testing_extras, "development": development_extras}, ) From 197e9509b6a17d99eac2da95087561ae7aa23f58 Mon Sep 17 00:00:00 2001 From: Katherine Domingo Date: Thu, 22 Feb 2024 19:43:47 +0800 Subject: [PATCH 2/4] Remove unnecessary installation of modeladmin in test project --- wagtail_jotform/tests/settings.py | 1 - 1 file changed, 1 deletion(-) diff --git a/wagtail_jotform/tests/settings.py b/wagtail_jotform/tests/settings.py index 2733cda..ecc9e4e 100644 --- a/wagtail_jotform/tests/settings.py +++ b/wagtail_jotform/tests/settings.py @@ -13,7 +13,6 @@ "wagtail.contrib.routable_page", "wagtail.contrib.frontend_cache", "wagtail.contrib.settings", - "wagtail.contrib.modeladmin", "wagtail.contrib.table_block", "wagtail.contrib.forms", "wagtail.embeds", From 99b4e06403f0bb7faa29626ffa7f47efb92b3abd Mon Sep 17 00:00:00 2001 From: Katherine Domingo Date: Thu, 22 Feb 2024 19:49:32 +0800 Subject: [PATCH 3/4] Bump GitHub actions versions --- .github/workflows/release.yml | 6 +++--- .github/workflows/test.yml | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 8c0ca91..224020d 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -9,10 +9,10 @@ jobs: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 - name: Set up Python 3 - uses: actions/setup-python@v2 + uses: actions/setup-python@v5 with: python-version: 3 @@ -23,7 +23,7 @@ jobs: run: python setup.py bdist_wheel sdist - name: Upload Python packages artifact - uses: actions/upload-artifact@v1 + uses: actions/upload-artifact@v4 with: name: Python Packages path: dist diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 51ceaee..c3efed8 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -25,8 +25,8 @@ jobs: - python: "3.12" django: django>=4.2,<4.3 steps: - - uses: actions/checkout@v3 - - uses: actions/setup-python@v3 + - uses: actions/checkout@v4 + - uses: actions/setup-python@v5 with: python-version: ${{ matrix.python }} cache: "pip" @@ -39,6 +39,6 @@ jobs: coverage report coverage xml - if: ${{ matrix.latest }} - uses: codecov/codecov-action@v2 + uses: codecov/codecov-action@v4 with: name: Python 3.12 From 749a54522d154d9e3822e0b63fa77a22ef47b4a0 Mon Sep 17 00:00:00 2001 From: Katherine Domingo Date: Thu, 7 Mar 2024 12:08:51 +0800 Subject: [PATCH 4/4] Bump Wagtail lowerbound --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index fdec0e4..1015fcd 100644 --- a/setup.py +++ b/setup.py @@ -23,7 +23,7 @@ author="Kevin Howbrook", author_email="kevin.howbrook@torchbox.com", license="BSD", - install_requires=["wagtail>=4.1"], + install_requires=["wagtail>=5.2"], classifiers=[ "Environment :: Web Environment", "Intended Audience :: Developers",