bpo-46986: Upgrade bundled setuptools to 60.9.3 #31820

pradyunsg · 2022-03-11T13:55:00Z

https://bugs.python.org/issue46986

pradyunsg · 2022-03-11T13:55:19Z

x-ref #31819, which is closely related.

pradyunsg · 2022-03-11T13:56:49Z

If someone wants to validate the file I've added here, you can download it directly from GitHub ¹ and verify that the hash matches what's on PyPI. Or... You can trust that I'm not trying to inject malicious code into CPython. :)

https://github.com/python/cpython/raw/08348748df285e31172496c65cc0191896c6630c/Lib/ensurepip/_bundled/setuptools-60.9.3-py3-none-any.whl ↩

pradyunsg · 2022-03-12T08:53:13Z

IIUC, we should probably backport this all the way down to 3.9.

pradyunsg · 2022-03-13T08:16:12Z

@JelleZijlstra Could you label this one as well?

miss-islington · 2022-03-13T18:49:31Z

Thanks @pradyunsg for the PR, and @ned-deily for merging it 🌮🎉.. I'm working now to backport this PR to: 3.7, 3.8, 3.9, 3.10.
🐍🍒⛏🤖

miss-islington · 2022-03-13T18:49:34Z

Sorry, @pradyunsg and @ned-deily, I could not cleanly backport this to 3.10 due to a conflict.
Please backport using cherry_picker on command line.
cherry_picker c99ac3c364ee21be72263791b71ee8b55f64de08 3.10

miss-islington · 2022-03-13T18:49:35Z

Sorry @pradyunsg and @ned-deily, I had trouble checking out the 3.9 backport branch.
Please backport using cherry_picker on command line.
cherry_picker c99ac3c364ee21be72263791b71ee8b55f64de08 3.9

miss-islington · 2022-03-13T18:49:38Z

Sorry, @pradyunsg and @ned-deily, I could not cleanly backport this to 3.8 due to a conflict.
Please backport using cherry_picker on command line.
cherry_picker c99ac3c364ee21be72263791b71ee8b55f64de08 3.8

miss-islington · 2022-03-13T18:49:40Z

Sorry @pradyunsg and @ned-deily, I had trouble checking out the 3.7 backport branch.
Please backport using cherry_picker on command line.
cherry_picker c99ac3c364ee21be72263791b71ee8b55f64de08 3.7

miss-islington · 2022-03-13T18:53:50Z

Thanks @pradyunsg for the PR, and @ned-deily for merging it 🌮🎉.. I'm working now to backport this PR to: 3.10.
🐍🍒⛏🤖

bedevere-bot · 2022-03-13T18:54:01Z

GH-31853 is a backport of this pull request to the 3.10 branch.

(cherry picked from commit c99ac3c) Co-authored-by: Pradyun Gedam <pgedam@bloomberg.net>

miss-islington · 2022-03-13T18:56:29Z

Thanks @pradyunsg for the PR, and @ned-deily for merging it 🌮🎉.. I'm working now to backport this PR to: 3.9.
🐍🍒⛏🤖

miss-islington · 2022-03-13T18:56:32Z

Sorry, @pradyunsg and @ned-deily, I could not cleanly backport this to 3.9 due to a conflict.
Please backport using cherry_picker on command line.
cherry_picker c99ac3c364ee21be72263791b71ee8b55f64de08 3.9

(cherry picked from commit c99ac3c)

bedevere-bot · 2022-03-13T19:06:46Z

GH-31855 is a backport of this pull request to the 3.9 branch.

(cherry picked from commit c99ac3c) Co-authored-by: Pradyun Gedam <pgedam@bloomberg.net>

(cherry picked from commit c99ac3c)

(cherry picked from commit c99ac3c) Co-authored-by: Pradyun Gedam <pgedam@bloomberg.net>

bedevere-bot · 2022-03-13T20:35:52Z

GH-31860 is a backport of this pull request to the 3.8 branch.

(cherry picked from commit c99ac3c)

bedevere-bot · 2022-03-13T20:52:17Z

