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-112281: Allow `Union` with unhashable `Annotated` metadata #112283

Merged

AlexWaygood merged 13 commits into python:main from sobolevn:issue-112281

Mar 1, 2024

+156 −18

Member

sobolevn commented Nov 20, 2023 •

edited by bedevere-app bot

Loading

This should not affect performance that much:

I tried to keep the fast path as it is
Slow path is only used when TypeError happens on unhashable items (it should not affect code with only hashable parts)

Issue: Unioned types should be hashable: not documented? #112281


          pythongh-112281: Allow Union with unhashable Annotated metadata

c13aa09

sobolevn requested review from JelleZijlstra and AlexWaygood as code owners

November 20, 2023 13:18

bedevere-app bot added the awaiting review label

bedevere-app bot mentioned this pull request

Unioned types should be hashable: not documented? #112281

Closed

faph reviewed

View reviewed changes

Lib/typing.py Outdated Show resolved Hide resolved


          Add one more test case

0ff7f84

AlexWaygood reviewed

View reviewed changes

Lib/test/test_typing.py Outdated Show resolved Hide resolved

sobolevn added 2 commits

November 20, 2023 17:42


          Fix ordering issues, use consistent hash check

d348b74


          More tests

8dff1c4

JelleZijlstra reviewed

View reviewed changes

Lib/typing.py Outdated Show resolved Hide resolved

Lib/typing.py Outdated Show resolved Hide resolved

Lib/test/test_typing.py Show resolved Hide resolved

Lib/test/test_typing.py Outdated Show resolved Hide resolved

Misc/NEWS.d/next/Library/2023-11-20-16-15-44.gh-issue-112281.gH4EVk.rst Outdated Show resolved Hide resolved


          Address review

968dd18

AlexWaygood reviewed

View reviewed changes

Lib/typing.py Outdated Show resolved Hide resolved


          Address review

9f8b665

AlexWaygood reviewed

View reviewed changes

Lib/typing.py Outdated Show resolved Hide resolved


          Address review

a9c1700

AlexWaygood reviewed

View reviewed changes

Lib/typing.py Outdated Show resolved Hide resolved


          Address review

4622bc8

AlexWaygood reviewed

View reviewed changes

Lib/test/test_typing.py Outdated Show resolved Hide resolved

AlexWaygood reviewed

View reviewed changes

Lib/test/test_types.py Outdated Show resolved Hide resolved


          Apply suggestions from code review

cadb2df

Co-authored-by: Alex Waygood <Alex.Waygood@Gmail.com>

AlexWaygood reviewed

View reviewed changes

Lib/test/test_typing.py Outdated Show resolved Hide resolved

Lib/test/test_typing.py Outdated Show resolved Hide resolved


          Apply suggestions from code review

7293ad7

Co-authored-by: Alex Waygood <Alex.Waygood@Gmail.com>

Member Author

sobolevn commented Dec 2, 2023

We just did 6 rounds of nitpicks :)

AlexWaygood approved these changes

View reviewed changes

Member

AlexWaygood left a comment

LGTM. @JelleZijlstra, anything more from you?

Lib/test/test_typing.py Outdated Show resolved Hide resolved

bedevere-app bot added awaiting merge and removed awaiting review labels

sobolevn and others added 2 commits

December 2, 2023 18:05


          Update Lib/test/test_typing.py

449f114

Co-authored-by: Alex Waygood <Alex.Waygood@Gmail.com>


          Merge branch 'main' into issue-112281

da80e22

sobolevn requested a review from JelleZijlstra

February 7, 2024 07:06

sobolevn requested a review from AlexWaygood

February 7, 2024 07:06

Member

AlexWaygood commented Feb 7, 2024

I already approved this one :)

AlexWaygood removed their request for review

February 7, 2024 12:48

JelleZijlstra approved these changes

View reviewed changes

Member

JelleZijlstra commented Mar 1, 2024

Thanks, and sorry for the wait!

Do you think this should be backported? I lean yes because the old behavior feels like a bug.

Member

AlexWaygood commented Mar 1, 2024

Do you think this should be backported? I lean yes because the old behavior feels like a bug.

Yeah, agreed

AlexWaygood added needs backport to 3.11 needs backport to 3.12 labels


          Merge branch 'main' into issue-112281

98cf0ff

AlexWaygood enabled auto-merge (squash)

March 1, 2024 15:46

AlexWaygood merged commit a7549b0 into python:main

31 checks passed

miss-islington-app bot commented Mar 1, 2024

Thanks @sobolevn for the PR, and @AlexWaygood for merging it 🌮🎉.. I'm working now to backport this PR to: 3.11, 3.12.
🐍🍒⛏🤖

bedevere-app bot removed the awaiting merge label

miss-islington pushed a commit to miss-islington/cpython that referenced this pull request


          pythongh-112281: Allow Union with unhashable Annotated metadata (p…

21cad08

…ythonGH-112283)

(cherry picked from commit a7549b0)

Co-authored-by: Nikita Sobolev <mail@sobolevn.me>
Co-authored-by: Alex Waygood <Alex.Waygood@Gmail.com>

miss-islington-app bot commented Mar 1, 2024

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

cherry_picker a7549b03cec1699b5342cddf292c179315433fa2 3.11

miss-islington-app bot assigned AlexWaygood

bedevere-app bot commented Mar 1, 2024

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

bedevere-app bot removed the needs backport to 3.12 label

AlexWaygood added a commit that referenced this pull request


          [3.12] gh-112281: Allow Union with unhashable Annotated metadata (G…

90f75e1

…H-112283) (#116213)

Co-authored-by: Nikita Sobolev <mail@sobolevn.me>
Co-authored-by: Alex Waygood <Alex.Waygood@Gmail.com>

AlexWaygood assigned sobolevn and unassigned AlexWaygood

sobolevn added a commit to sobolevn/cpython that referenced this pull request


          [3.11] pythongh-112281: Allow Union with unhashable Annotated met…

…adata (pythonGH-112283)

(cherry picked from commit a7549b0)

Co-authored-by: Nikita Sobolev <mail@sobolevn.me>
Co-authored-by: Alex Waygood <Alex.Waygood@Gmail.com>

bedevere-app bot commented Mar 3, 2024

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

bedevere-app bot removed the needs backport to 3.11 label

AlexWaygood added a commit that referenced this pull request


          [3.11] gh-112281: Allow Union with unhashable Annotated metadata (G…

8bfbeeb

…H-112283) (#116288)

Co-authored-by: Alex Waygood <Alex.Waygood@Gmail.com>

woodruffw pushed a commit to woodruffw-forks/cpython that referenced this pull request


          pythongh-112281: Allow Union with unhashable Annotated metadata (p…

326fad4

…ython#112283)

Co-authored-by: Alex Waygood <Alex.Waygood@Gmail.com>

adorilson pushed a commit to adorilson/cpython that referenced this pull request


          pythongh-112281: Allow Union with unhashable Annotated metadata (p…

6b0c1c2

…ython#112283)

Co-authored-by: Alex Waygood <Alex.Waygood@Gmail.com>

diegorusso pushed a commit to diegorusso/cpython that referenced this pull request


          pythongh-112281: Allow Union with unhashable Annotated metadata (p…

2b44ae1

…ython#112283)

Co-authored-by: Alex Waygood <Alex.Waygood@Gmail.com>

JelleZijlstra mentioned this pull request

gh-105499: Merge typing.Union and types.UnionType #105511

Open

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet