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 /Mac | |
| 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 'Mac')
| -rwxr-xr-x | Mac/BuildScript/scripts/postflight.ensurepip | 8 | ||||
| -rw-r--r-- | Mac/Makefile.in | 1 |
2 files changed, 4 insertions, 5 deletions
diff --git a/Mac/BuildScript/scripts/postflight.ensurepip b/Mac/BuildScript/scripts/postflight.ensurepip index 36d0594..ce3c6c1 100755 --- a/Mac/BuildScript/scripts/postflight.ensurepip +++ b/Mac/BuildScript/scripts/postflight.ensurepip @@ -56,19 +56,19 @@ if [ -d /usr/local/bin ] ; then cd /usr/local/bin - # Create pipx.y and easy_install-x.y links if /usr/local/bin/pythonx.y + # Create pipx.y links if /usr/local/bin/pythonx.y # is linked to this framework version install_links_if_our_fw "python${PYVER}" \ - "pip${PYVER}" "easy_install-${PYVER}" + "pip${PYVER}" # Create pipx link if /usr/local/bin/pythonx is linked to this version install_links_if_our_fw "python${PYMAJOR}" \ "pip${PYMAJOR}" - # Create pip and easy_install link if /usr/local/bin/python + # Create pip link if /usr/local/bin/python # is linked to this version install_links_if_our_fw "python" \ - "pip" "easy_install" + "pip" ) fi exit 0 diff --git a/Mac/Makefile.in b/Mac/Makefile.in index f969128..69ab419 100644 --- a/Mac/Makefile.in +++ b/Mac/Makefile.in @@ -166,7 +166,6 @@ altinstallunixtools: -if test "x$(ENSUREPIP)" != "xno" ; then \ cd "$(DESTDIR)$(FRAMEWORKUNIXTOOLSPREFIX)/bin" && \ for fn in \ - easy_install-$(VERSION) \ pip$(VERSION) \ ; \ do \ |