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.

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

Don't use custom _ConcatenateGenericAlias for 3.10 #870

Merged
merged 2 commits into from Aug 30, 2021

Conversation

@Fidget-Spinner
Copy link
Collaborator

@Fidget-Spinner Fidget-Spinner commented Aug 30, 2021

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.

Copy link
Member

@JelleZijlstra JelleZijlstra left a comment

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
Member

@JelleZijlstra 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
1 check passed
@Fidget-Spinner
Copy link
Collaborator Author

@Fidget-Spinner 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 Aug 30, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Linked issues

Successfully merging this pull request may close these issues.

None yet

3 participants