Skip to content

Wagtail 6.0 #15

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.

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
merged 9 commits into from
Mar 8, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 3 additions & 3 deletions .github/workflows/python-tox.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,12 @@ jobs:
strategy:
max-parallel: 4
matrix:
python-version: ["3.8", "3.9", "3.10", "3.11"]
python-version: ["3.8", "3.9", "3.10", "3.11", "3.12"]

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: Set up Python ${{ matrix.python-version }}
uses: actions/setup-python@v4
uses: actions/setup-python@v5
with:
python-version: ${{ matrix.python-version }}
- name: Install dependencies
Expand Down
5 changes: 5 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,11 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),

## [unreleased] - YYYY-MM-DD

- Adjust test matrix to use Wagtail 6.0 [@katdom13](https://github.com/katdom13)
- Drop Wagtail < 5.2 from the test matrix [@katdom13](https://github.com/katdom13)
- Add Python 3.12 to test matrix [@katdom13](https://github.com/katdom13)
- Update minimum Wagtail version to 5.2 in setup.py [@katdom13](https://github.com/katdom13)

## [v2.0.0] - 2023-12-19

- Adjust test matrix to use Wagtail 5.2 [@nickmoreton](https://github.com/nickmoreton)
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ Install using pip:
pip install wagtail-accessibility
```

Then add `wagtailaccessibility` to your `INSTALLED_APPS`. It works with Wagtail 4.1 and upwards.
Then add `wagtailaccessibility` to your `INSTALLED_APPS`. It works with Wagtail 5.2 and upwards.

## Using

Expand Down
2 changes: 1 addition & 1 deletion requirements.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
wagtail>=4.1
wagtail>=5.2
pytest==6.2.5
pytest-cov==3.0.0
pytest-django==4.5.0
Expand Down
6 changes: 3 additions & 3 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@


install_requires = [
'wagtail>=4.1',
'wagtail>=5.2',
]

tests_require = [
Expand Down Expand Up @@ -51,18 +51,18 @@
'Topic :: Internet :: WWW/HTTP :: Site Management',
'Programming Language :: Python',
'Programming Language :: Python :: 3',
'Programming Language :: Python :: 3.7',
'Programming Language :: Python :: 3.8',
'Programming Language :: Python :: 3.9',
'Programming Language :: Python :: 3.10',
'Programming Language :: Python :: 3.11',
'Programming Language :: Python :: 3.12',
"Framework :: Django",
"Framework :: Django :: 3.2",
"Framework :: Django :: 4.2",
"Framework :: Django :: 5.0",
"Framework :: Wagtail",
"Framework :: Wagtail :: 4",
"Framework :: Wagtail :: 5",
"Framework :: Wagtail :: 6",
'License :: OSI Approved :: BSD License',
],
)
7 changes: 2 additions & 5 deletions tests/test_page.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,10 @@


validity = {
'is_valid': True
'is_valid': True,
'is_available': True,
}

if settings.WAGTAIL_VERSION >= (4, 0):
validity['is_available'] = True


def test_preview(admin_client):
simple_page = SimplePage.objects.first()

Expand Down
13 changes: 7 additions & 6 deletions tox.ini
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
[tox]
minversion = 3.14.6
envlist =
py{38,39,310}-dj{32,41}-wagtail{41,51,52}
py311-dj{42}-wagtail{51,52}
py{38,39,310}-dj32-wagtail52
py{38,39,310,311}-dj42-wagtail{52,60}
py{310,311,312}-dj50-wagtail{52,60}
coverage-report

[gh-actions]
Expand All @@ -11,20 +12,20 @@ python =
3.9: py39
3.10: py310
3.11: py311
3.12: py312

[testenv]
commands = coverage run --parallel -m pytest {posargs}
extras = test
deps =
dj32: django>=3.2,<3.3
dj41: django>=4.1,<4.2
dj42: django>=4.2,<4.3
wagtail41: wagtail>=4.1,<5.0
wagtail51: wagtail>=5.1,<5.2
dj50: django>=5.0,<5.1
wagtail52: wagtail>=5.2,<5.3
wagtail60: wagtail>=6.0,<6.1

[testenv:coverage-report]
basepython = python3.11
basepython = python3.12
deps = coverage
pip_pre = true
skip_install = true
Expand Down