Upgrade pip and setuptools (#1918) (#1925)

Signed-off-by: Bernat Gabor <bgabor8@bloomberg.net>

.pre-commit-config.yaml

@@ -25,7 +25,7 @@ repos:
   - id: seed-isort-config
     args: [--application-directories, '.:src']
 - repo: https://github.com/pre-commit/mirrors-isort
-  rev: v5.2.2
+  rev: v5.4.2
   hooks:
   - id: isort
 - repo: https://github.com/ambv/black
@@ -35,13 +35,13 @@ repos:
     args: [--safe]
     language_version: python3.8
 - repo: https://github.com/asottile/blacken-docs
-  rev: v1.7.0
+  rev: v1.8.0
   hooks:
   - id: blacken-docs
     additional_dependencies: [black==19.10b0]
     language_version: python3.8
 - repo: https://github.com/pre-commit/pygrep-hooks
-  rev: v1.5.1
+  rev: v1.6.0
   hooks:
   - id: rst-backticks
 - repo: https://github.com/asottile/setup-cfg-fmt

docs/changelog/1918.bugfix.rst

@@ -0,0 +1 @@
+Upgrade embedded pip to ``20.2.1``, setuptools to ``49.6.0`` and wheel to ``0.35.1``  - by :user:`gaborbernat`.

src/virtualenv/seed/wheels/embed/__init__.py

@@ -6,34 +6,34 @@ from virtualenv.util.path import Path
 BUNDLE_FOLDER = Path(__file__).absolute().parent
 BUNDLE_SUPPORT = {
     "3.10": {
-        "pip": "pip-20.2.1-py2.py3-none-any.whl",
-        "setuptools": "setuptools-49.2.1-py3-none-any.whl",
-        "wheel": "wheel-0.34.2-py2.py3-none-any.whl",
+        "pip": "pip-20.2.2-py2.py3-none-any.whl",
+        "setuptools": "setuptools-49.6.0-py3-none-any.whl",
+        "wheel": "wheel-0.35.1-py2.py3-none-any.whl",
     },
     "3.9": {
-        "pip": "pip-20.2.1-py2.py3-none-any.whl",
-        "setuptools": "setuptools-49.2.1-py3-none-any.whl",
-        "wheel": "wheel-0.34.2-py2.py3-none-any.whl",
+        "pip": "pip-20.2.2-py2.py3-none-any.whl",
+        "setuptools": "setuptools-49.6.0-py3-none-any.whl",
+        "wheel": "wheel-0.35.1-py2.py3-none-any.whl",
     },
     "3.8": {
-        "pip": "pip-20.2.1-py2.py3-none-any.whl",
-        "setuptools": "setuptools-49.2.1-py3-none-any.whl",
-        "wheel": "wheel-0.34.2-py2.py3-none-any.whl",
+        "pip": "pip-20.2.2-py2.py3-none-any.whl",
+        "setuptools": "setuptools-49.6.0-py3-none-any.whl",
+        "wheel": "wheel-0.35.1-py2.py3-none-any.whl",
     },
     "3.7": {
-        "pip": "pip-20.2.1-py2.py3-none-any.whl",
-        "setuptools": "setuptools-49.2.1-py3-none-any.whl",
-        "wheel": "wheel-0.34.2-py2.py3-none-any.whl",
+        "pip": "pip-20.2.2-py2.py3-none-any.whl",
+        "setuptools": "setuptools-49.6.0-py3-none-any.whl",
+        "wheel": "wheel-0.35.1-py2.py3-none-any.whl",
     },
     "3.6": {
-        "pip": "pip-20.2.1-py2.py3-none-any.whl",
-        "setuptools": "setuptools-49.2.1-py3-none-any.whl",
-        "wheel": "wheel-0.34.2-py2.py3-none-any.whl",
+        "pip": "pip-20.2.2-py2.py3-none-any.whl",
+        "setuptools": "setuptools-49.6.0-py3-none-any.whl",
+        "wheel": "wheel-0.35.1-py2.py3-none-any.whl",
     },
     "3.5": {
-        "pip": "pip-20.2.1-py2.py3-none-any.whl",
-        "setuptools": "setuptools-49.2.1-py3-none-any.whl",
-        "wheel": "wheel-0.34.2-py2.py3-none-any.whl",
+        "pip": "pip-20.2.2-py2.py3-none-any.whl",
+        "setuptools": "setuptools-49.6.0-py3-none-any.whl",
+        "wheel": "wheel-0.35.1-py2.py3-none-any.whl",
     },
     "3.4": {
         "pip": "pip-19.1.1-py2.py3-none-any.whl",
@@ -41,9 +41,9 @@ BUNDLE_SUPPORT = {
         "wheel": "wheel-0.33.6-py2.py3-none-any.whl",
     },
     "2.7": {
-        "pip": "pip-20.2.1-py2.py3-none-any.whl",
+        "pip": "pip-20.2.2-py2.py3-none-any.whl",
         "setuptools": "setuptools-44.1.1-py2.py3-none-any.whl",
-        "wheel": "wheel-0.34.2-py2.py3-none-any.whl",
+        "wheel": "wheel-0.35.1-py2.py3-none-any.whl",
     },
 }
 MAX = "3.10"

tests/unit/activation/test_xonsh.py

@@ -6,13 +6,12 @@ import pytest
 from flaky import flaky
 
 from virtualenv.activation import XonshActivator
-from virtualenv.info import IS_PYPY, PY3
 
 
 @pytest.mark.slow
 @pytest.mark.skipif(
-    (sys.platform == "win32" and IS_PYPY and PY3) or sys.version_info[0:2] == (3, 9),
-    reason="xonsh on Windows blocks indefinitely and is not stable yet on 3.9",
+    sys.platform == "win32" or sys.version_info[0:2] == (3, 9),
+    reason="xonsh on 3.9 or Windows is broken - https://github.com/xonsh/xonsh/issues/3689",
 )
 @flaky(max_runs=2, min_passes=1)
 def test_xonsh(activation_tester_class, activation_tester):