diff --git a/Lib/ensurepip/__init__.py b/Lib/ensurepip/__init__.py index 9f5d15109a3c43..8324279d5f4f3b 100644 --- a/Lib/ensurepip/__init__.py +++ b/Lib/ensurepip/__init__.py @@ -8,13 +8,25 @@ __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/ensurepip/_bundled/appdirs-1.4.0-py2.py3-none-any.whl b/Lib/ensurepip/_bundled/appdirs-1.4.0-py2.py3-none-any.whl new file mode 100644 index 00000000000000..31d7f08dab23c5 Binary files /dev/null and b/Lib/ensurepip/_bundled/appdirs-1.4.0-py2.py3-none-any.whl differ diff --git a/Lib/ensurepip/_bundled/packaging-16.8-py2.py3-none-any.whl b/Lib/ensurepip/_bundled/packaging-16.8-py2.py3-none-any.whl new file mode 100644 index 00000000000000..5c9cc7af1a7846 Binary files /dev/null and b/Lib/ensurepip/_bundled/packaging-16.8-py2.py3-none-any.whl differ diff --git a/Lib/ensurepip/_bundled/pyparsing-2.1.10-py2.py3-none-any.whl b/Lib/ensurepip/_bundled/pyparsing-2.1.10-py2.py3-none-any.whl new file mode 100644 index 00000000000000..63dc5ff38650bc Binary files /dev/null and b/Lib/ensurepip/_bundled/pyparsing-2.1.10-py2.py3-none-any.whl differ diff --git a/Lib/ensurepip/_bundled/setuptools-28.8.0-py2.py3-none-any.whl b/Lib/ensurepip/_bundled/setuptools-34.2.0-py2.py3-none-any.whl similarity index 50% rename from Lib/ensurepip/_bundled/setuptools-28.8.0-py2.py3-none-any.whl rename to Lib/ensurepip/_bundled/setuptools-34.2.0-py2.py3-none-any.whl index 502e3cb418c154..6d86547d5cc785 100644 Binary files a/Lib/ensurepip/_bundled/setuptools-28.8.0-py2.py3-none-any.whl and b/Lib/ensurepip/_bundled/setuptools-34.2.0-py2.py3-none-any.whl differ diff --git a/Lib/ensurepip/_bundled/six-1.10.0-py2.py3-none-any.whl b/Lib/ensurepip/_bundled/six-1.10.0-py2.py3-none-any.whl new file mode 100644 index 00000000000000..08872619dfb674 Binary files /dev/null and b/Lib/ensurepip/_bundled/six-1.10.0-py2.py3-none-any.whl differ diff --git a/Lib/test/test_ensurepip.py b/Lib/test/test_ensurepip.py index 9b04c18b0e2968..23664c4495f867 100644 --- a/Lib/test/test_ensurepip.py +++ b/Lib/test/test_ensurepip.py @@ -40,13 +40,14 @@ def test_basic_bootstrapping(self): 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 @@ def test_bootstrapping_with_root(self): [ "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 @@ def test_bootstrapping_with_user(self): 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 @@ def test_bootstrapping_with_upgrade(self): 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 @@ def test_bootstrapping_with_verbosity_1(self): 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 @@ def test_bootstrapping_with_verbosity_2(self): 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 @@ def test_bootstrapping_with_verbosity_3(self): 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 @@ def test_uninstall(self): 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 @@ def test_uninstall_with_verbosity_1(self): 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 @@ def test_uninstall_with_verbosity_2(self): 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 @@ def test_uninstall_with_verbosity_3(self): 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 @@ def test_basic_bootstrapping(self): 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 @@ def test_basic_uninstall(self): 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", ] )