Skip to content

Commit ccf191a

Browse files
Merge pull request #20 from nickmoreton/upgrade-wagtail-4
Upgrade wagtail 4
2 parents 785509e + 3c40ea9 commit ccf191a

File tree

5 files changed

+150
-201
lines changed

5 files changed

+150
-201
lines changed

.github/workflows/test.yml

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ on:
77
branches: [master]
88

99
# Current configuration:
10+
# - python 3.10, wagtail 4.0
1011
# - python 3.9, wagtail 3.0
1112
# - python 3.8, wagtail 2.16
1213
# - python 3.7, django 2.15
@@ -18,9 +19,11 @@ jobs:
1819
strategy:
1920
matrix:
2021
include:
22+
- python: "3.10"
23+
wagtail: wagtail>=4.0,<5.0
24+
latest: true
2125
- python: 3.9
2226
wagtail: wagtail>=3.0,<4.0
23-
latest: true
2427
- python: 3.8
2528
wagtail: wagtail>=2.16,<3.0
2629
- python: 3.7
@@ -42,4 +45,4 @@ jobs:
4245
- if: ${{ matrix.latest }}
4346
uses: codecov/codecov-action@v2
4447
with:
45-
name: Python 3.9
48+
name: Python 3.9

.pre-commit-config.yaml

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,14 +16,16 @@ repos:
1616
hooks:
1717
- id: flake8
1818
language_version: python3.8
19-
- repo: https://github.com/prettier/prettier
20-
rev: 2.0.5
19+
- repo: https://github.com/pre-commit/mirrors-prettier
20+
rev: v2.3.2
2121
hooks:
2222
- id: prettier
23+
types_or: [markdown, css, scss, javascript, ts, tsx, json, yaml, vue]
2324
- repo: https://github.com/awebdeveloper/pre-commit-stylelint
2425
rev: c4c991cd38b0218735858716b09924f8b20e3812
2526
hooks:
2627
- id: stylelint
28+
files: \.(scss|vue)$
2729
additional_dependencies:
28-
- stylelint@10.1.0
29-
- stylelint-config-torchbox@0.5.0
30+
- stylelint@13.13.1
31+
- stylelint-config-torchbox@1.1.0

0 commit comments

Comments
 (0)