diff options
author | Pradyun Gedam <pradyunsg@gmail.com> | 2023-04-18 04:43:34 (GMT) |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-04-18 04:43:34 (GMT) |
commit | ece20dba120a1a4745721c49f8d7389d4b1ee2a7 (patch) | |
tree | bcf21108159d242e4067f4ef9a1304d7f10a7f8a /Lib/ensurepip | |
parent | f39e00f9521a0d412a5fc9a50f2a553ec2bb1a7c (diff) | |
download | cpython-ece20dba120a1a4745721c49f8d7389d4b1ee2a7.zip cpython-ece20dba120a1a4745721c49f8d7389d4b1ee2a7.tar.gz cpython-ece20dba120a1a4745721c49f8d7389d4b1ee2a7.tar.bz2 |
gh-95299: Stop installing setuptools as a part of ensurepip and venv (#101039)
Remove the bundled setuptools wheel from ensurepip, and stop installing setuptools in environments created by venv.
Co-Authored-by: Hugo van Kemenade <hugovk@users.noreply.github.com>
Co-authored-by: C.A.M. Gerlach <CAM.Gerlach@Gerlach.CAM>
Co-authored-by: Oleg Iarygin <oleg@arhadthedev.net>
Diffstat (limited to 'Lib/ensurepip')
-rw-r--r-- | Lib/ensurepip/__init__.py | 16 | ||||
-rw-r--r-- | Lib/ensurepip/_bundled/setuptools-65.5.0-py3-none-any.whl | bin | 1232695 -> 0 bytes |
2 files changed, 7 insertions, 9 deletions
diff --git a/Lib/ensurepip/__init__.py b/Lib/ensurepip/__init__.py index 00e7774..69b23de 100644 --- a/Lib/ensurepip/__init__.py +++ b/Lib/ensurepip/__init__.py @@ -9,11 +9,9 @@ from importlib import resources __all__ = ["version", "bootstrap"] -_PACKAGE_NAMES = ('setuptools', 'pip') -_SETUPTOOLS_VERSION = "65.5.0" +_PACKAGE_NAMES = ('pip',) _PIP_VERSION = "23.0.1" _PROJECTS = [ - ("setuptools", _SETUPTOOLS_VERSION, "py3"), ("pip", _PIP_VERSION, "py3"), ] @@ -153,17 +151,17 @@ def _bootstrap(*, root=None, upgrade=False, user=False, _disable_pip_configuration_settings() - # By default, installing pip and setuptools installs all of the + # By default, installing pip installs all of the # following scripts (X.Y == running Python version): # - # pip, pipX, pipX.Y, easy_install, easy_install-X.Y + # pip, pipX, pipX.Y # # pip 1.5+ allows ensurepip to request that some of those be left out if altinstall: - # omit pip, pipX and easy_install + # omit pip, pipX os.environ["ENSUREPIP_OPTIONS"] = "altinstall" elif not default_pip: - # omit pip and easy_install + # omit pip os.environ["ENSUREPIP_OPTIONS"] = "install" with tempfile.TemporaryDirectory() as tmpdir: @@ -271,14 +269,14 @@ def _main(argv=None): action="store_true", default=False, help=("Make an alternate install, installing only the X.Y versioned " - "scripts (Default: pipX, pipX.Y, easy_install-X.Y)."), + "scripts (Default: pipX, pipX.Y)."), ) parser.add_argument( "--default-pip", action="store_true", default=False, help=("Make a default pip install, installing the unqualified pip " - "and easy_install in addition to the versioned scripts."), + "in addition to the versioned scripts."), ) args = parser.parse_args(argv) diff --git a/Lib/ensurepip/_bundled/setuptools-65.5.0-py3-none-any.whl b/Lib/ensurepip/_bundled/setuptools-65.5.0-py3-none-any.whl Binary files differdeleted file mode 100644 index 123a13e..0000000 --- a/Lib/ensurepip/_bundled/setuptools-65.5.0-py3-none-any.whl +++ /dev/null |