Merge branch 'revert_pip_workaround'

This commit is contained in:
Anthony Sottile
2016-02-07 14:51:41 -08:00
2 changed files with 1 additions and 7 deletions

View File

@@ -8,9 +8,7 @@ env: # These should match the tox env list
- TOXENV=pypy
- TOXENV=pypy3
- TOXENV=py27 LATEST_GIT=1
# latest virtualenv combined with downgrading setuptools = sadness
# https://github.com/pypa/pip/issues/3461
install: pip install coveralls tox 'virtualenv<14'
install: pip install coveralls tox
script: tox
# Special snowflake. Our tests depend on making real commits.
before_install:

View File

@@ -9,7 +9,3 @@ pytest
# setuptools breaks pypy3 with extraneous output
setuptools<18.5
# latest virtualenv combined with downgrading setuptools = sadness
# https://github.com/pypa/pip/issues/3461
virtualenv<14