Skip to content

Commit f8c8768

Browse files
committed
add tox:travis section.
removed pytest<2.6 since it will conflict with the minimum version needed to run in tests.
1 parent 14d49df commit f8c8768

File tree

1 file changed

+11
-6
lines changed

1 file changed

+11
-6
lines changed

tox.ini

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

66

77
[pytest]
@@ -20,10 +20,6 @@ deps =
2020
pytest24: pytest>=2.4,<2.5
2121
pytest25: pytest>=2.5,<2.6
2222
pytest26: pytest>=2.6,<2.7
23-
pytest27: pytest>=2.7,<2.8
24-
pytest28: pytest>=2.8,<2.9
25-
pytest29: pytest>=2.9,<3.0
26-
pytest30: pytest>=3.0,<3.1
2723

2824
passenv = HOME LANG LC_ALL
2925

@@ -47,3 +43,12 @@ commands =
4743

4844
whitelist_externals =
4945
/usr/bin/make
46+
47+
48+
[tox:travis]
49+
2.6 = py26-pytest{30,29,28,27,26}
50+
2.7 = py27-pytest{30,29,28,27,26}
51+
3.3 = py33-pytest{30,29,28,27,26}
52+
3.4 = py34-pytest{30,29,28,27,26}
53+
3.5 = py35-pytest{30,29,28,27,26}
54+
3.6 = py36-pytest{30,29,28,27,26}

0 commit comments

Comments
 (0)