7973de8b00
and add a patch to adjust the upstream test suite to account for these dependencies, since without them, the virtualenv's would not install anything in their site-packages directory thus making pip unusable inside virtualenv's.
184 lines
6.8 KiB
Diff
184 lines
6.8 KiB
Diff
diff --git a/Lib/ensurepip/__init__.py b/Lib/ensurepip/__init__.py
|
|
index 9f5d151..4dfa8a1 100644
|
|
--- a/Lib/ensurepip/__init__.py
|
|
+++ b/Lib/ensurepip/__init__.py
|
|
@@ -8,13 +8,25 @@ import tempfile
|
|
__all__ = ["version", "bootstrap"]
|
|
|
|
|
|
-_SETUPTOOLS_VERSION = "28.8.0"
|
|
+_SETUPTOOLS_VERSION = "34.2.0"
|
|
|
|
_PIP_VERSION = "9.0.1"
|
|
|
|
+_SIX_VERSION = "1.10.0"
|
|
+
|
|
+_APPDIRS_VERSION = "1.4.0"
|
|
+
|
|
+_PACKAGING_VERSION = "16.8"
|
|
+
|
|
+_PYPARSING_VERSION = "2.1.10"
|
|
+
|
|
_PROJECTS = [
|
|
- ("setuptools", _SETUPTOOLS_VERSION),
|
|
- ("pip", _PIP_VERSION),
|
|
+ ("setuptools", _SETUPTOOLS_VERSION),
|
|
+ ("pip", _PIP_VERSION),
|
|
+ ("six", _SIX_VERSION),
|
|
+ ("appdirs", _APPDIRS_VERSION),
|
|
+ ("packaging", _PACKAGING_VERSION),
|
|
+ ("pyparsing", _PYPARSING_VERSION)
|
|
]
|
|
|
|
|
|
diff --git a/Lib/test/test_ensurepip.py b/Lib/test/test_ensurepip.py
|
|
index 9b04c18..23664c4 100644
|
|
--- a/Lib/test/test_ensurepip.py
|
|
+++ b/Lib/test/test_ensurepip.py
|
|
@@ -40,13 +40,14 @@ class TestBootstrap(EnsurepipMixin, unittest.TestCase):
|
|
self.run_pip.assert_called_once_with(
|
|
[
|
|
"install", "--no-index", "--find-links",
|
|
- unittest.mock.ANY, "setuptools", "pip",
|
|
+ unittest.mock.ANY,
|
|
+ "setuptools", "pip", "six", "appdirs", "packaging", "pyparsing",
|
|
],
|
|
unittest.mock.ANY,
|
|
)
|
|
|
|
additional_paths = self.run_pip.call_args[0][1]
|
|
- self.assertEqual(len(additional_paths), 2)
|
|
+ self.assertEqual(len(additional_paths), 6)
|
|
|
|
def test_bootstrapping_with_root(self):
|
|
ensurepip.bootstrap(root="/foo/bar/")
|
|
@@ -55,7 +56,7 @@ class TestBootstrap(EnsurepipMixin, unittest.TestCase):
|
|
[
|
|
"install", "--no-index", "--find-links",
|
|
unittest.mock.ANY, "--root", "/foo/bar/",
|
|
- "setuptools", "pip",
|
|
+ "setuptools", "pip", "six", "appdirs", "packaging", "pyparsing",
|
|
],
|
|
unittest.mock.ANY,
|
|
)
|
|
@@ -66,7 +67,8 @@ class TestBootstrap(EnsurepipMixin, unittest.TestCase):
|
|
self.run_pip.assert_called_once_with(
|
|
[
|
|
"install", "--no-index", "--find-links",
|
|
- unittest.mock.ANY, "--user", "setuptools", "pip",
|
|
+ unittest.mock.ANY, "--user",
|
|
+ "setuptools", "pip", "six", "appdirs", "packaging", "pyparsing",
|
|
],
|
|
unittest.mock.ANY,
|
|
)
|
|
@@ -77,7 +79,8 @@ class TestBootstrap(EnsurepipMixin, unittest.TestCase):
|
|
self.run_pip.assert_called_once_with(
|
|
[
|
|
"install", "--no-index", "--find-links",
|
|
- unittest.mock.ANY, "--upgrade", "setuptools", "pip",
|
|
+ unittest.mock.ANY, "--upgrade",
|
|
+ "setuptools", "pip", "six", "appdirs", "packaging", "pyparsing",
|
|
],
|
|
unittest.mock.ANY,
|
|
)
|
|
@@ -88,7 +91,8 @@ class TestBootstrap(EnsurepipMixin, unittest.TestCase):
|
|
self.run_pip.assert_called_once_with(
|
|
[
|
|
"install", "--no-index", "--find-links",
|
|
- unittest.mock.ANY, "-v", "setuptools", "pip",
|
|
+ unittest.mock.ANY, "-v",
|
|
+ "setuptools", "pip", "six", "appdirs", "packaging", "pyparsing",
|
|
],
|
|
unittest.mock.ANY,
|
|
)
|
|
@@ -99,7 +103,8 @@ class TestBootstrap(EnsurepipMixin, unittest.TestCase):
|
|
self.run_pip.assert_called_once_with(
|
|
[
|
|
"install", "--no-index", "--find-links",
|
|
- unittest.mock.ANY, "-vv", "setuptools", "pip",
|
|
+ unittest.mock.ANY, "-vv",
|
|
+ "setuptools", "pip", "six", "appdirs", "packaging", "pyparsing",
|
|
],
|
|
unittest.mock.ANY,
|
|
)
|
|
@@ -110,7 +115,8 @@ class TestBootstrap(EnsurepipMixin, unittest.TestCase):
|
|
self.run_pip.assert_called_once_with(
|
|
[
|
|
"install", "--no-index", "--find-links",
|
|
- unittest.mock.ANY, "-vvv", "setuptools", "pip",
|
|
+ unittest.mock.ANY, "-vvv",
|
|
+ "setuptools", "pip", "six", "appdirs", "packaging", "pyparsing",
|
|
],
|
|
unittest.mock.ANY,
|
|
)
|
|
@@ -186,8 +192,8 @@ class TestUninstall(EnsurepipMixin, unittest.TestCase):
|
|
|
|
self.run_pip.assert_called_once_with(
|
|
[
|
|
- "uninstall", "-y", "--disable-pip-version-check", "pip",
|
|
- "setuptools",
|
|
+ "uninstall", "-y", "--disable-pip-version-check",
|
|
+ "pyparsing", "packaging", "appdirs", "six", "pip", "setuptools",
|
|
]
|
|
)
|
|
|
|
@@ -197,8 +203,8 @@ class TestUninstall(EnsurepipMixin, unittest.TestCase):
|
|
|
|
self.run_pip.assert_called_once_with(
|
|
[
|
|
- "uninstall", "-y", "--disable-pip-version-check", "-v", "pip",
|
|
- "setuptools",
|
|
+ "uninstall", "-y", "--disable-pip-version-check", "-v",
|
|
+ "pyparsing", "packaging", "appdirs", "six", "pip", "setuptools",
|
|
]
|
|
)
|
|
|
|
@@ -208,8 +214,8 @@ class TestUninstall(EnsurepipMixin, unittest.TestCase):
|
|
|
|
self.run_pip.assert_called_once_with(
|
|
[
|
|
- "uninstall", "-y", "--disable-pip-version-check", "-vv", "pip",
|
|
- "setuptools",
|
|
+ "uninstall", "-y", "--disable-pip-version-check", "-vv",
|
|
+ "pyparsing", "packaging", "appdirs", "six", "pip", "setuptools",
|
|
]
|
|
)
|
|
|
|
@@ -220,7 +226,7 @@ class TestUninstall(EnsurepipMixin, unittest.TestCase):
|
|
self.run_pip.assert_called_once_with(
|
|
[
|
|
"uninstall", "-y", "--disable-pip-version-check", "-vvv",
|
|
- "pip", "setuptools",
|
|
+ "pyparsing", "packaging", "appdirs", "six", "pip", "setuptools",
|
|
]
|
|
)
|
|
|
|
@@ -260,13 +266,14 @@ class TestBootstrappingMainFunction(EnsurepipMixin, unittest.TestCase):
|
|
self.run_pip.assert_called_once_with(
|
|
[
|
|
"install", "--no-index", "--find-links",
|
|
- unittest.mock.ANY, "setuptools", "pip",
|
|
+ unittest.mock.ANY,
|
|
+ "setuptools", "pip", "six", "appdirs", "packaging", "pyparsing",
|
|
],
|
|
unittest.mock.ANY,
|
|
)
|
|
|
|
additional_paths = self.run_pip.call_args[0][1]
|
|
- self.assertEqual(len(additional_paths), 2)
|
|
+ self.assertEqual(len(additional_paths), 6)
|
|
|
|
class TestUninstallationMainFunction(EnsurepipMixin, unittest.TestCase):
|
|
|
|
@@ -284,8 +291,8 @@ class TestUninstallationMainFunction(EnsurepipMixin, unittest.TestCase):
|
|
|
|
self.run_pip.assert_called_once_with(
|
|
[
|
|
- "uninstall", "-y", "--disable-pip-version-check", "pip",
|
|
- "setuptools",
|
|
+ "uninstall", "-y", "--disable-pip-version-check", "pyparsing", "packaging",
|
|
+ "appdirs", "six", "pip", "setuptools",
|
|
]
|
|
)
|
|
|