Merge branch 'maint/44.x'

pypa · Feb 15, 2020 · 43edec2 · 43edec2
2 parents c0154f4 + fd25f0c
commit 43edec2
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 0 deletions.
diff --git 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
@@ -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