From: Ben Darnell <ben@cockroachlabs.com>
Date: Fri, 19 Jun 2020 18:59:46 +0000 (-0400)
Subject: ci: Drop tox-venv
X-Git-Tag: v6.1.0b1~26^2~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c844e29eacd12dc1fc1b7b9b162e20653960b823;p=thirdparty%2Ftornado.git

ci: Drop tox-venv

Its README says it is mostly obsolete due to improvements in
virtualenv. Using it appears to cause problems related to
https://github.com/pypa/setuptools/issues/1934 because virtualenv
installs the wheel package by default but venv doesn't.
---

diff --git a/.travis.yml b/.travis.yml
index 474bc90e4..847c8cfe0 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -39,7 +39,7 @@ jobs:
       env: TOX_ENV=lint
 
 install:
-    - travis_retry pip install tox tox-venv
+    - travis_retry pip install tox
     - python -VV
     - curl-config --version; pip freeze
 
diff --git a/tox.ini b/tox.ini
index ca05722c3..ac794be4d 100644
--- a/tox.ini
+++ b/tox.ini
@@ -11,9 +11,6 @@
 # 'port install curl +universal' to get both 32- and 64-bit versions of
 # libcurl.
 [tox]
-# When tox is run from a venv (instead of a virtualenv), it can get confused
-# unless tox-venv is also installed.
-requires = tox-venv
 envlist =
         # Basic configurations: Run the tests for each python version.
         py35-full,py36-full,py37-full,py38-full,pypy3-full