Skip to content

Commit

Permalink
Tweak tox config and add dedicated Wagtail 2.15 entry
Browse files Browse the repository at this point in the history
  • Loading branch information
zerolab committed Oct 22, 2021
1 parent a6ef6a2 commit 23a192e
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 6 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ jobs:
matrix:
python: ['3.7', '3.8', '3.9']
django: ['2.2', '3.0', '3.1']
wagtail: ['2.11', '2.12', '2.13', '2.14']
wagtail: ['2.11', '2.12', '2.13', '2.14', '2.15']
postgres: ['10.8']
experimental: [false]
include:
Expand All @@ -59,7 +59,7 @@ jobs:
experimental: false
- python: '3.9'
django: '3.2'
wagtail: 'git+https://github.com/wagtail/wagtail.git@main#egg=wagtail'
wagtail: 'main'
experimental: true
exclude:
# Exclude tests of Django 2.2 and Wagtail 2.14 together
Expand Down
8 changes: 4 additions & 4 deletions tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
skipsdist = True
usedevelop = True

envlist = python{3.7,3.8,3.9}-django{2.2,3.0,3.1,3.2,master}-wagtail{2.11,2.12,2.13,main}-{sqlite,postgres}
envlist = python{3.7,3.8,3.9}-django{2.2,3.0,3.1,3.2,main}-wagtail{2.11,2.12,2.13,main}-{sqlite,postgres}

[flake8]
# E501: Line too long
Expand All @@ -26,13 +26,13 @@ deps =
django3.0: Django>=3.0,<3.1
django3.1: Django>=3.1,<3.2
django3.2: Django>=3.2,<4.0
djangomaster: git+https://github.com/django/django.git@master#egg=Django
djangomaster: git+https://github.com/wagtail/django-modelcluster.git
djangomain: git+https://github.com/django/django.git@main#egg=Django

wagtail2.11: wagtail>=2.11,<2.12
wagtail2.12: wagtail>=2.12,<2.13
wagtail2.13: wagtail>=2.13,<2.14
wagtail2.14: wagtail==2.14rc1
wagtail2.14: wagtail>=2.14,<2.15
wagtail2.15: wagtail>=2.15,<2.16
wagtailmain: git+https://github.com/wagtail/wagtail.git

# Pinned to work around UTC connection error
Expand Down

0 comments on commit 23a192e

Please sign in to comment.