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-101566: Sync with zipp 3.14. #102018

Merged
merged 2 commits into from
Feb 20, 2023
Merged

gh-101566: Sync with zipp 3.14. #102018

merged 2 commits into from
Feb 20, 2023

Conversation

jaraco
Copy link
Member

@jaraco jaraco commented Feb 18, 2023 •
edited by miss-islington
Loading

@jaraco jaraco requested a review from gpshead February 18, 2023 01:25
@bedevere-bot bedevere-bot mentioned this pull request Feb 18, 2023
Closed
@jaraco jaraco added needs backport to 3.10 only security fixes needs backport to 3.11 only security fixes labels Feb 18, 2023
@jaraco
Copy link
Member Author

jaraco commented Feb 18, 2023

I'm unsure if the bugfix for the referenced issue should be backported or not. I'm thinking so, but not the other feature changes (additional attributes, equality comparison).

@miss-islington miss-islington merged commit 36854bb into python:main Feb 20, 2023
@miss-islington
Copy link
Contributor

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

@miss-islington
Copy link
Contributor

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

@miss-islington miss-islington self-assigned this Feb 20, 2023
@miss-islington
Copy link
Contributor

Sorry @jaraco, I had trouble checking out the 3.10 backport branch.
Please retry by removing and re-adding the "needs backport to 3.10" label.
Alternatively, you can backport using cherry_picker on the command line.
cherry_picker 36854bbb240e417c0df6f0014924fcc899388186 3.10

@jaraco jaraco deleted the sync/zipp-3.14 branch February 20, 2023 21:23
@bedevere-bot
Copy link

GH-102090 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 Feb 20, 2023
jaraco added a commit to jaraco/cpython that referenced this pull request Feb 20, 2023
@jaraco
[3.11] pythongh-101566: Sync with zipp 3.14. (pythonGH-102018).
0357993 
(cherry picked from commit 36854bb)

Co-authored-by: Jason R. Coombs <jaraco@jaraco.com>
jaraco added a commit to jaraco/cpython that referenced this pull request Feb 20, 2023
@jaraco
[3.11] pythongh-101566: Sync with zipp 3.14. (pythonGH-102018).
423bab4 
(cherry picked from commit 36854bb)

Co-authored-by: Jason R. Coombs <jaraco@jaraco.com>
@bedevere-bot
Copy link

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

@bedevere-bot bedevere-bot removed the needs backport to 3.10 only security fixes label Feb 20, 2023
jaraco added a commit to jaraco/cpython that referenced this pull request Feb 20, 2023
@jaraco
[3.10] pythongh-101566: Sync with zipp 3.14. (pythonGH-102018).
7ffb276 
(cherry picked from commit 36854bb)

Co-authored-by: Jason R. Coombs <jaraco@jaraco.com>
miss-islington pushed a commit that referenced this pull request Feb 20, 2023
@jaraco
[3.10] gh-101566: Sync with zipp 3.14. (GH-102018). (GH-102091)
7bb41d9 
(cherry picked from commit 36854bb)

Includes the bugfix only.

Automerge-Triggered-By: GH:jaraco
miss-islington pushed a commit that referenced this pull request Feb 20, 2023
@jaraco
[3.11] gh-101566: Sync with zipp 3.14. (GH-102018). (GH-102090)
d15e958 
(cherry picked from commit 36854bb)

Backport of bugfix only.

