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

gh-103559: Update bundled pip version to 23.1.1 #103560

Merged
merged 7 commits into from
Apr 22, 2023
Merged

gh-103559: Update bundled pip version to 23.1.1 #103560

merged 7 commits into from
Apr 22, 2023

Conversation

pfmoore
Copy link
Member

@pfmoore pfmoore commented Apr 15, 2023 •
edited
Loading

@bedevere-bot bedevere-bot mentioned this pull request Apr 15, 2023
Closed
@pfmoore
Copy link
Member Author

pfmoore commented Apr 19, 2023

We'll be releasing a 23.1.1, so I will update this PR once that happens, rather than creating a new PR.

@warsaw
Copy link
Member

warsaw commented Apr 19, 2023 •
edited
Loading

We'll be releasing a 23.1.1, so I will update this PR once that happens, rather than creating a new PR.

Cool. Ping me if I don't give you an approval quickly. Also, do you want me to merge it, automerge it, or leave it to you (if you can)? I haven't tested it but I believe this will help unblock #98040 and #98573

@pfmoore
Copy link
Member Author

pfmoore commented Apr 19, 2023

@warsaw I'm fine with merging myself once the release is done, and I think it's uncontroversial enough that I won't bother waiting for you to re-approve (unless you'd prefer that I did).

I'll try to get the pip release done tomorrow (UK time).

@warsaw
Copy link
Member

warsaw commented Apr 19, 2023

Sounds good @pfmoore - I'll leave it to you. I agree it's uncontroversial. And thanks!

@pfmoore
Copy link
Member Author

pfmoore commented Apr 20, 2023

Sorry, @warsaw, we've just found a further issue that needs to be included in pip 23.1.1. Would it help you if I merged this PR now, on the understanding that there will be a subsequent PR upgrading to 23.1.1? It's not much extra work, so if it's useful to you, just let me know.

@pfmoore pfmoore merged commit b286295 into python:main Apr 22, 2023
@pfmoore pfmoore deleted the pip-23.1 branch April 22, 2023 11:19
@pfmoore pfmoore added the needs backport to 3.11 only security fixes label Apr 22, 2023
@miss-islington
Copy link
Contributor

Thanks @pfmoore for the PR 🌮🎉.. I'm working now to backport this PR to: 3.11.
🐍🍒⛏🤖 I'm not a witch! I'm not a witch!

@miss-islington
Copy link
Contributor

Sorry, @pfmoore, I could not cleanly backport this to 3.11 due to a conflict.
Please backport using cherry_picker on command line.
cherry_picker b2862950dc05d313b228f02a8efdd8c9c59a8ff4 3.11

@pfmoore
Copy link
Member Author

pfmoore commented Apr 22, 2023

@pradyunsg It appears that #95299 was not backported to Python 3.11. Is that intentional, or simply an oversight? As it stands, that makes it messy to backport this PR to 3.11. What is the expectation regarding 3.11?

To be explicit:

  1. Do I need to backport pip 23.1.1 to Python 3.11?
  2. Do I need to do so while retaining the inclusion of setuptools, or can I expect Remove bundled setuptools #95299 to be backported?

@pradyunsg pradyunsg changed the title gh-103559: Update bundled pip version to 23.1 gh-103559: Update bundled pip version to 23.1.1 Apr 22, 2023
@bedevere-bot
Copy link

GH-103752 is a backport of this pull request to the 3.11 branch.

@bedevere-bot bedevere-bot removed the needs backport to 3.11 only security fixes label Apr 24, 2023
pfmoore added a commit to pfmoore/cpython that referenced this pull request Apr 24, 2023
@pfmoore
pythongh-103559: Update bundled pip version to 23.1.1 (pythongh-103560)
013322f 
* Update bundled pip version to 23.1
* Update to pip 23.1.1

(cherry picked from commit b286295)
@pfmoore
Copy link
Member Author

pfmoore commented Apr 24, 2023

Never mind, fixing the backport wasn't too hard, so I did it. #95299 can be dealt with however you prefer.

ambv added a commit that referenced this pull request Apr 25, 2023
@pfmoore @ambv
[3.11] gh-103559: Update bundled pip version to 23.1.1 (gh-103560) (#…
a59dc1f 
…103752)

(cherry picked from commit b286295)

Co-authored-by: Łukasz Langa <lukasz@langa.pl>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@warsaw warsaw warsaw approved these changes

@furkanonder furkanonder furkanonder approved these changes

Assignees

@pfmoore pfmoore

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Upgrade the bundled version of pip to 23.1.1
5 participants
@pfmoore @warsaw @miss-islington @bedevere-bot @furkanonder