Skip to content

Don't use custom _ConcatenateGenericAlias for 3.10#870

Merged
JelleZijlstra merged 2 commits intopython:masterfrom
Fidget-Spinner:avoid_import_3.10
Aug 30, 2021
Merged

Don't use custom _ConcatenateGenericAlias for 3.10#870
JelleZijlstra merged 2 commits intopython:masterfrom
Fidget-Spinner:avoid_import_3.10

Conversation

@Fidget-Spinner
Copy link
Copy Markdown
Member

@Fidget-Spinner Fidget-Spinner commented Aug 30, 2021 •
edited
Loading

Git makes the change look big, but it's one if statement to check that typing doesn't already have Concatenate. I just realized we were creating custom _ConcatenateGenericAlias even in 3.10 (where it already exists and we shouldn't). This just acts as a second guard.

JelleZijlstra
JelleZijlstra approved these changes Aug 30, 2021
View reviewed changes
Copy link
Copy Markdown
Member

@JelleZijlstra JelleZijlstra left a comment

Choose a reason for hiding this comment

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

Thanks! Let's land this after I release 3.10.0.2.

@Fidget-Spinner Fidget-Spinner changed the title Don't use custom _ConcatenenateGenericAlias for 3.10 Don't use custom _ConcatenateGenericAlias for 3.10 Aug 30, 2021
@JelleZijlstra
Copy link
Copy Markdown
Member

JelleZijlstra commented Aug 30, 2021

Jelle CI is green:

(typing) jelle@mbpt-root src_py3 % for i in $(seq 6 10); do echo $i; /Users/jelle/.pyenv/shims/python3.$i -m unittest discover; done
6
...............s.........................................ssss..........................................................................................
----------------------------------------------------------------------
Ran 151 tests in 0.170s

OK (skipped=5)
7
...............................................................................................s.....s...........s.....................................
----------------------------------------------------------------------
Ran 151 tests in 0.096s

OK (skipped=3)
8
...............................................................................................s.....s...........s..................................s..
----------------------------------------------------------------------
Ran 151 tests in 0.104s

OK (skipped=4)
9
...............................................................................................s.....s...........s..................................s..
----------------------------------------------------------------------
Ran 151 tests in 0.120s

OK (skipped=4)
10
...............................................................................................s.....s...........s..................................s..
----------------------------------------------------------------------
Ran 151 tests in 0.108s

OK (skipped=4)

@JelleZijlstra JelleZijlstra merged commit f3d3d05 into python:master Aug 30, 2021
@Fidget-Spinner
Copy link
Copy Markdown
Member Author

Fidget-Spinner commented Aug 30, 2021

Jelle CI is green:

I heard Jelle CI is newfangled AI-powered technology that has Travis and GitHub Actions quaking in their boots.

Thanks for testing and the urgent release. I can only hope that one day soon we'll have CI that isn't your manual labor.

@Fidget-Spinner Fidget-Spinner deleted the avoid_import_3.10 branch August 30, 2021 19:01
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@JelleZijlstra JelleZijlstra JelleZijlstra approved these changes

Assignees

No one assigned

Labels

CLA signed

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@Fidget-Spinner @JelleZijlstra @the-knights-who-say-ni