p53209761
/
test_ok2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/pytest-2.7' 

Conflicts:
	.travis.yml
This commit is contained in:
Bruno Oliveira 2015-07-24 20:02:12 -03:00
parent 033def0a7a 92c61b0de3
commit ae28e4ba0f
1 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
.travis.yml
View File

@ -1,7 +1,7 @@
sudo: false sudo: false
language: python language: python
python: python:
- 'nightly' - '3.5.0b3'
# command to install dependencies # command to install dependencies
install: "pip install -U tox" install: "pip install -U tox"
# # command to run tests # # command to run tests
@ -27,10 +27,7 @@ env:
- TESTENV=py34-xdist - TESTENV=py34-xdist
- TESTENV=py35 - TESTENV=py35
- TESTENV=pypy - TESTENV=pypy
matrix:
allow_failures:
# py35 is currently broken on travis, see #744
- env: TESTENV=py35
script: tox --recreate -i ALL=https://devpi.net/hpk/dev/ -e $TESTENV script: tox --recreate -i ALL=https://devpi.net/hpk/dev/ -e $TESTENV
notifications: notifications: