Skip to content

Commit

Permalink
Merge pull request #36 from torchbox-forks/support/wagtail61
Browse files Browse the repository at this point in the history
Wagtail 6.1
  • Loading branch information
katdom13 authored Jun 14, 2024
2 parents ef49ebf + c24ae03 commit 0ec69c7
Show file tree
Hide file tree
Showing 4 changed files with 13 additions and 12 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,4 +32,4 @@ jobs:
uses: pypa/gh-action-pypi-publish@master
with:
user: __token__
password: ${{ secrets.pypi_production_token }}
password: ${{ secrets.pypi_production_token }}
12 changes: 5 additions & 7 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
8 changes: 4 additions & 4 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 3 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 0ec69c7

Please sign in to comment.