Automerge-Triggered-By: GH:jaraco
carljm added a commit to carljm/cpython that referenced this pull request Feb 20, 2023
@carljm
Merge branch 'main' into inlinecomp2
9f0fc5b 
* main: (60 commits)
  pythongh-102056: Fix a few bugs in error handling of exception printing code (python#102078)
  pythongh-102011: use sys.exception() instead of sys.exc_info() in docs where possible (python#102012)
  pythongh-101566: Sync with zipp 3.14. (pythonGH-102018)
  pythonGH-99818: improve the documentation for zipfile.Path and Traversable (pythonGH-101589)
  pythongh-88233: zipfile: handle extras after a zip64 extra (pythonGH-96161)
  pythongh-101981: Apply HOMEBREW related environment variables (pythongh-102074)
  pythongh-101907: Stop using `_Py_OPCODE` and `_Py_OPARG` macros (pythonGH-101912)
  pythongh-101819: Adapt _io types to heap types, batch 1 (pythonGH-101949)
  pythongh-101981: Build macOS as recommended by the devguide (pythonGH-102070)
  pythongh-97786: Fix compiler warnings in pytime.c (python#101826)
  pythongh-101578: Amend PyErr_{Set,Get}RaisedException docs (python#101962)
  Misc improvements to the float tutorial (pythonGH-102052)
  pythongh-85417: Clarify behaviour on branch cuts in cmath module (python#102046)
  pythongh-100425: Update tutorial docs related to sum() accuracy (FH-101854)
  Add missing 'is' to `cmath.log()` docstring (python#102049)
  pythongh-100210: Correct the comment link for unescaping HTML (python#100212)
  pythongh-97930: Also include subdirectory in makefile. (python#102030)
  pythongh-99735: Use required=True in argparse subparsers example (python#100927)
  Fix incorrectly documented attribute in csv docs (python#101250)
  pythonGH-84783: Make the slice object hashable (pythonGH-101264)
  ...
carljm added a commit to carljm/cpython that referenced this pull request Feb 22, 2023
@carljm
Merge branch 'main' into inlinecomp
544b30c 
* main: (225 commits)
  pythongh-102056: Fix a few bugs in error handling of exception printing code (python#102078)
  pythongh-102011: use sys.exception() instead of sys.exc_info() in docs where possible (python#102012)
  pythongh-101566: Sync with zipp 3.14. (pythonGH-102018)
  pythonGH-99818: improve the documentation for zipfile.Path and Traversable (pythonGH-101589)
  pythongh-88233: zipfile: handle extras after a zip64 extra (pythonGH-96161)
  pythongh-101981: Apply HOMEBREW related environment variables (pythongh-102074)
  pythongh-101907: Stop using `_Py_OPCODE` and `_Py_OPARG` macros (pythonGH-101912)
  pythongh-101819: Adapt _io types to heap types, batch 1 (pythonGH-101949)
  pythongh-101981: Build macOS as recommended by the devguide (pythonGH-102070)
  pythongh-97786: Fix compiler warnings in pytime.c (python#101826)
  pythongh-101578: Amend PyErr_{Set,Get}RaisedException docs (python#101962)
  Misc improvements to the float tutorial (pythonGH-102052)
  pythongh-85417: Clarify behaviour on branch cuts in cmath module (python#102046)
  pythongh-100425: Update tutorial docs related to sum() accuracy (FH-101854)
  Add missing 'is' to `cmath.log()` docstring (python#102049)
  pythongh-100210: Correct the comment link for unescaping HTML (python#100212)
  pythongh-97930: Also include subdirectory in makefile. (python#102030)
  pythongh-99735: Use required=True in argparse subparsers example (python#100927)
  Fix incorrectly documented attribute in csv docs (python#101250)
  pythonGH-84783: Make the slice object hashable (pythonGH-101264)
  ...
carljm added a commit to carljm/cpython that referenced this pull request Feb 23, 2023
@carljm
Merge branch 'main' into lockfreecp
b257a16 
* main: (76 commits)
  Fix syntax error in struct doc example (python#102160)
  pythongh-99108: Import MD5 and SHA1 from HACL* (python#102089)
  pythonGH-101777: `queue.rst`: use 2 spaces after a period to be consistent. (python#102143)
  Few coverage nitpicks for the cmath module (python#102067)
  pythonGH-100982: Restrict `FOR_ITER_RANGE` to a single instruction to allow instrumentation. (pythonGH-101985)
  pythongh-102135: Update turtle docs to rename wikipedia demo to rosette (python#102137)
  pythongh-99942: python.pc on android/cygwin should link to libpython per configure.ac (pythonGH-100356)
  pythongh-95672 fix typo SkitTest to SkipTest (pythongh-102119)
  pythongh-101936: Update the default value of fp from io.StringIO to io.BytesIO (pythongh-102100)
  pythongh-102008: simplify test_except_star by using sys.exception() instead of sys.exc_info() (python#102009)
  pythongh-101903: Remove obsolete undefs for previously removed macros Py_EnterRecursiveCall and Py_LeaveRecursiveCall (python#101923)
  pythongh-100556: Improve clarity of `or` docs (python#100589)
  pythongh-101777: Make `PriorityQueue` docs slightly clearer (python#102026)
  pythongh-101965: Fix usage of Py_EnterRecursiveCall return value in _bisectmodule.c (pythonGH-101966)
  pythongh-101578: Amend exception docs (python#102057)
  pythongh-101961 fileinput.hookcompressed should not set the encoding value for the binary mode (pythongh-102068)
  pythongh-102056: Fix a few bugs in error handling of exception printing code (python#102078)
  pythongh-102011: use sys.exception() instead of sys.exc_info() in docs where possible (python#102012)
  pythongh-101566: Sync with zipp 3.14. (pythonGH-102018)
  pythonGH-99818: improve the documentation for zipfile.Path and Traversable (pythonGH-101589)
  ...
@jaraco jaraco mentioned this pull request Feb 24, 2023
Closed
@jaraco jaraco mentioned this pull request May 27, 2024
Closed
python-sidebar pushed a commit to python-sidebar/Python-Documentation-Fork-With-TOC that referenced this pull request Sep 1, 2024
@jaraco @python-sidebar
pythongh-101566: Sync with zipp 3.14. (pythonGH-102018)
e7bd72c
python-sidebar pushed a commit to python-sidebar/Python-Documentation-Fork-With-TOC that referenced this pull request Sep 1, 2024
@jaraco @python-sidebar
pythongh-101566: Sync with zipp 3.14. (pythonGH-102018)
f0de686
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@gpshead gpshead gpshead approved these changes

Assignees

@miss-islington miss-islington

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@jaraco @miss-islington @bedevere-bot @gpshead @hauntsaninja