From 1e74b873d1eecc86a05d8c3688f374758c039f3d Mon Sep 17 00:00:00 2001 From: katdom13 Date: Mon, 20 May 2024 19:59:18 +0800 Subject: [PATCH 1/3] Update test matrix: Add Wagtail 6.1, Drop Django < 4.2 --- .github/workflows/test.yml | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index c3efed8..6baa11c 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -13,17 +13,15 @@ jobs: strategy: matrix: 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"] + django: ["django>=4.2,<4.3", "django>=5.0,<5.1"] + wagtail: ["wagtail>=5.2,<5.3", "wagtail>=6.0,<6.1", "wagtail>=6.1,<6.2"] exclude: - - django: django>=3.2,<3.3 - wagtail: wagtail>=6.0,<6.1 - python: "3.8" - django: django>=5.0,<5.1 + django: "django>=5.0,<5.1" - python: "3.9" - django: django>=5.0,<5.1 + django: "django>=5.0,<5.1" - python: "3.12" - django: django>=4.2,<4.3 + django: "django>=4.2,<4.3" steps: - uses: actions/checkout@v4 - uses: actions/setup-python@v5 From e4fe9a3d7502edd2b71c7ba119f6585c9b16559a Mon Sep 17 00:00:00 2001 From: katdom13 Date: Mon, 20 May 2024 19:59:44 +0800 Subject: [PATCH 2/3] Update CHANGELOG.md --- CHANGELOG.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index e6fa090..2eda83f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,6 +8,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [Unreleased] +- Add support for Wagtail 6.1 +- Drop support for Django < 3.2 + ## 2.2.0 (2024-03-07) - Add support for Wagtail 6.0 From c24ae031ffabea9cc76b7b0a9f4effafa8b280c7 Mon Sep 17 00:00:00 2001 From: katdom13 Date: Tue, 21 May 2024 10:32:58 +0800 Subject: [PATCH 3/3] Upgrade linters, linting --- .github/workflows/release.yml | 2 +- .pre-commit-config.yaml | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 224020d..d1f690f 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -32,4 +32,4 @@ jobs: uses: pypa/gh-action-pypi-publish@master with: user: __token__ - password: ${{ secrets.pypi_production_token }} \ No newline at end of file + password: ${{ secrets.pypi_production_token }} diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 003d684..7e89af3 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -3,17 +3,17 @@ default_language_version: python: python3.12 repos: - repo: https://github.com/python/black - rev: 22.3.0 + rev: 24.4.2 hooks: - id: black exclude: migrations/ - - repo: https://github.com/timothycrosley/isort - rev: 5.12.0 + - repo: https://github.com/pycqa/isort + rev: 5.13.2 hooks: - id: isort - repo: https://github.com/pycqa/flake8 # flake8 config is in setup.cfg - rev: 6.0.0 + rev: 7.0.0 hooks: - id: flake8 - repo: https://github.com/pre-commit/mirrors-prettier