diff --git a/.travis.yml b/.travis.yml index b98f2a78..057829d3 100644 --- a/.travis.yml +++ b/.travis.yml @@ -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: diff --git a/requirements-dev.txt b/requirements-dev.txt index 066be771..c44b676a 100644 --- a/requirements-dev.txt +++ b/requirements-dev.txt @@ -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