Skip to content

Commit 940e4ff

Browse files
rgs258rgs258
committed
Merge remote-tracking branch 'remotes/origin/master' into wrds_forms_work
# Conflicts: # tox.ini
2 parents f7a0493 + 0777192 commit 940e4ff

File tree

5 files changed

+30
-190
lines changed

5 files changed

+30
-190
lines changed

‎.github/workflows/python-test.yml‎

Lines changed: 12 additions & 165 deletions
Original file line numberDiff line numberDiff line change
@@ -23,184 +23,31 @@ jobs:
2323
max-parallel: 4
2424
matrix:
2525
tox_env:
26-
- py36-dj22-wt25
27-
- py36-dj22-wt26
28-
- py36-dj22-wt27
29-
- py36-dj22-wt28
30-
- py36-dj22-wt29
31-
- py36-dj22-wt210
32-
- py36-dj22-wt211
33-
- py36-dj22-wt212
34-
- py36-dj22-wt213
35-
- py37-dj22-wt25
36-
- py37-dj22-wt26
37-
- py37-dj22-wt27
38-
- py37-dj22-wt28
39-
- py37-dj22-wt29
40-
- py37-dj22-wt210
41-
- py37-dj22-wt211
42-
- py37-dj22-wt212
43-
- py37-dj22-wt213
44-
- py38-dj22-wt25
45-
- py38-dj22-wt26
46-
- py38-dj22-wt27
47-
- py38-dj22-wt28
48-
- py38-dj22-wt29
49-
- py38-dj22-wt210
50-
- py38-dj22-wt211
51-
- py38-dj22-wt212
52-
- py38-dj22-wt213
53-
- py37-dj30-wt28
54-
- py37-dj30-wt29
55-
- py37-dj30-wt210
56-
- py37-dj30-wt211
57-
- py37-dj30-wt212
58-
- py37-dj30-wt213
59-
- py37-dj30-wt214
60-
- py37-dj30-wt215
61-
- py37-dj30-wt216
62-
- py38-dj30-wt28
63-
- py38-dj30-wt29
64-
- py38-dj30-wt210
65-
- py38-dj30-wt211
66-
- py38-dj30-wt212
67-
- py38-dj30-wt213
68-
- py38-dj30-wt214
69-
- py38-dj30-wt215
70-
- py38-dj30-wt216
71-
- py37-dj31-wt214
72-
- py37-dj31-wt215
73-
- py37-dj31-wt216
74-
- py38-dj31-wt214
75-
- py38-dj31-wt215
76-
- py38-dj31-wt216
77-
- py37-dj32-wt213
78-
- py37-dj32-wt214
7926
- py37-dj32-wt215
8027
- py37-dj32-wt216
81-
- py38-dj32-wt213
82-
- py38-dj32-wt214
8328
- py38-dj32-wt215
8429
- py38-dj32-wt216
30+
- py39-dj32-wt215
31+
- py39-dj32-wt216
32+
- py310-dj32-wt215
33+
- py310-dj32-wt216
8534
include:
86-
- python-version: 3.6
87-
tox_env: py36-dj22-wt25
88-
- python-version: 3.6
89-
tox_env: py36-dj22-wt26
90-
- python-version: 3.6
91-
tox_env: py36-dj22-wt27
92-
- python-version: 3.6
93-
tox_env: py36-dj22-wt28
94-
- python-version: 3.6
95-
tox_env: py36-dj22-wt29
96-
- python-version: 3.6
97-
tox_env: py36-dj22-wt210
98-
- python-version: 3.6
99-
tox_env: py36-dj22-wt211
100-
- python-version: 3.6
101-
tox_env: py36-dj22-wt212
102-
- python-version: 3.6
103-
tox_env: py36-dj22-wt213
104-
- python-version: 3.7
105-
tox_env: py37-dj22-wt25
106-
- python-version: 3.7
107-
tox_env: py37-dj22-wt26
108-
- python-version: 3.7
109-
tox_env: py37-dj22-wt27
110-
- python-version: 3.7
111-
tox_env: py37-dj22-wt28
112-
- python-version: 3.7
113-
tox_env: py37-dj22-wt29
114-
- python-version: 3.7
115-
tox_env: py37-dj22-wt210
116-
- python-version: 3.7
117-
tox_env: py37-dj22-wt211
118-
- python-version: 3.7
119-
tox_env: py37-dj22-wt212
120-
- python-version: 3.7
121-
tox_env: py37-dj22-wt213
122-
- python-version: 3.8
123-
tox_env: py38-dj22-wt25
124-
- python-version: 3.8
125-
tox_env: py38-dj22-wt26
126-
- python-version: 3.8
127-
tox_env: py38-dj22-wt27
128-
- python-version: 3.8
129-
tox_env: py38-dj22-wt28
130-
- python-version: 3.8
131-
tox_env: py38-dj22-wt29
132-
- python-version: 3.8
133-
tox_env: py38-dj22-wt210
134-
- python-version: 3.8
135-
tox_env: py38-dj22-wt211
136-
- python-version: 3.8
137-
tox_env: py38-dj22-wt212
138-
- python-version: 3.8
139-
tox_env: py38-dj22-wt213
140-
- python-version: 3.7
141-
tox_env: py37-dj30-wt28
142-
- python-version: 3.7
143-
tox_env: py37-dj30-wt29
144-
- python-version: 3.7
145-
tox_env: py37-dj30-wt210
146-
- python-version: 3.7
147-
tox_env: py37-dj30-wt211
148-
- python-version: 3.7
149-
tox_env: py37-dj30-wt212
150-
- python-version: 3.7
151-
tox_env: py37-dj30-wt213
152-
- python-version: 3.7
153-
tox_env: py37-dj30-wt214
154-
- python-version: 3.7
155-
tox_env: py37-dj30-wt215
156-
- python-version: 3.7
157-
tox_env: py37-dj30-wt216
158-
- python-version: 3.8
159-
tox_env: py38-dj30-wt28
160-
- python-version: 3.8
161-
tox_env: py38-dj30-wt29
162-
- python-version: 3.8
163-
tox_env: py38-dj30-wt210
164-
- python-version: 3.8
165-
tox_env: py38-dj30-wt211
166-
- python-version: 3.8
167-
tox_env: py38-dj30-wt212
168-
- python-version: 3.8
169-
tox_env: py38-dj30-wt213
170-
- python-version: 3.8
171-
tox_env: py38-dj30-wt214
172-
- python-version: 3.8
173-
tox_env: py38-dj30-wt215
174-
- python-version: 3.8
175-
tox_env: py38-dj30-wt216
176-
- python-version: 3.7
177-
tox_env: py37-dj31-wt214
178-
- python-version: 3.7
179-
tox_env: py37-dj31-wt215
180-
- python-version: 3.7
181-
tox_env: py37-dj31-wt216
182-
- python-version: 3.8
183-
tox_env: py38-dj31-wt214
184-
- python-version: 3.8
185-
tox_env: py38-dj31-wt215
186-
- python-version: 3.8
187-
tox_env: py38-dj31-wt216
188-
- python-version: 3.7
189-
tox_env: py37-dj32-wt213
190-
- python-version: 3.7
191-
tox_env: py37-dj32-wt214
19235
- python-version: 3.7
19336
tox_env: py37-dj32-wt215
19437
- python-version: 3.7
19538
tox_env: py37-dj32-wt216
196-
- python-version: 3.8
197-
tox_env: py38-dj32-wt213
198-
- python-version: 3.8
199-
tox_env: py38-dj32-wt214
20039
- python-version: 3.8
20140
tox_env: py38-dj32-wt215
20241
- python-version: 3.8
20342
tox_env: py38-dj32-wt216
43+
- python-version: 3.9
44+
tox_env: py39-dj32-wt215
45+
- python-version: 3.9
46+
tox_env: py39-dj32-wt216
47+
- python-version: "3.10"
48+
tox_env: py310-dj32-wt215
49+
- python-version: "3.10"
50+
tox_env: py310-dj32-wt216
20451
steps:
20552
- uses: actions/checkout@v2
20653
- name: Set up Python ${{ matrix.python-version }}

