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.

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

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

Conversation

corona10
Copy link
Member

@corona10 corona10 commented Jan 1, 2021

Happy New Year ;)

@corona10 corona10 requested a review from a team as a code owner January 1, 2021 06:56
@ghost
Copy link

ghost 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 a team as a code owner January 1, 2021 13:36
@vstinner
Copy link
Member

vstinner commented Jan 1, 2021

Last year, @benjaminp did the commit: commit 946b29e.

vstinner
vstinner approved these changes Jan 1, 2021
View reviewed changes
Copy link
Member

@vstinner vstinner left a comment

Choose a reason for hiding this comment

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

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
@miss-islington
Copy link
Contributor

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

GH-24045 is a backport of this pull request to the 3.9 branch.

@bedevere-bot bedevere-bot removed the needs backport to 3.9 only security fixes label Jan 1, 2021
miss-islington pushed 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 pushed 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 bedevere-bot removed the needs backport to 3.8 only security fixes label Jan 1, 2021
@bedevere-bot
Copy link

GH-24046 is a backport of this pull request to the 3.8 branch.

@bedevere-bot
Copy link

GH-24047 is a backport of this pull request to the 3.7 branch.

@miss-islington
Copy link
Contributor

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 pushed 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 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)
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)
02639c3 
(cherry picked from commit de6f20a)

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

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

@miss-islington
Copy link
Contributor

Thanks @corona10 for the PR 🌮🎉.. I'm working now to backport this PR to: 3.7.
🐍🍒⛏🤖

@miss-islington
Copy link
Contributor

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

@bedevere-bot
Copy link

GH-24052 is a backport of this pull request to the 3.7 branch.

@miss-islington
Copy link
Contributor

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 pushed 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

@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 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)
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

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)
415c4a1 
(cherry picked from commit de6f20a)

Co-authored-by: Dong-hee Na <donghee.na@python.org>
@corona10 corona10 deleted the happy_new_year branch January 2, 2021 06:20
@pombredanne
Copy link
Contributor

pombredanne commented Feb 2, 2021 •
edited

Reposting from:
de6f20a#diff-c693279643b8cd5d248172d9c22cb7cf4ed163a3c98c8a3f69c2717edd3eacb7R87

Could we stop making these constant changes to the license texts just for a new year? These really do not matter much. Constant changes (as in at least once per year) in the license texts make the downstream identification more complex and brings zero benefits IMHO.

adorilson pushed a commit to adorilson/cpython that referenced this pull request Mar 13, 2021
@corona10 @adorilson
Bring Python into the new year. (pythonGH-24036)
93f72a6
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@vstinner vstinner vstinner approved these changes

@benjaminp benjaminp Awaiting requested review from benjaminp

@pablogsal pablogsal Awaiting requested review from pablogsal

Assignees

@corona10 corona10

Labels
skip issue skip news
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
7 participants
@corona10 @vstinner @miss-islington @bedevere-bot @ned-deily @pombredanne @the-knights-who-say-ni