Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

bpo-46986: Upgrade bundled setuptools to 60.9.3 #31820

Merged
merged 3 commits into from
Mar 13, 2022
Merged

bpo-46986: Upgrade bundled setuptools to 60.9.3 #31820

merged 3 commits into from
Mar 13, 2022

Conversation

pradyunsg
Copy link
Member

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

@pradyunsg
Copy link
Member Author

x-ref #31819, which is closely related.

@pradyunsg
Copy link
Member Author

If someone wants to validate the file I've added here, you can download it directly from GitHub 1 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. :)

Footnotes

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

@pradyunsg
Copy link
Member Author

pradyunsg commented Mar 12, 2022 •
edited
Loading

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

@pradyunsg
Copy link
Member Author

@JelleZijlstra Could you label this one as well?

@JelleZijlstra JelleZijlstra added needs backport to 3.9 only security fixes needs backport to 3.10 only security fixes labels Mar 13, 2022
@ned-deily ned-deily merged commit c99ac3c into python:main Mar 13, 2022
@miss-islington
Copy link
Contributor

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
Copy link
Contributor

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
Copy link
Contributor

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
Copy link
Contributor

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
Copy link
Contributor

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

@ned-deily 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
@miss-islington
Copy link
Contributor

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

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

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

miss-islington pushed a commit to miss-islington/cpython that referenced this pull request Mar 13, 2022
@pradyunsg @miss-islington
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 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
@miss-islington
Copy link
Contributor

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

@miss-islington
Copy link
Contributor

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

ned-deily pushed a commit to ned-deily/cpython that referenced this pull request Mar 13, 2022
@pradyunsg @ned-deily
bpo-46986: Upgrade bundled setuptools to 60.9.3 (pythonGH-31820)
8afbbad 
(cherry picked from commit c99ac3c)
@bedevere-bot
Copy link

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

@bedevere-bot 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
@miss-islington @pradyunsg
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
@pradyunsg @ned-deily
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
@ned-deily @pradyunsg
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
Copy link

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

ned-deily pushed a commit to ned-deily/cpython that referenced this pull request Mar 13, 2022
@pradyunsg @ned-deily
bpo-46986: Upgrade bundled setuptools to 60.9.3 (pythonGH-31820)
1a4225b 
(cherry picked from commit c99ac3c)
@bedevere-bot
Copy link

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

ned-deily added a commit that referenced this pull request Mar 13, 2022
@ned-deily @pradyunsg
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
Copy link
Member Author

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

@pradyunsg 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
@ned-deily
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
@ned-deily
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
@ned-deily
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
@ned-deily
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
@ned-deily
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
@ned-deily
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
@ned-deily
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
@ned-deily
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.
@ned-deily
Copy link
Member

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.

carljm pushed a commit to carljm/cpython that referenced this pull request Mar 14, 2022
Merge branch 'main' into dictwatch
d22463b 
* 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)
  ...
hello-adam pushed a commit to hello-adam/cpython that referenced this pull request Jun 2, 2022
@ned-deily @pradyunsg @hello-adam
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>
hello-adam pushed a commit to hello-adam/cpython that referenced this pull request Jun 2, 2022
@ned-deily @hello-adam
Revert "bpo-46986: Upgrade bundled setuptools to 60.9.3 (pythonGH-31820…
6c47b3c 
…)" (pythonGH-31881)

This reverts commit bda64b3
as it breaks test_bdb and test_distutils with installed Pythons.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@ned-deily ned-deily

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
6 participants
@pradyunsg @miss-islington @bedevere-bot @ned-deily @JelleZijlstra @the-knights-who-say-ni