Skip to content

Commit c2a0122

Browse files
committed
Simplify tox to test against last pytest
1 parent 3365ab1 commit c2a0122

File tree

1 file changed

+5
-24
lines changed

1 file changed

+5
-24
lines changed

tox.ini

Lines changed: 5 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
[tox]
22
envlist =
3-
py{36,35}-pytest{31,30,29,28,27}
4-
py{34,33,27,26}-pytest{31,30,29,28,27,26}
5-
pypy-pytest{31,30,29,28,27,26}
3+
py{27,34,35,36,37}
64

75

86
[pytest]
@@ -16,27 +14,19 @@ pep8maxlinelength = 119
1614
usedevelop = True
1715
deps =
1816
-rrequirements/main.txt
19-
-rrequirements/test.txt
20-
pytest26: pytest>=2.6,<2.7
21-
pytest27: pytest>=2.7,<2.8
22-
pytest28: pytest>=2.8,<2.9
23-
pytest29: pytest>=2.9,<3.0
24-
pytest30: pytest>=3.0,<3.1
25-
pytest31: pytest>=3.1,<3.2
26-
pytest26: pytest-xdist<1.16.0
27-
pytest{31,30,29,28,27}: pytest-xdist
17+
-rrequirements/test.txt
2818

2919
passenv = HOME LANG LC_ALL
3020

3121
commands =
32-
py.test -q --basetemp={envtmpdir} --confcutdir=.. -n 1 \
22+
pytest -q --basetemp={envtmpdir} --confcutdir=tests \
3323
--junitxml=tests/junit.xml \
3424
--cov-report xml --cov pytest_flask \
3525
--cov-report=html \
3626
--cov-report term-missing \
3727
--pep8 \
38-
-n 2 \
39-
{posargs}
28+
-ra \
29+
{posargs:tests}
4030

4131

4232
[testenv:docs]
@@ -48,12 +38,3 @@ commands =
4838

4939
whitelist_externals =
5040
/usr/bin/make
51-
52-
53-
[tox:travis]
54-
2.6 = py26-pytest{31,30,29,28,27,26}
55-
2.7 = py27-pytest{31,30,29,28,27,26}
56-
3.3 = py33-pytest{31,30,29,28,27,26}
57-
3.4 = py34-pytest{31,30,29,28,27,26}
58-
3.5 = py35-pytest{31,30,29,28,27}
59-
3.6 = py36-pytest{31,30,29,28,27}

0 commit comments

Comments
 (0)