Skip to content

Commit 26ea39d

Browse files
👷 Set up desired supported versions matrix in Tox
1 parent 666ecd6 commit 26ea39d

File tree

3 files changed

+35
-34
lines changed

3 files changed

+35
-34
lines changed

pytest.ini

Lines changed: 0 additions & 5 deletions
This file was deleted.

setup.cfg

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,9 @@ sections=FUTURE,STDLIB,DJANGO,THIRDPARTY,FIRSTPARTY,LOCALFOLDER
9292

9393
[tool:pytest]
9494
testpaths = tests
95-
DJANGO_SETTINGS_MODULE=testapp.settings
95+
; django_find_project = false
96+
DJANGO_SETTINGS_MODULE = testapp.settings_pg
97+
; python_paths = .
9698

9799
[pep8]
98100
[flake8]

tox.ini

Lines changed: 32 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -1,43 +1,47 @@
11
[tox]
2-
envlist = py27-django111,py{34,35,36}-django{111,20},isort,docs
2+
envlist =
3+
py{37,38,39,310}-django{22,32}
4+
isort
5+
black
6+
docs
37
skip_missing_interpreters = true
48

9+
[gh-actions:env]
10+
DJANGO =
11+
2.2: django22
12+
3.2: django32
13+
514
[testenv]
6-
changedir=tests
15+
setenv =
16+
DJANGO_SETTINGS_MODULE=testapp.settings
17+
PYTHONPATH={toxinidir}
18+
extras =
19+
tests
20+
coverage
721
deps =
8-
factory-boy
9-
psycopg2
10-
pytest
11-
pytest-cov
12-
pytest-django
13-
pytest-pep8
14-
pytest-pylint
15-
pytest-pythonpath
16-
pytest-runner
17-
py27: mock
18-
django111: Django>=1.11,<2
19-
django20: Django>=2.0,<3
20-
commands=
21-
py.test \
22-
--cov-report=xml \
23-
--cov=timeline_logger \
24-
--verbose \
25-
--junit-xml=junit.xml \
26-
--color=yes \
27-
{posargs}
22+
django22: Django~=2.2.0
23+
django32: Django~=3.2.0
24+
commands =
25+
py.test tests \
26+
--junitxml=reports/junit.xml \
27+
--cov --cov-report xml:reports/coverage-{envname}.xml \
28+
{posargs}
2829

2930
[testenv:isort]
30-
deps = isort
31+
extras = tests
32+
skipsdist = True
33+
commands = isort --check-only --diff .
34+
35+
[testenv:black]
36+
extras = tests
3137
skipsdist = True
32-
commands = isort --recursive --check-only --diff .
38+
commands = black --check timeline_logger docs testapp tests setup.py
3339

3440
[testenv:docs]
3541
basepython=python
3642
changedir=docs
37-
deps=
38-
sphinx
39-
sphinx_rtd_theme
40-
pytest
43+
skipsdist=true
44+
extras = docs
4145
commands=
4246
py.test check_sphinx.py -v \
4347
--junitxml=../reports/junit-{envname}.xml \

0 commit comments

Comments
 (0)