‎CHANGELOG.rst‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,16 @@
22
Changelog
33
*********
44

5+
3.18.1
6+
------
7+
* Dropped Django 2.X 3.0 and 3.1 support
8+
* Dropped Python 3.6 support
9+
* Dropped Wagtail 2.2 > 2.14 support
10+
11+
3.18.0
12+
------
13+
* Wagtail 2.16 support
14+
515
3.17.0
616
------
717
* Wagtail 2.15 support

‎requirements.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# The app itself
22
-e .
33

4-
Django>=1.11,<3.1
4+
Django>=3.2
55
mock
66
psycopg2-binary
77

‎tox.ini‎

Lines changed: 6 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,48 +1,31 @@
11
[tox]
22
envlist =
33
flake8
4-
py{36,37,38}-dj{22}-wt{25,26,27,28,29,210,211,212,213}
5-
py{37,38}-dj{30,31}-wt{28,29,210,211,212,213,214,215}
6-
py{37,38}-dj{32}-wt{213,214,215,216}
4+
py{37,38,39,310}-dj{32}-wt{215,216}
75

86
[gh-actions]
97
python =
10-
3.6: py36
118
3.7: py37
129
3.8: py38
10+
3.9: py39
11+
"3.10": py310
1312

1413
[testenv]
1514
deps =
1615
coverage
1716
mock
18-
19-
dj22: Django>=2.2.8,<2.3
20-
dj30: Django>=3.0,<3.1
21-
dj31: Django>=3.1,<3.2
2217
dj32: Django>=3.2,<3.3
23-
wt23: wagtail>=2.3,<2.4
24-
wt24: wagtail>=2.4,<2.5
25-
wt25: wagtail>=2.5,<2.6
26-
wt26: wagtail>=2.6,<2.7
27-
wt27: wagtail>=2.7,<2.8
28-
wt28: wagtail>=2.8,<2.9
29-
wt29: wagtail>=2.9,<2.10
30-
wt210: wagtail>=2.10,<2.11
31-
wt211: wagtail>=2.11,<2.12
32-
wt212: wagtail>=2.12,<2.13
33-
wt213: wagtail>=2.13,<2.14
34-
wt213: wagtail>=2.13,<2.14
35-
wt214: wagtail>=2.14,<2.15
3618
wt215: wagtail>=2.15,<2.16
3719
wt216: wagtail>=2.16,<2.17
3820

3921
commands =
4022
coverage run manage.py test
4123

4224
basepython =
43-
py36: python3.6
4425
py37: python3.7
4526
py38: python3.8
27+
py39: python3.9
28+
py310: python3.10
4629

4730
setenv =
4831
DJANGO_SETTINGS_MODULE=tests.settings
@@ -58,7 +41,7 @@ deps =
5841
git+https://github.com/wagtail/wagtail.git@master
5942
coverage
6043
mock
61-
django>=3.1
44+
django>=3.2
6245
commands =
6346
coverage run manage.py test
6447
ignore_errors = True

‎wagtailstreamforms/__init__.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,6 @@
22

33
# major.minor.patch.release.number
44
# release must be one of alpha, beta, rc, or final
5-
VERSION = (3, 17, 0, "final", 1)
5+
VERSION = (3, 18, 1, "final", 1)
66

77
__version__ = get_version(VERSION)

0 commit comments

Comments
 (0)