Skip to content
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

Wagtail 6.1 #7

Merged
merged 5 commits into from
Jun 14, 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
2 changes: 1 addition & 1 deletion .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ jobs:
fail-fast: false
max-parallel: 5
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@v4
Expand Down
2 changes: 1 addition & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
## [Unreleased]

- Drop tests for Wagtail < 5.2 as they have reached EOL (@katdom13)
- Drop tests for Django 4.1 as it has reached EOL (@katdom13)
- Drop tests for Django < 4.2 as it has reached EOL (@katdom13)
- Add tests for Python 3.12 (@katdom13)
- Add `wagtail-modeladmin` to testing dependencies (@katdom13)

Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@ Integrates [django-admin-rangefilter](https://pypi.org/project/django-admin-rang
## Supported versions

- Python 3.8, 3.9, 3.10, 3.11, 3.12
- Django 3.2, 4.2, 5.0
- Wagtail 5.2, 6.0 (with external package [wagtail-modeladmin](https://pypi.org/project/wagtail-modeladmin/))
- Django 4.2, 5.0
- Wagtail 5.2, 6.0, 6.1 (with external package [wagtail-modeladmin](https://pypi.org/project/wagtail-modeladmin/))

## Installation

Expand Down
7 changes: 3 additions & 4 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@ dynamic = [
classifiers = [
"Development Status :: 4 - Beta",
"Framework :: Django",
"Framework :: Django :: 3.2",
"Framework :: Django :: 4.2",
"Framework :: Django :: 5.0",
"Framework :: Wagtail",
Expand All @@ -41,14 +40,14 @@ classifiers = [
requires-python = ">=3.8"
dependencies = [
"django-admin-rangefilter>=0.12",
"Django>=3.2",
"Django>=4.2",
"wagtail>=5.2",
]

[project.optional-dependencies]
testing = [
"coverage~=6.4.4",
"tox~=3.26.0",
"coverage~=7.5.1",
"tox~=4.15.0",
"wagtail-modeladmin==2.0.0",
]

Expand Down
7 changes: 3 additions & 4 deletions tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,8 @@ skipsdist = True
usedevelop = True

envlist =
python{3.8,3.9,3.10}-django3.2-wagtail5.2
python{3.8,3.9,3.10,3.11}-django4.2-wagtail{5.2,6.0}
python{3.11,3.12}-django5.0-wagtail{5.2,6.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}
flake8

[flake8]
Expand Down Expand Up @@ -34,13 +33,13 @@ basepython =
deps =
coverage

django3.2: Django>=3.2,<4.0
django4.2: Django>=4.2,<4.3
django5.0: Django>=5.0,<5.1
djangomain: git+https://github.com/django/django.git@main#egg=Django

wagtail5.2: wagtail>=5.2,<5.3
wagtail6.0: wagtail>=6.0,<6.1
wagtail6.1: wagtail>=6.1,<6.2
wagtailmain: git+https://github.com/wagtail/wagtail.git

postgres: psycopg2>=2.6
Expand Down