Skip to content

Commit fd91bbe

Browse files
authored
Remove support for unsupported Python/Django combinations. (#48)
* Remove support for unsupported Python/Django combinations. * Run GitHub actions on pull requests. * Use Python3.9 for docs and linting. * Remove max_parallel setting for GitHub Actions to speed up test runs.
1 parent 88e58d8 commit fd91bbe

File tree

2 files changed

+17
-19
lines changed

2 files changed

+17
-19
lines changed

.github/workflows/python.yml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,14 @@
33

44
name: Python
55

6-
on: [push]
6+
on: [push, pull_request]
77

88
jobs:
99
build:
1010
runs-on: ubuntu-latest
1111
strategy:
12-
max-parallel: 4
1312
matrix:
14-
python-version: [3.5, 3.6, 3.7, 3.8, "pypy3"]
13+
python-version: [3.5, 3.6, 3.7, 3.8, 3.9, "pypy3"]
1514

1615
steps:
1716
- uses: actions/checkout@v2

tox.ini

Lines changed: 15 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,22 @@
11
[tox]
22
envlist =
3-
lint-py36,
4-
readme-py36,
5-
docs-py36,
6-
py35-django{111,20,21,22},
7-
py36-django{111,20,21,22,30},
8-
py37-django{111,20,21,22,30},
9-
py38-django{22,30},
10-
pypy3-django{111,20,21,22},
3+
lint-py39,
4+
readme-py39,
5+
docs-py39,
6+
py35-django{22},
7+
py36-django{22,31},
8+
py37-django{22,31},
9+
py38-django{22,31},
10+
py39-django{22,31},
11+
pypy3-django{22,31},
1112

1213
[gh-actions]
1314
python =
1415
3.5: py35
1516
3.6: py36
1617
3.7: py37
17-
3.8: py38, lint, restlint
18+
3.8: py38
19+
3.9: py39, lint, restlint
1820
pypy3: pypy3
1921

2022
[testenv]
@@ -24,28 +26,25 @@ setenv =
2426
PYTHONPATH = {toxinidir}
2527
deps =
2628
-rtests/requirements.txt
27-
django111: Django >=1.11, <2.0
28-
django20: Django>=2.0,<2.1
29-
django21: Django>=2.1,<2.2
3029
django22: Django>=2.2,<3
31-
django30: Django>=3.0
30+
django31: Django>=3.1,<3.2
3231
commands =
3332
pytest {posargs:tests}
3433

35-
[testenv:docs-py36]
34+
[testenv:docs-py39]
3635
deps =
3736
sphinx
3837
commands =
3938
docs: sphinx-build -b html -d {envtmpdir}/doctrees docs {envtmpdir}/html
4039

41-
[testenv:readme-py36]
40+
[testenv:readme-py39]
4241
deps =
4342
twine
4443
readme_renderer[md]
4544
commands =
4645
python setup.py sdist
4746
twine check dist/*
4847

49-
[testenv:lint-py36]
48+
[testenv:lint-py39]
5049
extras = dev
5150
commands=therapist run --use-tracked-files

0 commit comments

Comments
 (0)