From d8d401e1a3b4d5af2f109ccd7881ab292032d3de Mon Sep 17 00:00:00 2001 From: Anthony Sottile Date: Sun, 7 Feb 2016 14:08:17 -0800 Subject: [PATCH] Revert "Merge pull request #342 from pre-commit/latest_virtualenv_breaks_tests" This reverts commit 894862462d260bc5b606e125db9d0e0510d02c3e, reversing changes made to b1e6063e12242f68392eebc4c08427f2319719e7. --- .travis.yml | 4 +--- requirements-dev.txt | 4 ---- 2 files changed, 1 insertion(+), 7 deletions(-) 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