GH-31861 is a backport of this pull request to the 3.7 branch.

(cherry picked from commit c99ac3c) Co-authored-by: Pradyun Gedam <pgedam@bloomberg.net>

pradyunsg · 2022-03-14T07:27:52Z

Thanks @ned-deily for the merge, and for handling the backport merge conflicts! ^>^

…)" This reverts commit c99ac3c as it breaks test_bdb and test_distutils with installed Pythons.

…H-31879) This reverts commit c99ac3c as it breaks test_bdb and test_distutils with installed Pythons.

…)" This reverts commit 25962e4 as it breaks test_bdb and test_distutils with installed Pythons.

…) (pythonGH-31855)" This reverts commit bda64b3 as it breaks test_bdb and test_distutils with installed Pythons.

…)" This reverts commit 0fbab8a as it breaks test_bdb and test_distutils with installed Pythons.

…H-31882) This reverts commit 0fbab8a as it breaks test_bdb and test_distutils with installed Pythons.

…H-31880) This reverts commit 25962e4 as it breaks test_bdb and test_distutils with installed Pythons.

…H-31881) This reverts commit bda64b3 as it breaks test_bdb and test_distutils with installed Pythons.

ned-deily · 2022-03-14T21:13:25Z

Alas, this version of setuptools introduces some test failures when used with an installed Python so I've reverted this update on all current branches.

* main: (94 commits) Revert "bpo-46986: Upgrade bundled setuptools to 60.9.3 (pythonGH-31820)" (pythonGH-31879) bpo-30677: [doc] mention that os.mkdir() can raise FileNotFoundError (pythonGH-31548) git ignore Lib/site-packages (pythonGH-31862) bpo-31415: importtime was made by Inada Naoki (pythonGH-31875) bpo-46920: Remove code that has explainers why it was disabled (pythonGH-31813) bpo-46920: Remove disabled debug code added decades ago and likely unnecessary (pythonGH-31812) bpo-46920: Remove code that has no explainer why it was disabled (pythonGH-31814) bpo-46906: Mention native endian in PyFloat_Pack8() doc (pythonGH-31866) bpo-40280: select: Use NULL for empty fdset (pythonGH-31865) CI: Fix patchcheck (pythonGH-31708) bpo-46987: Remove _PySys_GetObjectId / _PySys_GetObjectId (pythonGH-31835) bpo-46994: Accept explicit contextvars.Context in asyncio create_task() API (pythonGH-31837) bpo-39829: Fix `__len__()` is called twice in list() constructor (pythonGH-31816) bpo-47003: Cleanup _overlapped module (pythonGH-31848) bpo-47004: Sync with importlib_metadata 4.11.3. (python#31854) bpo-46986: Upgrade bundled setuptools to 60.9.3 (pythonGH-31820) bpo-46985: Upgrade bundled pip to 22.0.4 (pythonGH-31819) bpo-46805: Add low level UDP socket functions to asyncio (pythonGH-31455) bpo-46995: Deprecate missing asyncio.Task.set_name() for third-party task implementations (pythonGH-31838) bpo-43215: Document Happy Eyeballs args of asyncio.open_connection (pythonGH-24525) ...

…honGH-31855) (cherry picked from commit c99ac3c) Co-authored-by: Pradyun Gedam <pgedam@bloomberg.net>

…)" (pythonGH-31881) This reverts commit bda64b3 as it breaks test_bdb and test_distutils with installed Pythons.

pradyunsg added 2 commits March 11, 2022 13:51

bpo-46986: Upgrade bundled setuptools to 60.9.3

06cf114

📰

0834874

bedevere-bot added the awaiting review label Mar 11, 2022

the-knights-who-say-ni added the CLA signed label Mar 11, 2022

JelleZijlstra added needs backport to 3.9 only security fixes needs backport to 3.10 only security fixes labels Mar 13, 2022

Merge branch 'main' into setuptools-60-9-3-upgrade

a9ae175

ned-deily added needs backport to 3.7 needs backport to 3.8 only security fixes labels Mar 13, 2022

