Skip to content

Commit

Permalink
Merge pull request #25 from torchbox-forks/support/wagtail-62
Browse files Browse the repository at this point in the history
Wagtail 6.1 + 6.2 Tox Tests
  • Loading branch information
seb-b authored Aug 18, 2024
2 parents 35013ad + 263d1b2 commit c70ad75
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 10 deletions.
2 changes: 1 addition & 1 deletion docs/requirements.txt
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
Sphinx>=1.5.1,<6.0
Sphinx>>=7.1.2
sphinx-rtd-theme
-e .
4 changes: 1 addition & 3 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
'wagtail>=5.2',
],
extras_require={
'testing': ['jinja2>=2.10,<3.0', 'markupsafe==2.0.1']
'testing': ['jinja2>=2.10,<4.0', 'markupsafe==2.1.5']
},
zip_safe=False,
license='BSD License',
Expand All @@ -47,8 +47,6 @@
'Programming Language :: Python :: 3.11',
'Programming Language :: Python :: 3.12',
'Framework :: Django',
'Framework :: Django :: 3',
'Framework :: Django :: 3.2',
'Framework :: Django :: 4',
'Framework :: Django :: 4.2',
'Framework :: Django :: 5',
Expand Down
3 changes: 1 addition & 2 deletions tests/app/models.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
from django.db import models

from wagtail.admin.panels import FieldPanel
from wagtail.admin.panels import FieldPanel as ImageChooserPanel
from wagtail.contrib.settings.models import register_setting
from wagtail.models import Page

Expand Down Expand Up @@ -45,7 +44,7 @@ class PersonPage(PageLDMixin, Page):
content_panels = Page.content_panels + [
FieldPanel('bio'),
FieldPanel('date_of_birth'),
ImageChooserPanel('photo'),
FieldPanel('photo'),
]

def ld_entity(self):
Expand Down
8 changes: 4 additions & 4 deletions tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,8 @@
skip_missing_interpreters = True

envlist =
py{38,39,310}-dj32-wt52
py{38,39,310,311}-dj42-wt{52,60}
py{311,312}-dj50-wt{52,60}
py{38,39,310,311}-dj42-wt{52,60,61,62}
py{310,311,312}-dj50-wt{52,60,61,62}
flake8,isort,docs

[gh-actions]
Expand All @@ -24,12 +23,13 @@ pip_pre = True

deps =
{[base]deps}
dj32: django>=3.2,<4.0
dj42: django>=4.2,<4.3
dj50: django>=5.0,<5.1
djHEAD: django
wt52: Wagtail>=5.2,<5.3
wt60: Wagtail>=6.0,<6.1
wt61: Wagtail>=6.1,<6.2
wt62: Wagtail>=6.2,<6.3
wtHEAD: Wagtail

[testenv:flake8]
Expand Down

0 comments on commit c70ad75

Please sign in to comment.