Skip to content

Support Wagtail >= 4, drop support for Wagtail < 4 #72

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
willbarton merged 12 commits into from
Mar 10, 2023
Merged

Support Wagtail >= 4, drop support for Wagtail < 4 #72

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
8a478e5
Switch to pyproject.toml
willbarton Jan 11, 2023
0814b0d
Add interactive tox environment
willbarton Jan 11, 2023
17e7d9c
Update release to PyPI workflow
willbarton Jan 12, 2023
277a110
Use CFPB’s flag icon
willbarton Jan 18, 2023
705181f
Remove checks for Wagtail > 3
willbarton Jan 18, 2023
05418b0
Update project scaffolding for Wagtail 4
willbarton Jan 18, 2023
1448448
Remove wagtail <3
willbarton Jan 18, 2023
1a94a16
Update admin templates for Wagtail 4
willbarton Jan 18, 2023
aeb9ac1
Fix title tags
willbarton Mar 7, 2023
684ee68
Use Wagtail’s panel.html template for fields
willbarton Mar 7, 2023
2f843ee
Remove unused breadcrumb CSS
willbarton Mar 7, 2023
9d273d9
Update docs and screenshots
willbarton Mar 7, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Update project scaffolding for Wagtail 4
  • Loading branch information
@willbarton
willbarton committed Jan 18, 2023
commit 05418b045a0a48039e48e89ad228f0e1a08aced9
27 changes: 12 additions & 15 deletions .github/workflows/test.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,23 +32,20 @@ jobs:
strategy:
matrix:
toxenv:
# Legacy versions
- py38-dj32-wag215

# Current and latest versions
- py311-dj32-wag30
- py311-dj40-wag30
- py311-dj40-waglatest
- py38-dj3-wag4
- py38-dj4-wag4
- py38-dj3-waglatest
- py38-dj4-waglatest

include:
- toxenv: py38-dj32-wag215
python-version: "3.8"
- toxenv: py311-dj32-wag30
python-version: "3.11"
- toxenv: py311-dj40-wag30
python-version: "3.11"
- toxenv: py311-dj40-waglatest
python-version: "3.11"
- toxenv: py38-dj3-wag4
python-version: 3.8
- toxenv: py38-dj4-wag4
python-version: 3.8
- toxenv: py38-dj3-waglatest
python-version: 3.8
- toxenv: py38-dj4-waglatest
python-version: 3.8

steps:
- uses: actions/checkout@v3
Expand Down
5 changes: 2 additions & 3 deletions pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,16 +9,15 @@ authors = [
{name = "CFPB", email = "[email protected]" }
]
dependencies = [
"wagtail>2.15,<4",
"wagtail>=4",
"django-flags>4.2"
]
classifiers = [
"Framework :: Django",
"Framework :: Django :: 3.2",
"Framework :: Django :: 4",
"Framework :: Wagtail",
"Framework :: Wagtail :: 2",
"Framework :: Wagtail :: 3",
"Framework :: Wagtail :: 4",
"License :: CC0 1.0 Universal (CC0 1.0) Public Domain Dedication",
"License :: Public Domain",
"Programming Language :: Python",
Expand Down
3 changes: 2 additions & 1 deletion setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
from setuptools import setup

if __name__ == '__main__':

if __name__ == "__main__":
setup()
12 changes: 5 additions & 7 deletions tox.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,7 @@
skipsdist=True
envlist=
lint,
py{38,311}-dj{32}-wag{215},
py{38,311}-dj{32,40}-wag{30,latest},
py{38,311}-dj{3,4}-wag{4,latest},
coverage

[testenv]
Expand All @@ -18,11 +17,10 @@ basepython=
py311: python3.11

deps=
dj32: Django>=3.2,<3.3
dj40: Django>=4.0,<4.1
wag215: wagtail>=2.15,<4
wag30: wagtail>=3.0,<3.1
waglatest: wagtail<4
dj3: Django>=3.2,<4
dj4: Django>=4.1,<5
wag4: wagtail>=4,<5
waglatest: wagtail>4

[testenv:lint]
basepython=python3.8
Expand Down