aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJason R. Coombs <jaraco@jaraco.com>2020-02-15 14:12:46 -0500
committerJason R. Coombs <jaraco@jaraco.com>2020-02-15 14:12:46 -0500
commit43edec2506f901ab939390951383025682448edd (patch)
tree705490b7aaa27231969ebc5f656614bca1b0d477
parentc0154f47121ca107095eb52ca1462c23b7457045 (diff)
parentfd25f0cdaa63f20effefc96f195b0e909fac8c75 (diff)
downloadexternal_python_setuptools-43edec2506f901ab939390951383025682448edd.tar.gz
external_python_setuptools-43edec2506f901ab939390951383025682448edd.tar.bz2
external_python_setuptools-43edec2506f901ab939390951383025682448edd.zip
Merge branch 'maint/44.x'
-rw-r--r--.travis.yml3
-rw-r--r--tox.ini2
2 files changed, 5 insertions, 0 deletions
diff --git a/.travis.yml b/.travis.yml
index fe875ab6..38a66f32 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -26,6 +26,9 @@ jobs:
if: tag IS present
script: tox -e release
after_success: skip
+ allow_failures:
+ # suppress failures due to pypa/setuptools#2000
+ - python: pypy3
cache: pip
diff --git a/tox.ini b/tox.ini
index 2164599f..959d7dad 100644
--- a/tox.ini
+++ b/tox.ini
@@ -7,6 +7,8 @@ envlist=python
minversion = 3.2
requires =
tox-pip-version >= 0.0.6
+ # workaround for #1998
+ virtualenv < 20
[helpers]
# Custom pip behavior