Skip to content

Commit 9117bbb

Browse files
rgs258rgs258
committed
Merge branch 'master' into wrds_forms_work
# Conflicts: # wagtailstreamforms/blocks.py # wagtailstreamforms/forms.py # wagtailstreamforms/migrations/0001_initial.py # wagtailstreamforms/migrations/0003_alter_form_fields.py # wagtailstreamforms/models/form.py
2 parents e1214f2 + aa6cab8 commit 9117bbb

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

42 files changed

+443
-833
lines changed

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

Lines changed: 13 additions & 109 deletions
Original file line numberDiff line numberDiff line change
@@ -23,116 +23,20 @@ jobs:
2323
max-parallel: 4
2424
matrix:
2525
tox_env:
26-
- py310-dj32-wt215
27-
- py310-dj32-wt216
28-
- py310-dj32-wt30
29-
- py310-dj32-wt40
30-
- py310-dj32-wt41
31-
- py310-dj40-wt216
32-
- py310-dj40-wt30
33-
- py310-dj40-wt40
34-
- py310-dj40-wt41
35-
- py310-dj40-wt42
36-
- py310-dj41-wt40
37-
- py310-dj41-wt41
38-
- py310-dj41-wt42
39-
- py38-dj32-wt215
40-
- py38-dj32-wt216
41-
- py38-dj32-wt30
42-
- py38-dj32-wt40
43-
- py38-dj32-wt41
44-
- py38-dj40-wt216
45-
- py38-dj40-wt30
46-
- py38-dj40-wt40
47-
- py38-dj40-wt40
48-
- py38-dj41-wt41
49-
- py38-dj41-wt42
50-
- py38-dj41-wt41
51-
- py39-dj32-wt215
52-
- py39-dj32-wt216
53-
- py39-dj32-wt30
54-
- py39-dj32-wt40
55-
- py39-dj32-wt41
56-
- py39-dj40-wt216
57-
- py39-dj40-wt30
58-
- py39-dj40-wt40
59-
- py39-dj40-wt41
60-
- py39-dj41-wt40
61-
- py39-dj41-wt41
62-
- py39-dj41-wt42
26+
- py311-dj41-wt41
27+
- py311-dj41-wt50
28+
- py311-dj41-wt51
29+
- py311-dj41-wt52
6330
include:
64-
- python-version: 3.8
65-
tox_env: py38-dj32-wt215
66-
- python-version: 3.8
67-
tox_env: py38-dj32-wt216
68-
- python-version: 3.8
69-
tox_env: py38-dj32-wt30
70-
- python-version: 3.8
71-
tox_env: py38-dj32-wt40
72-
- python-version: 3.8
73-
tox_env: py38-dj32-wt41
74-
- python-version: 3.8
75-
tox_env: py38-dj40-wt216
76-
- python-version: 3.8
77-
tox_env: py38-dj40-wt30
78-
- python-version: 3.8
79-
tox_env: py38-dj40-wt40
80-
- python-version: 3.8
81-
tox_env: py38-dj40-wt41
82-
- python-version: 3.8
83-
tox_env: py38-dj41-wt40
84-
- python-version: 3.8
85-
tox_env: py38-dj41-wt41
86-
- python-version: 3.8
87-
tox_env: py38-dj41-wt42
88-
- python-version: 3.9
89-
tox_env: py39-dj32-wt215
90-
- python-version: 3.9
91-
tox_env: py39-dj32-wt216
92-
- python-version: 3.9
93-
tox_env: py39-dj32-wt30
94-
- python-version: 3.9
95-
tox_env: py39-dj32-wt40
96-
- python-version: 3.9
97-
tox_env: py39-dj32-wt41
98-
- python-version: 3.9
99-
tox_env: py39-dj40-wt216
100-
- python-version: 3.9
101-
tox_env: py39-dj40-wt30
102-
- python-version: 3.9
103-
tox_env: py39-dj40-wt40
104-
- python-version: 3.9
105-
tox_env: py39-dj40-wt41
106-
- python-version: 3.9
107-
tox_env: py39-dj41-wt40
108-
- python-version: 3.9
109-
tox_env: py39-dj41-wt41
110-
- python-version: 3.9
111-
tox_env: py39-dj41-wt42
112-
- python-version: "3.10"
113-
tox_env: py310-dj32-wt215
114-
- python-version: "3.10"
115-
tox_env: py310-dj32-wt216
116-
- python-version: "3.10"
117-
tox_env: py310-dj32-wt30
118-
- python-version: "3.10"
119-
tox_env: py310-dj32-wt40
120-
- python-version: "3.10"
121-
tox_env: py310-dj32-wt41
122-
- python-version: "3.10"
123-
tox_env: py310-dj40-wt216
124-
- python-version: "3.10"
125-
tox_env: py310-dj40-wt30
126-
- python-version: "3.10"
127-
tox_env: py310-dj40-wt40
128-
- python-version: "3.10"
129-
tox_env: py310-dj40-wt41
130-
- python-version: "3.10"
131-
tox_env: py310-dj41-wt40
132-
- python-version: "3.10"
133-
tox_env: py310-dj41-wt41
134-
- python-version: "3.10"
135-
tox_env: py310-dj41-wt42
31+
- python-version: "3.11"
32+
tox_env: py311-dj41-wt41
33+
- python-version: "3.11"
34+
tox_env: py311-dj41-wt50
35+
- python-version: "3.11"
36+
tox_env: py311-dj41-wt51
37+
- python-version: "3.11"
38+
tox_env: py311-dj41-wt52
39+
13640
steps:
13741
- uses: actions/checkout@v2
13842
- name: Set up Python ${{ matrix.python-version }}

