Skip to content

Commit

Permalink
Merge pull request #7 from torchbox-forks/support/wagtail61
Browse files Browse the repository at this point in the history
Wagtail 6.1
  • Loading branch information
katdom13 authored May 24, 2024
2 parents 7064796 + dae0ba3 commit 267fc1c
Show file tree
Hide file tree
Showing 4 changed files with 19 additions and 27 deletions.
30 changes: 13 additions & 17 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,10 @@ jobs:
name: lint
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

- name: Set up Python
uses: actions/setup-python@v4
uses: actions/setup-python@v5
with:
python-version: 3.11

Expand All @@ -32,25 +32,21 @@ jobs:
strategy:
matrix:
python: ['3.8', '3.11']
django: ['3.2', '4.2']
wagtail: ['4.1', '5.2', '6.0']
django: ['4.2', '5.0']
wagtail: ['5.2', '6.0', '6.1']
exclude:
- django: '3.2'
wagtail: '6.0'
- django: '4.2'
wagtail: '4.1'
- python: '3.11'
django: '3.2'
include:
- python: '3.11'
- python: '3.8'
django: '5.0'
wagtail: '6.0'
- python: '3.9'
django: '5.0'
- python: '3.12'
django: '4.2'

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

- name: Set up Python
uses: actions/setup-python@v4
uses: actions/setup-python@v5
with:
python-version: ${{ matrix.python }}

Expand Down Expand Up @@ -78,12 +74,12 @@ jobs:
- test

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
fetch-depth: 0

- name: Set up Python
uses: actions/setup-python@v4
uses: actions/setup-python@v5
with:
python-version: "3.11"

Expand Down
4 changes: 2 additions & 2 deletions README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -55,8 +55,8 @@ Compatibility
This code has been tested for compatibility with:

* Python 3.8+
* Django 3.2 (LTS), 4.2 (LTS), 5.0
* Wagtail 3.0+, including 5.2 (LTS) and 6.0
* Django 4.2 (LTS), 5.0
* Wagtail 5.2 (LTS), 6.0, and 6.1

It should be compatible with all intermediate versions, as well.
If you find that it is not, please `file an issue <https://github.com/cfpb/wagtail-inventory/issues/new>`_.
Expand Down
3 changes: 0 additions & 3 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -15,12 +15,9 @@ dependencies = [
]
classifiers = [
"Framework :: Django",
"Framework :: Django :: 3.2",
"Framework :: Django :: 4.2",
"Framework :: Django :: 5.0",
"Framework :: Wagtail",
"Framework :: Wagtail :: 3",
"Framework :: Wagtail :: 4",
"Framework :: Wagtail :: 5",
"Framework :: Wagtail :: 6",
"License :: CC0 1.0 Universal (CC0 1.0) Public Domain Dedication",
Expand Down
9 changes: 4 additions & 5 deletions tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,8 @@
skipsdist=True
envlist=
lint,
python{3.8}-django{3.2}-wagtail{4.1,5.2}
python{3.8,3.11}-django{4.2}-wagtail{5.2,6.0}
python3.11-django5.0-wagtail6.0
python{3.8,3.9,3.10,3.11}-django4.2-wagtail{5.2,6.0,6.1}
python{3.10,3.11,3.12}-django5.0-wagtail{5.2,6.0,6.1}
coverage

[testenv]
Expand All @@ -17,12 +16,12 @@ basepython=
python3.11: python3.11

deps=
django3.2: Django>=3.2,<3.3
django4.2: Django>=4.2,<4.3
django5.0: Django>=5.0,<5.1
wagtail4.1: wagtail>=4.1,<5.0

wagtail5.2: wagtail>=5.2,<5.3
wagtail6.0: wagtail>=6.0,<6.1
wagtail6.1: wagtail>=6.1,<6.2

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

0 comments on commit 267fc1c

Please sign in to comment.