ned-deily merged commit c99ac3c into python:main Mar 13, 2022

bedevere-bot removed the awaiting review label Mar 13, 2022

miss-islington assigned ned-deily Mar 13, 2022

ned-deily added needs backport to 3.10 only security fixes and removed needs backport to 3.10 only security fixes labels Mar 13, 2022

bedevere-bot removed the needs backport to 3.10 only security fixes label Mar 13, 2022

miss-islington pushed a commit to miss-islington/cpython that referenced this pull request Mar 13, 2022

bpo-46986: Upgrade bundled setuptools to 60.9.3 (pythonGH-31820)

3326b95

(cherry picked from commit c99ac3c) Co-authored-by: Pradyun Gedam <pgedam@bloomberg.net>

ned-deily added needs backport to 3.9 only security fixes and removed needs backport to 3.9 only security fixes labels Mar 13, 2022

ned-deily pushed a commit to ned-deily/cpython that referenced this pull request Mar 13, 2022

bpo-46986: Upgrade bundled setuptools to 60.9.3 (pythonGH-31820)

8afbbad

(cherry picked from commit c99ac3c)

bedevere-bot removed the needs backport to 3.9 only security fixes label Mar 13, 2022

miss-islington added a commit that referenced this pull request Mar 13, 2022

bpo-46986: Upgrade bundled setuptools to 60.9.3 (GH-31820)

25962e4

(cherry picked from commit c99ac3c) Co-authored-by: Pradyun Gedam <pgedam@bloomberg.net>

ned-deily pushed a commit to ned-deily/cpython that referenced this pull request Mar 13, 2022

bpo-46986: Upgrade bundled setuptools to 60.9.3 (pythonGH-31820)

dd9c72a

(cherry picked from commit c99ac3c)

ned-deily added a commit that referenced this pull request Mar 13, 2022

bpo-46986: Upgrade bundled setuptools to 60.9.3 (GH-31820) (GH-31855)

bda64b3

(cherry picked from commit c99ac3c) Co-authored-by: Pradyun Gedam <pgedam@bloomberg.net>

bedevere-bot removed the needs backport to 3.8 only security fixes label Mar 13, 2022

ned-deily pushed a commit to ned-deily/cpython that referenced this pull request Mar 13, 2022

bpo-46986: Upgrade bundled setuptools to 60.9.3 (pythonGH-31820)

1a4225b

(cherry picked from commit c99ac3c)

bedevere-bot removed the needs backport to 3.7 label Mar 13, 2022

ned-deily added a commit that referenced this pull request Mar 13, 2022

bpo-46986: Upgrade bundled setuptools to 60.9.3 (GH-31820) (GH-31861)

0fbab8a

(cherry picked from commit c99ac3c) Co-authored-by: Pradyun Gedam <pgedam@bloomberg.net>

pradyunsg deleted the setuptools-60-9-3-upgrade branch March 14, 2022 07:27

ned-deily added a commit to ned-deily/cpython that referenced this pull request Mar 14, 2022

Revert "bpo-46986: Upgrade bundled setuptools to 60.9.3 (pythonGH-31820…

79edcb7

…)" This reverts commit c99ac3c as it breaks test_bdb and test_distutils with installed Pythons.

ned-deily added a commit that referenced this pull request Mar 14, 2022

Revert "bpo-46986: Upgrade bundled setuptools to 60.9.3 (GH-31820)" (G…

19f6999

…H-31879) This reverts commit c99ac3c as it breaks test_bdb and test_distutils with installed Pythons.

ned-deily added a commit to ned-deily/cpython that referenced this pull request Mar 14, 2022

Revert "bpo-46986: Upgrade bundled setuptools to 60.9.3 (pythonGH-31820…

a2144bc

…)" This reverts commit 25962e4 as it breaks test_bdb and test_distutils with installed Pythons.

ned-deily added a commit to ned-deily/cpython that referenced this pull request Mar 14, 2022

Revert "bpo-46986: Upgrade bundled setuptools to 60.9.3 (pythonGH-31820…