‎CHANGELOG.rst‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,22 @@
11
*********
22
Changelog
33
*********
4+
5+
4.0.3
6+
-----
7+
* no BigAutoField in tests
8+
* add missing migrations; fail when migrations are incomplete
9+
10+
4.0.2
11+
-----
12+
* pass use_json_field to StreamField initializer
13+
14+
4.0.1
15+
-----
16+
* cleanup non-pep version hack
17+
* cleanup test matrix in workflow
18+
* only support wagtail>=4.1
19+
420
3.22
521
----
622
* Add Wagtail 4.2 support

‎pyproject.toml‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
[tool.black]
2+
line-length=99
3+
target-version=["py39"]
4+
exclude = '''
5+
/(
6+
\.git
7+
| \.tox
8+
| build
9+
| dist
10+
| migrations
11+
)/
12+
'''

‎setup.cfg‎

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,16 @@
1+
[bumpversion]
2+
current_version = 4.1.0
3+
commit = true
4+
tag = true
5+
tag_name = {new_version}
6+
7+
[bumpversion:file:wagtailstreamforms/__init__.py]
8+
19
[flake8]
2-
ignore=W503
3-
max-line-length=99
4-
max-complexity=10
5-
exclude=wagtailstreamforms/migrations/*.py
10+
ignore = W503
11+
max-line-length = 99
12+
max-complexity = 10
13+
exclude = wagtailstreamforms/migrations/*.py
614

715
[black]
816
line-length = 99

‎setup.py‎

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,8 @@
99

1010
tests_require = [
1111
"mock==4.0.2",
12+
"pytest-django==4.7.0",
13+
"pytest==7.3.2",
1214
# Linting
1315
"isort[pyproject]==4.3.21",
1416
"flake8==3.7.9",
@@ -18,9 +20,9 @@
1820

1921

2022
install_requires = [
21-
"wagtail>=2,<4.3",
23+
"wagtail>=4.1,<5.3",
2224
"Unidecode>=0.04.14,<2.0",
23-
"wagtail-generic-chooser>=0.5.0,<0.6",
25+
"wagtail-generic-chooser>=0.5.0,<0.7",
2426
]
2527

2628
documentation_extras = [
@@ -58,21 +60,17 @@
5860
"Intended Audience :: Developers",
5961
"License :: OSI Approved :: MIT License",
6062
"Operating System :: OS Independent",
61-
"Framework :: Wagtail",
62-
"Framework :: Wagtail :: 2",
6363
"Programming Language :: Python :: 3",
64-
"Programming Language :: Python :: 3.7",
6564
"Programming Language :: Python :: 3.8",
6665
"Programming Language :: Python :: 3.9",
6766
"Programming Language :: Python :: 3.10",
6867
"Framework :: Django",
69-
"Framework :: Django :: 2.2",
7068
"Framework :: Django :: 3.2",
7169
"Framework :: Django :: 4",
70+
"Framework :: Django :: 4.0",
7271
"Framework :: Django :: 4.1",
72+
"Framework :: Django :: 4.2",
7373
"Framework :: Wagtail",
74-
"Framework :: Wagtail :: 2",
75-
"Framework :: Wagtail :: 3",
7674
"Framework :: Wagtail :: 4",
7775
"Topic :: Internet :: WWW/HTTP :: Site Management",
7876
],

0 commit comments

Comments
 (0)