Skip to content

[3.10] bpo-46120: State that | is preferred over Union (GH-30222)#30250

Merged
miss-islington merged 1 commit intopython:3.10from
miss-islington:backport-1b30660-3.10
Dec 29, 2021
Merged

[3.10] bpo-46120: State that | is preferred over Union (GH-30222)#30250
miss-islington merged 1 commit intopython:3.10from
miss-islington:backport-1b30660-3.10

Conversation

@miss-islington
Copy link
Copy Markdown
Contributor

@miss-islington miss-islington commented Dec 24, 2021 •
edited
Loading

Co-authored-by: Éric [email protected]
Co-authored-by: Guido van Rossum [email protected]
(cherry picked from commit 1b30660)

Co-authored-by: Nikita Sobolev [email protected]

https://bugs.python.org/issue46120

Automerge-Triggered-By: GH:gpshead

@bedevere-bot bedevere-bot added the docs Documentation in the Doc dir label Dec 24, 2021
@miss-islington
Copy link
Copy Markdown
Contributor Author

miss-islington commented Dec 24, 2021

@sobolevn and @gpshead: Status check is done, and it's a success ✅ .

@bedevere-bot bedevere-bot mentioned this pull request Dec 24, 2021
Merged
@miss-islington
Copy link
Copy Markdown
Contributor Author

miss-islington commented Dec 24, 2021

@sobolevn and @gpshead: Status check is done, and it's a success ✅ .

@miss-islington
Copy link
Copy Markdown
Contributor Author

miss-islington commented Dec 24, 2021

@sobolevn and @gpshead: Status check is done, and it's a success ❌ .

@miss-islington
Copy link
Copy Markdown
Contributor Author

miss-islington commented Dec 27, 2021

@miss-islington: Status check is done, and it's a success ❌ .

@ambv
Copy link
Copy Markdown
Contributor

ambv commented Dec 28, 2021

This is annoying. Without my last commit the build was failing with:

WARNING: [whatsnew/changelog:86] "::" found in "Lib/ctypes/test/test_functions.py::test_mro"
make[1]: *** [Makefile:51: build] Error 1
make[1]: Leaving directory '/home/runner/work/cpython/cpython/Doc'
Suspicious check complete; look for any errors in the above output or in build/suspicious/suspicious.csv.  If all issues are false positives, append that file to tools/susp-ignored.csv.
make: *** [Makefile:115: suspicious] Error 1

With the commit adding the ignore, it's failing with:

WARNING: Found 1/384 unused rules: whatsnew/changelog,,::,Lib/ctypes/test/test_functions.py::test_mro
make[1]: *** [Makefile:51: build] Error 1
make[1]: Leaving directory '/home/runner/work/cpython/cpython/Doc'
Suspicious check complete; look for any errors in the above output or in build/suspicious/suspicious.csv.  If all issues are false positives, append that file to tools/susp-ignored.csv.
make: *** [Makefile:115: suspicious] Error 1

Needless to say, the second error doesn't reproduce locally for me.

@miss-islington
Copy link
Copy Markdown
Contributor Author

miss-islington commented Dec 28, 2021

@miss-islington: Status check is done, and it's a success ✅ .

2 similar comments
@miss-islington
Copy link
Copy Markdown
Contributor Author

miss-islington commented Dec 28, 2021

@miss-islington: Status check is done, and it's a success ✅ .

@miss-islington
Copy link
Copy Markdown
Contributor Author

miss-islington commented Dec 28, 2021

@miss-islington: Status check is done, and it's a success ✅ .

@miss-islington
Copy link
Copy Markdown
Contributor Author

miss-islington commented Dec 28, 2021

Sorry, I can't merge this PR. Reason: Pull Request is not mergeable.

2 similar comments
@miss-islington
Copy link
Copy Markdown
Contributor Author

miss-islington commented Dec 28, 2021

Sorry, I can't merge this PR. Reason: Pull Request is not mergeable.

@miss-islington
Copy link
Copy Markdown
Contributor Author

miss-islington commented Dec 28, 2021

Sorry, I can't merge this PR. Reason: Pull Request is not mergeable.

@sobolevn
Copy link
Copy Markdown
Member

sobolevn commented Dec 29, 2021

@ambv sorry, looks like this is my fault with a bad NEWS entry 🙂

See #30259

@sobolevn @ambv
bpo-46120: State that | is preferred over Union (pythonGH-30222)
2c6a053 
Co-authored-by: Éric <[email protected]>
Co-authored-by: Guido van Rossum <[email protected]>
(cherry picked from commit 1b30660)

Co-authored-by: Nikita Sobolev <[email protected]>
@ambv ambv force-pushed the backport-1b30660-3.10 branch from b2f3eb0 to 2c6a053 Compare December 29, 2021 11:21
@miss-islington
Copy link
Copy Markdown
Contributor Author

miss-islington commented Dec 29, 2021

@miss-islington: Status check is done, and it's a success ✅ .

2 similar comments
@miss-islington
Copy link
Copy Markdown
Contributor Author

miss-islington commented Dec 29, 2021

@miss-islington: Status check is done, and it's a success ✅ .

@miss-islington
Copy link
Copy Markdown
Contributor Author

miss-islington commented Dec 29, 2021

@miss-islington: Status check is done, and it's a success ✅ .

@miss-islington
Copy link
Copy Markdown
Contributor Author

miss-islington commented Dec 29, 2021

Sorry, I can't merge this PR. Reason: Base branch was modified. Review and try the merge again..

2 similar comments
@miss-islington
Copy link
Copy Markdown
Contributor Author

miss-islington commented Dec 29, 2021

Sorry, I can't merge this PR. Reason: Base branch was modified. Review and try the merge again..

@miss-islington
Copy link
Copy Markdown
Contributor Author

miss-islington commented Dec 29, 2021

Sorry, I can't merge this PR. Reason: Base branch was modified. Review and try the merge again..

@miss-islington
Copy link
Copy Markdown
Contributor Author

miss-islington commented Dec 29, 2021

@miss-islington: Status check is done, and it's a success ✅ .

@miss-islington miss-islington merged commit ed1671c into python:3.10 Dec 29, 2021
@miss-islington miss-islington deleted the backport-1b30660-3.10 branch December 29, 2021 11:45
@miss-islington
Copy link
Copy Markdown
Contributor Author

miss-islington commented Dec 29, 2021

@sobolevn and @gpshead: Status check is done, and it's a success ✅ .

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

@Fidget-Spinner Fidget-Spinner Awaiting requested review from Fidget-Spinner Fidget-Spinner is a code owner

@gvanrossum gvanrossum Awaiting requested review from gvanrossum gvanrossum is a code owner

Assignees

No one assigned

Labels

docs Documentation in the Doc dir

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

6 participants

@miss-islington @ambv @sobolevn @gpshead @the-knights-who-say-ni @bedevere-bot