Skip to content

Commit 05436d5

Browse files
committed
Merge branch 'udpate-supported-versions'
2 parents 57566c2 + f47a518 commit 05436d5

File tree

4 files changed

+470
-490
lines changed

4 files changed

+470
-490
lines changed

.github/workflows/check.yml

Lines changed: 12 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -6,27 +6,19 @@ on:
66
jobs:
77
test:
88
name: Test
9-
runs-on: ubuntu-20.04
9+
runs-on: ubuntu-latest
1010

1111
strategy:
1212
matrix:
13-
python-version: ["3.6", "3.7", "3.8", "3.9"]
14-
django-version: ["2.2", "3.0", "3.1", "3.2", "4.0"]
15-
exclude:
16-
# Python 3.6 is not supported beyond Django 3.2
17-
- python-version: "3.6"
18-
django-version: "4.0"
19-
# Python 3.7 is not supported beyond Django 3.2
20-
- python-version: "3.7"
21-
django-version: "4.0"
13+
python-version: ["3.8", "3.9", "3.10", "3.11"]
14+
django-version: ["3.2", "4.0", "4.1"]
2215

2316
steps:
2417
- name: Checkout
2518
uses: actions/checkout@v3
2619

2720
- name: Set up Poetry
28-
# Need to use version < 1.2.0 in order to support Python 3.6
29-
run: pipx install poetry==1.1.15
21+
run: pipx install poetry==1.3.2
3022

3123
- name: Set up Python ${{ matrix.python-version }}
3224
uses: actions/setup-python@v4
@@ -44,24 +36,19 @@ jobs:
4436

4537
lint:
4638
name: Lint
47-
runs-on: ubuntu-20.04
39+
runs-on: ubuntu-latest
4840

4941
strategy:
5042
matrix:
51-
python-version: ["3.6", "3.9"]
52-
django-version: ["2.2", "4.0"]
53-
exclude:
54-
# Python 3.6 is not supported beyond Django 3.2
55-
- python-version: "3.6"
56-
django-version: "4.0"
43+
python-version: ["3.8", "3.11"]
44+
django-version: ["3.2", "4.1"]
5745

5846
steps:
5947
- name: Checkout
6048
uses: actions/checkout@v3
6149

6250
- name: Set up Poetry
63-
# Need to use version < 1.2.0 in order to support Python 3.6
64-
run: pipx install poetry==1.1.15
51+
run: pipx install poetry==1.3.2
6552

6653
- name: Set up Python ${{ matrix.python-version }}
6754
uses: actions/setup-python@v4
@@ -79,24 +66,19 @@ jobs:
7966

8067
type-check:
8168
name: Type Check
82-
runs-on: ubuntu-20.04
69+
runs-on: ubuntu-latest
8370

8471
strategy:
8572
matrix:
86-
python-version: ["3.6", "3.9"]
87-
django-version: ["2.2", "4.0"]
88-
exclude:
89-
# Python 3.6 is not supported beyond Django 3.2
90-
- python-version: "3.6"
91-
django-version: "4.0"
73+
python-version: ["3.8", "3.11"]
74+
django-version: ["3.2", "4.1"]
9275

9376
steps:
9477
- name: Checkout
9578
uses: actions/checkout@v3
9679

9780
- name: Set up Poetry
98-
# Need to use version < 1.2.0 in order to support Python 3.6
99-
run: pipx install poetry==1.1.15
81+
run: pipx install poetry==1.3.2
10082

10183
- name: Set up Python ${{ matrix.python-version }}
10284
uses: actions/setup-python@v4

.github/workflows/publish.yml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,13 +18,12 @@ jobs:
1818
- uses: actions/checkout@v1
1919

2020
- name: Set up Poetry
21-
# Need to use version < 1.2.0 in order to support Python 3.6
22-
run: pipx install poetry==1.1.15
21+
run: pipx install poetry==1.3.2
2322

2423
- name: Set up Python
2524
uses: actions/setup-python@v4
2625
with:
27-
python-version: '3.7'
26+
python-version: '3.9'
2827
cache: poetry
2928

3029
- name: Build

0 commit comments

Comments
 (0)