Skip to content

Commit

Permalink
Add Wagtail 5.1 and 5.2 + Python 3.12 support (#93)
Browse files Browse the repository at this point in the history
* Add STATIC_URl to test settings

On Wagtail 5.1 and later, this raises ImproperlyConfigured: You're using the staticfiles app without having set the required STATIC_URL setting

* Remove Wagtail 4.2 from matrix

No longer supported since this August.

* Add Wagtail 5.1 and 5.2 LTS to matrix

* Add Python 3.12 support

* Don't mark wheel as python2 compatible

* Ensure setuptools in installed in CI
  • Loading branch information
Stormheg authored Nov 5, 2023
1 parent eaa5dcb commit bb04de0
Show file tree
Hide file tree
Showing 6 changed files with 14 additions and 13 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:
continue-on-error: ${{ matrix.experimental }}
strategy:
matrix:
python: ["3.8", "3.9", "3.10", "3.11"]
python: ["3.8", "3.9", "3.10", "3.11", "3.12"]
experimental: [false]
toxenv: ["py"]
include:
Expand All @@ -26,7 +26,7 @@ jobs:
toxenv: isort
experimental: false
# Future Wagtail release from main branch (allowed to fail)
- python: "3.11"
- python: "3.12"
toxenv: wagtailmain
experimental: true
steps:
Expand All @@ -37,7 +37,7 @@ jobs:
python-version: ${{ matrix.python }}
- name: Install dependencies
run: |
python -m pip install tox tox-py
python -m pip install setuptools tox tox-py
# This step runs only for jobs NOT in the include matrix
- name: Run tox targets for Python ${{ matrix.python }}
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ If you want to send an encrypted email (optional), the public key ID for securit

## Supported Versions

- Python 3.8 - 3.11
- Python 3.8 - 3.12
- Django 3.2 - 4.2
- Wagtail >= 4.1

Expand Down
3 changes: 0 additions & 3 deletions setup.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,3 @@ known_third_party=bakery,django,factory,pytest,wagtail

[tool:pytest]
testpaths=tests

[wheel]
universal=1
1 change: 1 addition & 0 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -52,5 +52,6 @@
'Programming Language :: Python :: 3.9',
'Programming Language :: Python :: 3.10',
'Programming Language :: Python :: 3.11',
'Programming Language :: Python :: 3.12',
],
)
1 change: 1 addition & 0 deletions tests/conftest.py
Original file line number Diff line number Diff line change
Expand Up @@ -90,4 +90,5 @@ def pytest_configure():
'wagtailbakery.views.AllPagesView',
),
CELERY_ALWAYS_EAGER=True,
STATIC_URL="/static/",
)
14 changes: 8 additions & 6 deletions tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -3,19 +3,21 @@ linting_folders=src/wagtailbakery/ tests/ examples/

[tox]
envlist=
py{38,39,310,311}-django{32,40,41}-wagtail{41,42} # Wagtail 4.1 LTS and 4.2 - all supported Python - all Django
py{38,39,310,311}-django{32,41,42}-wagtail50 # Wagtail 5.0 - all supported Python - all Django
wagtailmain # Wagtail main latest compatible version
py{38,39,310,311}-django{32,40,41}-wagtail41 # Wagtail 4.1 LTS - all supported Python - all Django
py{38,39,310,311,312}-django{32,41,42}-wagtail{50,51,52} # Wagtail 5.0, 5.1 and 5.2 LTS - all supported Python - all Django
wagtailmain # Wagtail main latest compatible version

[testenv]
commands=py.test --cov=wagtailbakery --cov-report=xml {posargs}
deps=
django32: django>=3.2,<3.3
django40: django>=4.0,<4.1
django41: django>=4.1,<4.2
wagtail41: wagtail>=4.1,<4.2 # Current LTS
wagtail42: wagtail>=4.2,<5.0
wagtail50: wagtail>=5.0rc1,<5.1
django42: django>=4.2,<5
wagtail41: wagtail>=4.1,<4.2 # Previous LTS
wagtail50: wagtail>=5.0,<5.1
wagtail51: wagtail>=5.1,<5.2
wagtail52: wagtail>=5.2,<5.3 # Current LTS
extras=test

[testenv:wagtailmain]
Expand Down

0 comments on commit bb04de0

Please sign in to comment.