Skip to content

Commit 4fd54a7

Browse files
authored
Merge pull request #33 from torchbox-forks/support/wagtail-60
Wagtail 6.0
2 parents ce465b9 + 749a545 commit 4fd54a7

File tree

6 files changed

+26
-18
lines changed

6 files changed

+26
-18
lines changed

.github/workflows/release.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,10 @@ jobs:
99
runs-on: ubuntu-latest
1010

1111
steps:
12-
- uses: actions/checkout@v2
12+
- uses: actions/checkout@v4
1313

1414
- name: Set up Python 3
15-
uses: actions/setup-python@v2
15+
uses: actions/setup-python@v5
1616
with:
1717
python-version: 3
1818

@@ -23,7 +23,7 @@ jobs:
2323
run: python setup.py bdist_wheel sdist
2424

2525
- name: Upload Python packages artifact
26-
uses: actions/upload-artifact@v1
26+
uses: actions/upload-artifact@v4
2727
with:
2828
name: Python Packages
2929
path: dist

.github/workflows/test.yml

Lines changed: 15 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -12,17 +12,21 @@ jobs:
1212
runs-on: ubuntu-latest
1313
strategy:
1414
matrix:
15-
python: ["3.11", "3.10", "3.9", "3.8"]
16-
django: ["django>=3.2,<3.3", "django>=4.1,<4.2", "django>=4.2,<4.3"]
17-
wagtail: ["wagtail>=4.1,<4.2", "wagtail>=5.1,<5.2", "wagtail>=5.2,<5.3"]
15+
python: ["3.12", "3.11", "3.10", "3.9", "3.8"]
16+
django: ["django>=3.2,<3.3", "django>=4.2,<4.3", "django>=5.0,<5.1"]
17+
wagtail: ["wagtail>=5.2,<5.3", "wagtail>=6.0,<6.1"]
1818
exclude:
19-
- python: "3.11"
20-
django: django>=3.2,<3.3
21-
- django: django>=4.2,<4.3
22-
wagtail: wagtail>=4.1,<4.2
19+
- django: django>=3.2,<3.3
20+
wagtail: wagtail>=6.0,<6.1
21+
- python: "3.8"
22+
django: django>=5.0,<5.1
23+
- python: "3.9"
24+
django: django>=5.0,<5.1
25+
- python: "3.12"
26+
django: django>=4.2,<4.3
2327
steps:
24-
- uses: actions/checkout@v3
25-
- uses: actions/setup-python@v3
28+
- uses: actions/checkout@v4
29+
- uses: actions/setup-python@v5
2630
with:
2731
python-version: ${{ matrix.python }}
2832
cache: "pip"
@@ -35,6 +39,6 @@ jobs:
3539
coverage report
3640
coverage xml
3741
- if: ${{ matrix.latest }}
38-
uses: codecov/codecov-action@v2
42+
uses: codecov/codecov-action@v4
3943
with:
40-
name: Python 3.9
44+
name: Python 3.12

.pre-commit-config.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
default_language_version:
22
node: system
3-
python: python3.9
3+
python: python3.12
44
repos:
55
- repo: https://github.com/python/black
66
rev: 22.3.0

CHANGELOG.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
88

99
## [Unreleased]
1010

11+
- Add support for Wagtail 6.0
12+
- Add support for Django 5.0
13+
- Drop support for Wagtail < 5.2
14+
1115
## 2.1.0 (2024-03-07)
1216

1317
- Add support for Wagtail 5.1+

setup.py

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
author="Kevin Howbrook",
2424
author_email="kevin.howbrook@torchbox.com",
2525
license="BSD",
26-
install_requires=["wagtail>=4.1"],
26+
install_requires=["wagtail>=5.2"],
2727
classifiers=[
2828
"Environment :: Web Environment",
2929
"Intended Audience :: Developers",
@@ -34,9 +34,10 @@
3434
"Programming Language :: Python :: 3.9",
3535
"Programming Language :: Python :: 3.10",
3636
"Programming Language :: Python :: 3.11",
37+
"Programming Language :: Python :: 3.12",
3738
"Framework :: Wagtail",
38-
"Framework :: Wagtail :: 4",
3939
"Framework :: Wagtail :: 5",
40+
"Framework :: Wagtail :: 6",
4041
],
4142
extras_require={"testing": testing_extras, "development": development_extras},
4243
)

wagtail_jotform/tests/settings.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@
1313
"wagtail.contrib.routable_page",
1414
"wagtail.contrib.frontend_cache",
1515
"wagtail.contrib.settings",
16-
"wagtail.contrib.modeladmin",
1716
"wagtail.contrib.table_block",
1817
"wagtail.contrib.forms",
1918
"wagtail.embeds",

0 commit comments

Comments
 (0)