Skip to content

/ cpython

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

Jump to bottom

Bring Python into the new year. #24036

Merged
merged 2 commits into from Jan 1, 2021
Merged

Bring Python into the new year. #24036

merged 2 commits into from Jan 1, 2021
+10 −10

Conversation

@corona10
Copy link
Member

@corona10 corona10 commented Jan 1, 2021

Happy New Year ;)
@corona10 corona10 requested review from vstinner, benjaminp and pablogsal Jan 1, 2021
@corona10 corona10 requested a review from python/macos-team as a code owner Jan 1, 2021
@animalize
Copy link
Contributor

@animalize animalize commented Jan 1, 2021

There is a "2016" in cpython/PC/python_ver_rc.h, it could be changed to 2021.
@corona10 corona10 requested a review from python/windows-team as a code owner Jan 1, 2021
corona10 added 2 commits Jan 1, 2021
@corona10
Bring Python into the new year.
f7ebb01
@corona10
Update
Loading status checks…
e6cfd9b
@corona10 corona10 force-pushed the corona10:happy_new_year branch from f285dc2 to e6cfd9b Jan 1, 2021
@vstinner
Copy link
Member

@vstinner vstinner commented Jan 1, 2021

Last year, @benjaminp did the commit: commit 946b29e.
@vstinner
vstinner approved these changes Jan 1, 2021
View changes
Copy link
Member

@vstinner vstinner left a comment

LGTM.

You modified the same files than last year commit, but you also updated PC/python_ver_rc.h which is a good thing.
@corona10 corona10 merged commit de6f20a into python:master Jan 1, 2021
11 checks passed
11 checks passed
Docs
Details
Check for source changes
Details
Check if generated files are up to date
Details
Windows (x86)
Details
Windows (x64)
Details
macOS
Details
Ubuntu
Details
Azure Pipelines PR #20210101.17 succeeded
Details
Travis CI - Pull Request Build Passed
Details
bedevere/issue-number Issue report skipped
bedevere/news "skip news" label found
@miss-islington
Copy link
Contributor

@miss-islington miss-islington commented Jan 1, 2021

Thanks @corona10 for the PR 🌮🎉.. I'm working now to backport this PR to: 3.6, 3.7, 3.8, 3.9.
🐍🍒⛏🤖
@bedevere-bot
Copy link

@bedevere-bot bedevere-bot commented Jan 1, 2021

GH-24045 is a backport of this pull request to the 3.9 branch.
miss-islington added a commit to miss-islington/cpython that referenced this pull request Jan 1, 2021
@corona10 @miss-islington
Bring Python into the new year. (pythonGH-24036)
5eb80e5 
(cherry picked from commit de6f20a)

Co-authored-by: Dong-hee Na <donghee.na@python.org>
miss-islington added a commit to miss-islington/cpython that referenced this pull request Jan 1, 2021
@corona10 @miss-islington
Bring Python into the new year. (pythonGH-24036)
492cc15 
(cherry picked from commit de6f20a)

Co-authored-by: Dong-hee Na <donghee.na@python.org>
@bedevere-bot
Copy link

@bedevere-bot bedevere-bot commented Jan 1, 2021

GH-24046 is a backport of this pull request to the 3.8 branch.
@bedevere-bot
Copy link

@bedevere-bot bedevere-bot commented Jan 1, 2021

GH-24047 is a backport of this pull request to the 3.7 branch.
@miss-islington
Copy link
Contributor

@miss-islington miss-islington commented Jan 1, 2021

Sorry, @corona10, I could not cleanly backport this to 3.6 due to a conflict.
Please backport using cherry_picker on command line.
cherry_picker de6f20a6de48d63066b2cf5b317f50629f01d74a 3.6
miss-islington added a commit to miss-islington/cpython that referenced this pull request Jan 1, 2021
@corona10 @miss-islington
Bring Python into the new year. (pythonGH-24036)
3576348 
(cherry picked from commit de6f20a)

Co-authored-by: Dong-hee Na <donghee.na@python.org>
@vstinner
Copy link
Member

@vstinner vstinner commented Jan 1, 2021

This change should not be backported to 3.6 and 3.7, it's not a security fix: https://devguide.python.org/#status-of-python-branches
miss-islington added a commit that referenced this pull request Jan 1, 2021
@miss-islington @corona10
Bring Python into the new year. (GH-24036)
Verified
This commit was created on GitHub.com and signed with a verified signature using GitHub’s key.
GPG key ID: 4AEE18F83AFDEB23 Learn about signing commits
Loading status checks…
fa12749 
(cherry picked from commit de6f20a)

