Match .travis.yml env list to tox envs

Conflicts:
	.travis.yml
This commit is contained in:
Thomas Kluyver 2015-07-15 16:03:14 -07:00 committed by Bruno Oliveira
parent 08432c3e97
commit 6719a818e7
1 changed files with 4 additions and 5 deletions

View File

@ -10,19 +10,18 @@ env:
- TESTENV=flakes
- TESTENV=py26
- TESTENV=py27
- TESTENV=py33
- TESTENV=py34
- TESTENV=py35
- TESTENV=pypy
- TESTENV=py27-pexpect
- TESTENV=py33-pexpect
- TESTENV=py34-pexpect
- TESTENV=py27-nobyte
- TESTENV=py33
- TESTENV=py27-xdist
- TESTENV=py33-xdist
- TESTENV=py27
- TESTENV=py34-xdist
- TESTENV=py27-trial
- TESTENV=py33
- TESTENV=py33-trial
- TESTENV=py34-trial
# inprocess tests by default were introduced in 2.8 only;
# this TESTENV should be enabled when merged back to master
#- TESTENV=py27-subprocess