9cb2269

…) (pythonGH-31855)" This reverts commit bda64b3 as it breaks test_bdb and test_distutils with installed Pythons.

ned-deily added a commit to ned-deily/cpython that referenced this pull request Mar 14, 2022

Revert "bpo-46986: Upgrade bundled setuptools to 60.9.3 (pythonGH-31820…

d69d648

…)" This reverts commit 0fbab8a as it breaks test_bdb and test_distutils with installed Pythons.

ned-deily added a commit that referenced this pull request Mar 14, 2022

Revert "bpo-46986: Upgrade bundled setuptools to 60.9.3 (GH-31820)" (G…

80cc10f

…H-31882) This reverts commit 0fbab8a as it breaks test_bdb and test_distutils with installed Pythons.

ned-deily added a commit that referenced this pull request Mar 14, 2022

Revert "bpo-46986: Upgrade bundled setuptools to 60.9.3 (GH-31820)" (G…

0cfcc0c

…H-31880) This reverts commit 25962e4 as it breaks test_bdb and test_distutils with installed Pythons.

ned-deily added a commit that referenced this pull request Mar 14, 2022

Revert "bpo-46986: Upgrade bundled setuptools to 60.9.3 (GH-31820)" (G…

1b12392

…H-31881) This reverts commit bda64b3 as it breaks test_bdb and test_distutils with installed Pythons.

hello-adam pushed a commit to hello-adam/cpython that referenced this pull request Jun 2, 2022

bpo-46986: Upgrade bundled setuptools to 60.9.3 (pythonGH-31820) (pyt…

2de1b3b

…honGH-31855) (cherry picked from commit c99ac3c) Co-authored-by: Pradyun Gedam <pgedam@bloomberg.net>

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

bpo-46986: Upgrade bundled setuptools to 60.9.3 #31820

bpo-46986: Upgrade bundled setuptools to 60.9.3 #31820

pradyunsg commented Mar 11, 2022 •

edited by bedevere-bot

Loading

pradyunsg commented Mar 11, 2022

pradyunsg commented Mar 11, 2022

pradyunsg commented Mar 12, 2022 •

edited

Loading

pradyunsg commented Mar 13, 2022

miss-islington commented Mar 13, 2022

miss-islington commented Mar 13, 2022

miss-islington commented Mar 13, 2022

miss-islington commented Mar 13, 2022

miss-islington commented Mar 13, 2022

miss-islington commented Mar 13, 2022

bedevere-bot commented Mar 13, 2022

miss-islington commented Mar 13, 2022

miss-islington commented Mar 13, 2022

bedevere-bot commented Mar 13, 2022

bedevere-bot commented Mar 13, 2022

bedevere-bot commented Mar 13, 2022

pradyunsg commented Mar 14, 2022

ned-deily commented Mar 14, 2022

bpo-46986: Upgrade bundled setuptools to 60.9.3 #31820

bpo-46986: Upgrade bundled setuptools to 60.9.3 #31820

Conversation

pradyunsg commented Mar 11, 2022 • edited by bedevere-bot Loading

pradyunsg commented Mar 11, 2022

pradyunsg commented Mar 11, 2022

Footnotes

pradyunsg commented Mar 12, 2022 • edited Loading

pradyunsg commented Mar 13, 2022

miss-islington commented Mar 13, 2022

miss-islington commented Mar 13, 2022

miss-islington commented Mar 13, 2022

miss-islington commented Mar 13, 2022

miss-islington commented Mar 13, 2022

miss-islington commented Mar 13, 2022

bedevere-bot commented Mar 13, 2022

miss-islington commented Mar 13, 2022

miss-islington commented Mar 13, 2022

bedevere-bot commented Mar 13, 2022

bedevere-bot commented Mar 13, 2022

bedevere-bot commented Mar 13, 2022

pradyunsg commented Mar 14, 2022

ned-deily commented Mar 14, 2022

pradyunsg commented Mar 11, 2022 •

edited by bedevere-bot

Loading

pradyunsg commented Mar 12, 2022 •

edited

Loading