File tree 2 files changed +11
-9
lines changed
2 files changed +11
-9
lines changed Original file line number Diff line number Diff line change @@ -12,8 +12,6 @@ matrix:
12
12
env : TOXENV=py36-dj20-postgres
13
13
- python : 3.6
14
14
env : TOXENV=py36-dj111-sqlite
15
- - python : 3.6
16
- env : TOXENV=py36-checkqa
17
15
18
16
- python : 3.5
19
17
env : TOXENV=py35-dj110-postgres
@@ -27,15 +25,16 @@ matrix:
27
25
env : TOXENV=py27-dj111-mysql_myisam
28
26
- python : 2.7
29
27
env : TOXENV=py27-dj18-postgres
30
- - python : 2.7
31
- env : TOXENV=py27-checkqa
32
28
33
29
# pypy/pypy3: not included with coverage reports (much slower then).
34
30
- python : pypy
35
31
env : TOXENV=pypy-dj111-sqlite_file
36
32
- python : pypy3
37
33
env : TOXENV=pypy3-dj110-sqlite
38
34
35
+ - python : 3.6
36
+ env : TOXENV=checkqa
37
+
39
38
allow_failures :
40
39
- env : TOXENV=py36-djmaster-postgres
41
40
@@ -58,7 +57,7 @@ install:
58
57
- pip install tox==2.9.1
59
58
- |
60
59
# 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
62
61
PYTEST_DJANGO_COVERAGE=1
63
62
export PYTEST_ADDOPTS='--cov=pytest_django --cov=tests --cov=pytest_django_test --cov-report=term-missing:skip-covered'
64
63
export _PYTESTDJANGO_TOX_EXTRA_DEPS=pytest-cov
Original file line number Diff line number Diff line change 14
14
pytest-xdist ==1.15
15
15
{env:_PYTESTDJANGO_TOX_EXTRA_DEPS:}
16
16
17
- checkqa: flake8
18
-
19
17
djmaster: https://github.com/django/django/archive/master.tar.gz
20
18
dj20: Django>=2.0a1,<2.1
21
19
dj111: Django>=1.11,<1.12
@@ -44,10 +42,15 @@ setenv =
44
42
passenv = PYTEST_ADDOPTS
45
43
usedevelop = True
46
44
commands =
47
- checkqa: flake8 --version
48
- checkqa: flake8 --show-source --statistics {posargs:pytest_django pytest_django_test}
49
45
pytest --strict {posargs:tests}
50
46
47
+ [testenv:checkqa]
48
+ deps =
49
+ flake8
50
+ commands =
51
+ flake8 --version
52
+ flake8 --show-source --statistics {posargs:pytest_django pytest_django_test}
53
+
51
54
[testenv:doc8]
52
55
basepython = python3.6
53
56
skip_install = true
You can’t perform that action at this time.
0 commit comments