Co-authored-by: Dong-hee Na <donghee.na@python.org>
miss-islington added a commit that referenced this pull request Jan 1, 2021
@miss-islington @corona10
Bring Python into the new year. (GH-24036)
Verified
This commit was created on GitHub.com and signed with a verified signature using GitHub’s key.
GPG key ID: 4AEE18F83AFDEB23 Learn about signing commits
Loading status checks…
02639c3 
(cherry picked from commit de6f20a)

Co-authored-by: Dong-hee Na <donghee.na@python.org>
@ned-deily
Copy link
Member

@ned-deily ned-deily commented Jan 1, 2021

@vstinner The copyrights are an exception. They should be updated on still active branches.
@miss-islington
Copy link
Contributor

@miss-islington miss-islington commented Jan 1, 2021

Thanks @corona10 for the PR 🌮🎉.. I'm working now to backport this PR to: 3.7.
🐍🍒⛏🤖
@miss-islington
Copy link
Contributor

@miss-islington miss-islington commented Jan 1, 2021

Thanks @corona10 for the PR 🌮🎉.. I'm working now to backport this PR to: 3.6.
🐍🍒⛏🤖
@bedevere-bot
Copy link

@bedevere-bot bedevere-bot commented Jan 1, 2021

GH-24052 is a backport of this pull request to the 3.7 branch.
@miss-islington
Copy link
Contributor

@miss-islington miss-islington commented Jan 1, 2021

Sorry, @corona10, I could not cleanly backport this to 3.6 due to a conflict.
Please backport using cherry_picker on command line.
cherry_picker de6f20a6de48d63066b2cf5b317f50629f01d74a 3.6
miss-islington added a commit to miss-islington/cpython that referenced this pull request Jan 1, 2021
@corona10 @miss-islington
Bring Python into the new year. (pythonGH-24036)
826120d 
(cherry picked from commit de6f20a)

Co-authored-by: Dong-hee Na <donghee.na@python.org>
@ned-deily
Copy link
Member

@ned-deily ned-deily commented Jan 1, 2021

@corona10 If you would care to deal with the merge conflict for 3.6, I'll see that the PR gets merged. Thanks!
@vstinner
Copy link
Member

@vstinner vstinner commented Jan 1, 2021

@vstinner The copyrights are an exception. They should be updated on still active branches.

Oh. I didn't know, good to know.
ned-deily pushed a commit that referenced this pull request Jan 1, 2021
@miss-islington @corona10
Bring Python into the new year. (GH-24036) (GH-24052)
Verified
This commit was created on GitHub.com and signed with a verified signature using GitHub’s key.
GPG key ID: 4AEE18F83AFDEB23 Learn about signing commits
Loading status checks…
117830d 
(cherry picked from commit de6f20a)

Co-authored-by: Dong-hee Na <donghee.na@python.org>
corona10 added a commit to corona10/cpython that referenced this pull request Jan 2, 2021
@corona10
[3.6] Bring Python into the new year. (pythonGH-24036).
74eb270 
(cherry picked from commit de6f20a)

Co-authored-by: Dong-hee Na <donghee.na@python.org>
@bedevere-bot
Copy link

@bedevere-bot bedevere-bot commented Jan 2, 2021

GH-24054 is a backport of this pull request to the 3.6 branch.
ned-deily pushed a commit that referenced this pull request Jan 2, 2021
@corona10
[3.6] Bring Python into the new year. (GH-24036). (GH-24054)
Verified
This commit was created on GitHub.com and signed with a verified signature using GitHub’s key.
GPG key ID: 4AEE18F83AFDEB23 Learn about signing commits
Loading status checks…
415c4a1 
(cherry picked from commit de6f20a)

Co-authored-by: Dong-hee Na <donghee.na@python.org>
@corona10 corona10 deleted the corona10:happy_new_year branch Jan 2, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@vstinner vstinner

@python/windows-team windows-team

@python/macos-team macos-team

@benjaminp benjaminp

@pablogsal pablogsal

Assignees

@corona10 corona10

Labels
CLA signed skip issue skip news
Projects
None yet
Milestone
No milestone
Linked issues

Successfully merging this pull request may close these issues.

None yet

7 participants
@corona10 @animalize @vstinner @miss-islington @bedevere-bot @ned-deily @the-knights-who-say-ni
You can’t perform that action at this time.