Skip to content

Commit

Permalink
Merge pull request #60 from springload/chore/more-tox
Browse files Browse the repository at this point in the history
Update tox to remove unsupported Django, add more Wagtail, and add django-recaptcha
  • Loading branch information
haydngreatnews authored Sep 19, 2024
2 parents f549a78 + 214c423 commit d9f3484
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 9 deletions.
4 changes: 2 additions & 2 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,10 @@
# Testing dependencies
testing_extras = [
# Required for running the tests
"tox>=3.26.0,<3.27",
"tox>=4.18.1,<4.19",
# For coverage and PEP8 linting
"coverage>=6.5.0,<6.6",
"flake8>=5.0.4,<5.1",
"flake8>=7.0.0,<7.1",
"isort>=5.10.1",
# For test site
"wagtail>=4.1",
Expand Down
18 changes: 11 additions & 7 deletions tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,9 @@
skipsdist = True
usedevelop = True
envlist =
py{38,39,310}-dj{32,41}-wt{41,42,50,51,52}
py311-dj41-wt{41,42,50,51,52}
py311-dj42-wt{50,51,52}
py312-dj42-wt{52}
py{38,39,310,311}-dj42-wt{50,51,52,60,61,62}-dr4
py{310,311,312}-dj50-wt{52,60,61,62}-dr4
py{310,311,312}-dj51-wt{60,61,62}-dr4

[testenv]
install_command = pip install -e ".[testing]" -U {opts} {packages}
Expand All @@ -25,12 +24,17 @@ basepython =
py312: python3.12

deps =
dj32: Django>=3.2,<4.0
dj41: Django>=4.1,<4.2
dj42: Django>=4.2,<4.3
wt41: wagtail>=4.1,<5.0
dj50: Django>=5.0,<5.1
dj51: Django>=5.1,<5.2
wt42: wagtail>=4.2,<5.0
wt50: wagtail>=5.0,<5.1
wt51: wagtail>=5.1,<5.2
wt52: wagtail>=5.2,<5.3
wt60: wagtail>=6.0,<6.1
wt61: wagtail>=6.1,<6.2
wt62: wagtail>=6.2,<6.3
dr4: django_recaptcha>=4.0.0,<5.0.0

commands =
make lint
Expand Down

0 comments on commit d9f3484

Please sign in to comment.