Skip to content

Commit 444ba44

Browse files
committed
tox/Travis: use separate checkqa testenv
1 parent 67e7f38 commit 444ba44

File tree

2 files changed

+11
-9
lines changed

2 files changed

+11
-9
lines changed

.travis.yml

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,6 @@ matrix:
1212
env: TOXENV=py36-dj20-postgres
1313
- python: 3.6
1414
env: TOXENV=py36-dj111-sqlite
15-
- python: 3.6
16-
env: TOXENV=py36-checkqa
1715

1816
- python: 3.5
1917
env: TOXENV=py35-dj110-postgres
@@ -27,15 +25,16 @@ matrix:
2725
env: TOXENV=py27-dj111-mysql_myisam
2826
- python: 2.7
2927
env: TOXENV=py27-dj18-postgres
30-
- python: 2.7
31-
env: TOXENV=py27-checkqa
3228

3329
# pypy/pypy3: not included with coverage reports (much slower then).
3430
- python: pypy
3531
env: TOXENV=pypy-dj111-sqlite_file
3632
- python: pypy3
3733
env: TOXENV=pypy3-dj110-sqlite
3834

35+
- python: 3.6
36+
env: TOXENV=checkqa
37+
3938
allow_failures:
4039
- env: TOXENV=py36-djmaster-postgres
4140

@@ -58,7 +57,7 @@ install:
5857
- pip install tox==2.9.1
5958
- |
6059
# Setup coverage tracking, but not with "checkqa" nor "pypy*".
61-
if [[ "${TOXENV%-checkqa}" == "$TOXENV" ]] && [[ "${TOXENV#pypy}" == "$TOXENV" ]]; then
60+
if [[ "$TOXENV" != "checkqa" ]] && [[ "${TOXENV#pypy}" == "$TOXENV" ]]; then
6261
PYTEST_DJANGO_COVERAGE=1
6362
export PYTEST_ADDOPTS='--cov=pytest_django --cov=tests --cov=pytest_django_test --cov-report=term-missing:skip-covered'
6463
export _PYTESTDJANGO_TOX_EXTRA_DEPS=pytest-cov

tox.ini

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,6 @@ deps =
1414
pytest-xdist==1.15
1515
{env:_PYTESTDJANGO_TOX_EXTRA_DEPS:}
1616

17-
checkqa: flake8
18-
1917
djmaster: https://github.com/django/django/archive/master.tar.gz
2018
dj20: Django>=2.0a1,<2.1
2119
dj111: Django>=1.11,<1.12
@@ -44,10 +42,15 @@ setenv =
4442
passenv = PYTEST_ADDOPTS
4543
usedevelop = True
4644
commands =
47-
checkqa: flake8 --version
48-
checkqa: flake8 --show-source --statistics {posargs:pytest_django pytest_django_test}
4945
pytest --strict {posargs:tests}
5046

47+
[testenv:checkqa]
48+
deps =
49+
flake8
50+
commands =
51+
flake8 --version
52+
flake8 --show-source --statistics {posargs:pytest_django pytest_django_test}
53+
5154
[testenv:doc8]
5255
basepython = python3.6
5356
skip_install = true

0 commit comments

Comments
 (0)