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-122903: Honor directories in zipfile.Path.glob. #122908

Merged
merged 2 commits into from
Aug 12, 2024
Merged

gh-122903: Honor directories in zipfile.Path.glob. #122908

merged 2 commits into from
Aug 12, 2024

Conversation

jaraco
Copy link
Member

@jaraco jaraco commented Aug 11, 2024 •
edited
Loading

Merge after #122906

@bedevere-app bedevere-app bot mentioned this pull request Aug 11, 2024
Closed
@jaraco jaraco added needs backport to 3.12 bug and security fixes needs backport to 3.13 bugs and security fixes labels Aug 11, 2024
@jaraco jaraco force-pushed the bugfix/122903-zipfile-path-glob-directories branch 2 times, most recently from ad7b43e to d319e64 Compare August 11, 2024 23:25
@jaraco jaraco force-pushed the bugfix/122903-zipfile-path-glob-directories branch from d319e64 to 778e6d7 Compare August 11, 2024 23:56
@jaraco jaraco marked this pull request as ready for review August 12, 2024 00:01
@jaraco jaraco requested a review from barneygale August 12, 2024 00:07
barneygale
barneygale approved these changes Aug 12, 2024
View reviewed changes
Copy link
Contributor

@barneygale barneygale left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM!

@jaraco
Copy link
Member Author

jaraco commented Aug 12, 2024

I added this change to zipp.Path 3.19.3 today and I'm utilizing the fix in another bit of work.

@barneygale I'm interested in your rubber stamp on the change, but also wanted to share related to your recent work on glob generally.

@jaraco jaraco merged commit 6aa35f3 into python:main Aug 12, 2024
37 checks passed
@miss-islington-app
Copy link

Thanks @jaraco for the PR 🌮🎉.. I'm working now to backport this PR to: 3.12, 3.13.
🐍🍒⛏🤖

@miss-islington-app
Copy link

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

cherry_picker 6aa35f3002dda25858d47e702e750e2871e42a7c 3.13

@jaraco jaraco deleted the bugfix/122903-zipfile-path-glob-directories branch August 12, 2024 00:33
@miss-islington-app
Copy link

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

cherry_picker 6aa35f3002dda25858d47e702e750e2871e42a7c 3.12

@jaraco jaraco added needs backport to 3.12 bug and security fixes needs backport to 3.13 bugs and security fixes and removed needs backport to 3.12 bug and security fixes needs backport to 3.13 bugs and security fixes labels Aug 12, 2024
@miss-islington-app
Copy link

Thanks @jaraco for the PR 🌮🎉.. I'm working now to backport this PR to: 3.12.
🐍🍒⛏🤖

@miss-islington-app
Copy link

Thanks @jaraco for the PR 🌮🎉.. I'm working now to backport this PR to: 3.13.
🐍🍒⛏🤖

miss-islington pushed a commit to miss-islington/cpython that referenced this pull request Aug 12, 2024
@jaraco @miss-islington
pythongh-122903: Honor directories in zipfile.Path.glob. (pythonGH-12…
686818e 
…2908)

(cherry picked from commit 6aa35f3)

Co-authored-by: Jason R. Coombs <jaraco@jaraco.com>
@miss-islington-app
Copy link

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

cherry_picker 6aa35f3002dda25858d47e702e750e2871e42a7c 3.12

@bedevere-app
Copy link

bedevere-app bot commented Aug 12, 2024

GH-122926 is a backport of this pull request to the 3.13 branch.

@bedevere-app bedevere-app bot removed the needs backport to 3.13 bugs and security fixes label Aug 12, 2024
@bedevere-app
Copy link

bedevere-app bot commented Aug 12, 2024

GH-122927 is a backport of this pull request to the 3.12 branch.

@bedevere-app bedevere-app bot removed the needs backport to 3.12 bug and security fixes label Aug 12, 2024
jaraco added a commit to jaraco/cpython that referenced this pull request Aug 12, 2024
@jaraco
[3.12] pythongh-122903: Honor directories in zipfile.Path.glob. (pyth…
5d9f730 
…onGH-122908)

(cherry picked from commit 6aa35f3)

Co-authored-by: Jason R. Coombs <jaraco@jaraco.com>
jaraco pushed a commit that referenced this pull request Aug 12, 2024
@miss-islington
[3.13] gh-122903: Honor directories in zipfile.Path.glob. (GH-122908) (…
59d0d33 
…#122926)

(cherry picked from commit 6aa35f3)
jaraco added a commit that referenced this pull request Aug 12, 2024
@jaraco
[3.12] gh-122903: Honor directories in zipfile.Path.glob. (GH-122908) (…
f511a93 
…#122927)

(cherry picked from commit 6aa35f3)
blhsing pushed a commit to blhsing/cpython that referenced this pull request Aug 22, 2024
@jaraco @blhsing
pythongh-122903: Honor directories in zipfile.Path.glob. (python#122908)
2ddd5a1
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@barneygale barneygale barneygale approved these changes

Assignees

@jaraco jaraco

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@jaraco @barneygale