Upgrade embeded setuptools (#1855)

pypa · Jun 12, 2020 · b3d53fc · fj-sanchez · Jun 12, 2020 · gaborbernat
1 parent f2bcb8d
commit b3d53fc
Show file tree

Hide file tree

Showing 7 changed files with 13 additions and 11 deletions.
diff --git a/docs/changelog/1846.bugfix.rst b/docs/changelog/1846.bugfix.rst
@@ -0,0 +1 @@
+Relax ``importlib.resources`` requirement to also allow version 2 - by :user:`asottile`.
diff --git a/docs/changelog/1855.bugfix.rst b/docs/changelog/1855.bugfix.rst
@@ -0,0 +1 @@
+Upgrade embedded setuptools to ``44.1.1`` for python 2 and ``47.1.1`` for python3.5+ - by :user:`gaborbernat`.
diff --git a/setup.cfg b/setup.cfg
@@ -61,7 +61,7 @@ virtualenv.activate =
  batch = virtualenv.activation.batch:BatchActivator
  fish = virtualenv.activation.fish:FishActivator
  powershell = virtualenv.activation.powershell:PowerShellActivator
- python = virtualenv.activation.python:PythonActivator
+ python = virtualenv.activation.python:PestythonActivator
  xonsh = virtualenv.activation.xonsh:XonshActivator
 virtualenv.create =
  venv = virtualenv.create.via_global_ref.venv:Venv
@@ -99,7 +99,7 @@ testing =
  pytest-randomly >= 1
  pytest-timeout >= 1
  flaky >= 3
- xonsh >= 0.9.16; python_version > '3.4'
+ xonsh >= 0.9.16; python_version > '3.4' and python_version != '3.9'
 
 [options.package_data]
 virtualenv.activation.bash = *.sh

diff --git a/src/virtualenv/seed/embed/wheels/__init__.py b/src/virtualenv/seed/embed/wheels/__init__.py
@@ -3,27 +3,27 @@
 BUNDLE_SUPPORT = {
  "3.9": {
  "pip": "pip-20.1.1-py2.py3-none-any.whl",
- "setuptools": "setuptools-46.4.0-py3-none-any.whl",
+ "setuptools": "setuptools-47.1.1-py3-none-any.whl",
  "wheel": "wheel-0.34.2-py2.py3-none-any.whl",
  },
  "3.8": {
  "pip": "pip-20.1.1-py2.py3-none-any.whl",
- "setuptools": "setuptools-46.4.0-py3-none-any.whl",
+ "setuptools": "setuptools-47.1.1-py3-none-any.whl",
  "wheel": "wheel-0.34.2-py2.py3-none-any.whl",
  },
  "3.7": {
  "pip": "pip-20.1.1-py2.py3-none-any.whl",
- "setuptools": "setuptools-46.4.0-py3-none-any.whl",
+ "setuptools": "setuptools-47.1.1-py3-none-any.whl",
  "wheel": "wheel-0.34.2-py2.py3-none-any.whl",
  },
  "3.6": {
  "pip": "pip-20.1.1-py2.py3-none-any.whl",
- "setuptools": "setuptools-46.4.0-py3-none-any.whl",
+ "setuptools": "setuptools-47.1.1-py3-none-any.whl",
  "wheel": "wheel-0.34.2-py2.py3-none-any.whl",
  },
  "3.5": {
  "pip": "pip-20.1.1-py2.py3-none-any.whl",
- "setuptools": "setuptools-46.4.0-py3-none-any.whl",
+ "setuptools": "setuptools-47.1.1-py3-none-any.whl",
  "wheel": "wheel-0.34.2-py2.py3-none-any.whl",
  },
  "3.4": {
@@ -33,7 +33,7 @@
  },
  "2.7": {
  "pip": "pip-20.1.1-py2.py3-none-any.whl",
- "setuptools": "setuptools-44.1.0-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",
  },
 }

diff --git a/...ls/setuptools-44.1.0-py2.py3-none-any.whl → ...ls/setuptools-44.1.1-py2.py3-none-any.whl b/...ls/setuptools-44.1.0-py2.py3-none-any.whl → ...ls/setuptools-44.1.1-py2.py3-none-any.whl
diff --git a/...wheels/setuptools-46.4.0-py3-none-any.whl → ...wheels/setuptools-47.1.1-py3-none-any.whl b/...wheels/setuptools-46.4.0-py3-none-any.whl → ...wheels/setuptools-47.1.1-py3-none-any.whl
diff --git a/tests/unit/activation/test_xonsh.py b/tests/unit/activation/test_xonsh.py
@@ -9,9 +9,9 @@
 
 
 @pytest.mark.slow
-@pytest.mark.skipif(sys.platform == "win32" and IS_PYPY and PY3, reason="xonsh on Windows blocks indefinitely")
-@pytest.mark.xfail(
- condition=sys.version_info[0:2] == (3, 9), strict=True, reason="https://bugs.python.org/issue40726",
+@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",
 )
 def test_xonsh(activation_tester_class, activation_tester):
  class Xonsh(activation_tester_class):