Skip to content

Commit 755fe46

Browse files
chore: Post Django32 Cleanup
1 parent ea294dc commit 755fe46

File tree

2 files changed

+40
-43
lines changed

2 files changed

+40
-43
lines changed

.github/workflows/ci.yml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,7 @@ jobs:
1616
matrix:
1717
os: [ubuntu-20.04]
1818
python-version: ['3.8']
19-
toxenv: [django22-drflatest, quality, docs, django30-drflatest,
20-
django31-drflatest, django32-drflatest]
19+
toxenv: [quality, docs, django32, django40]
2120
steps:
2221
- uses: actions/checkout@v1
2322
- name: setup python
@@ -37,7 +36,7 @@ jobs:
3736
run: tox
3837

3938
- name: Run Coverage
40-
if: matrix.python-version == '3.8' && matrix.toxenv=='django22-drflatest'
39+
if: matrix.python-version == '3.8' && matrix.toxenv=='django32-drflatest'
4140
uses: codecov/codecov-action@v1
4241
with:
4342
flags: unittests

tox.ini

Lines changed: 38 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
[tox]
2-
envlist = py38-django{22,30,31,32}-drf{latest},quality,docs
2+
envlist = py38-django{32,40}-drf{latest},quality,docs
33

44
[pycodestyle]
55
exclude = .git,.tox,migrations
@@ -14,47 +14,45 @@ addopts = --cov config_models --cov-report term-missing
1414
norecursedirs = .* docs requirements
1515

1616
[testenv]
17-
setenv =
18-
PYTHONPATH = {toxinidir}/mock_apps
19-
DJANGO_SETTINGS_MODULE = test_settings
20-
deps =
21-
django22: Django>=2.2,<2.3
22-
django30: Django>=3.0,<3.1
23-
django31: Django>=3.1,<3.2
24-
django32: Django>=3.2,<3.3
25-
drflatest: djangorestframework
26-
-r{toxinidir}/requirements/test.txt
27-
commands =
28-
python -Wd -m pytest {posargs}
17+
setenv =
18+
PYTHONPATH = {toxinidir}/mock_apps
19+
DJANGO_SETTINGS_MODULE = test_settings
20+
deps =
21+
django32: Django>=3.2,<4.0
22+
django40: Django>=4.0,<4.1
23+
drflatest: djangorestframework
24+
-r{toxinidir}/requirements/test.txt
25+
commands =
26+
python -Wd -m pytest {posargs}
2927

3028
[testenv:docs]
31-
setenv =
32-
DJANGO_SETTINGS_MODULE = test_settings
33-
PYTHONPATH = {toxinidir}/:{toxinidir}/mock_apps
34-
whitelist_externals =
35-
make
36-
rm
37-
deps =
38-
-r{toxinidir}/requirements/doc.txt
39-
commands =
40-
rm -f docs/config_models.rst
41-
rm -f docs/modules.rst
42-
sphinx-apidoc -o docs/ config_models
43-
make -C docs clean
44-
make -C docs html
45-
python setup.py bdist_wheel
46-
twine check dist/*
29+
setenv =
30+
DJANGO_SETTINGS_MODULE = test_settings
31+
PYTHONPATH = {toxinidir}/:{toxinidir}/mock_apps
32+
whitelist_externals =
33+
make
34+
rm
35+
deps =
36+
-r{toxinidir}/requirements/doc.txt
37+
commands =
38+
rm -f docs/config_models.rst
39+
rm -f docs/modules.rst
40+
sphinx-apidoc -o docs/ config_models
41+
make -C docs clean
42+
make -C docs html
43+
python setup.py bdist_wheel
44+
twine check dist/*
4745

4846
[testenv:quality]
49-
whitelist_externals =
50-
make
51-
rm
52-
touch
53-
deps =
54-
-r{toxinidir}/requirements/quality.txt
55-
commands =
56-
pylint config_models
57-
pylint tests
58-
pycodestyle config_models tests
59-
make help
47+
whitelist_externals =
48+
make
49+
rm
50+
touch
51+
deps =
52+
-r{toxinidir}/requirements/quality.txt
53+
commands =
54+
pylint config_models
55+
pylint tests
56+
pycodestyle config_models tests
57+
make help
6058

0 commit comments

Comments
 (0)