Skip to content

Mark all clinic headers as generated - #30679

Merged
miss-islington merged 2 commits into
python:mainfrom
erlend-aasland:git-clinic-attr
Jan 19, 2022
Merged

Mark all clinic headers as generated#30679
miss-islington merged 2 commits into
python:mainfrom
erlend-aasland:git-clinic-attr

Conversation

@erlend-aasland

@erlend-aaslanderlend-aasland commented Jan 19, 2022•
edited by miss-islington
Loading

Copy link
Copy Markdown
Contributor

Automerge-Triggered-By: GH:zware

@erlend-aasland

erlend-aasland commented Jan 19, 2022

Copy link
Copy Markdown
ContributorAuthor

The current pattern fails to catch Modules/_sqlite/clinic/*.h

@erlend-aaslanderlend-aasland changed the title Mark _all_ clinic headers as generatedMark all clinic headers as generatedJan 19, 2022
JelleZijlstra
JelleZijlstra reviewed Jan 19, 2022
View reviewed changes
Comment thread.gitattributes Outdated
Erlend Egeberg Aasland@JelleZijlstra
Update .gitattributes
3076541
Co-authored-by: Jelle Zijlstra <jelle.zijlstra@gmail.com>
@miss-islington
miss-islington merged commit 71734d0 into python:mainJan 19, 2022
@erlend-aasland
erlend-aasland deleted the git-clinic-attr branch January 19, 2022 21:54
@erlend-aasland

erlend-aasland commented Jan 20, 2022•
edited
Loading

Copy link
Copy Markdown
ContributorAuthor

Thanks for merging :) BTW, we should backport this to 3.10 and 3.9. Agreed, @zware?

@miss-islington

miss-islington commented Jan 20, 2022

Copy link
Copy Markdown
Contributor

Thanks @erlend-aasland for the PR 🌮🎉.. I'm working now to backport this PR to: 3.10.
🐍🍒⛏🤖

@miss-islington

miss-islington commented Jan 20, 2022

Copy link
Copy Markdown
Contributor

Thanks @erlend-aasland for the PR 🌮🎉.. I'm working now to backport this PR to: 3.9.
🐍🍒⛏🤖

@miss-islington

miss-islington commented Jan 20, 2022

Copy link
Copy Markdown
Contributor

Sorry @erlend-aasland, I had trouble checking out the 3.10 backport branch.
Please backport using cherry_picker on command line.
cherry_picker 71734d0b9ca584bcbdcb2fb44ae16bb2fbfcaf6e 3.10

@miss-islingtonmiss-islington self-assigned this Jan 20, 2022
@miss-islington

miss-islington commented Jan 20, 2022

Copy link
Copy Markdown
Contributor

Sorry, @erlend-aasland, I could not cleanly backport this to 3.9 due to a conflict.
Please backport using cherry_picker on command line.
cherry_picker 71734d0b9ca584bcbdcb2fb44ae16bb2fbfcaf6e 3.9

@bedevere-botbedevere-bot removed the needs backport to 3.10 only security fixes label Jan 20, 2022
@bedevere-bot

bedevere-bot commented Jan 20, 2022

Copy link
Copy Markdown

GH-30726 is a backport of this pull request to the 3.10 branch.

erlend-aasland pushed a commit to erlend-aasland/cpython that referenced this pull request Jan 20, 2022
Erlend Egeberg Aasland
[3.10] Mark all clinic headers as generated (pythonGH-30679).
96e30be
(cherry picked from commit 71734d0)
Co-authored-by: Erlend Egeberg Aasland <erlend.aasland@innova.no>
@bedevere-bot

bedevere-bot commented Jan 20, 2022

Copy link
Copy Markdown

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

erlend-aasland pushed a commit to erlend-aasland/cpython that referenced this pull request Jan 20, 2022
Erlend Egeberg Aasland
[3.9] Mark all clinic headers as generated (pythonGH-30679).
91b5eb4
(cherry picked from commit 71734d0)
Co-authored-by: Erlend Egeberg Aasland <erlend.aasland@innova.no>
miss-islington pushed a commit that referenced this pull request Jan 20, 2022
Erlend Egeberg Aasland
[3.10] Mark all clinic headers as generated (GH-30679). (GH-30726)
876ade1
(cherry picked from commit 71734d0)
Co-authored-by: Erlend Egeberg Aasland <erlend.aasland@innova.no>
miss-islington pushed a commit that referenced this pull request Jan 20, 2022
Erlend Egeberg Aasland
[3.9] Mark all clinic headers as generated (GH-30679). (GH-30728)
e8e71c4
(cherry picked from commit 71734d0)
Co-authored-by: Erlend Egeberg Aasland <erlend.aasland@innova.no>
hello-adam pushed a commit to hello-adam/cpython that referenced this pull request Jun 2, 2022
Erlend Egeberg Aasland@hello-adam
[3.9] Mark all clinic headers as generated (pythonGH-30679). (pythonG…
96f2591
…H-30728)
(cherry picked from commit 71734d0)
Co-authored-by: Erlend Egeberg Aasland <erlend.aasland@innova.no>
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@JelleZijlstraJelleZijlstraJelleZijlstra approved these changes
@zwarezwarezware approved these changes
@kumaraditya303kumaraditya303kumaraditya303 approved these changes
@ammaraskarammaraskarAwaiting requested review from ammaraskar

Assignees

@miss-islingtonmiss-islington

Labels

skip issueskip news

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

7 participants

@erlend-aasland@miss-islington@bedevere-bot@JelleZijlstra@zware@kumaraditya303@the-knights-who-say-ni