Skip to content

Update generated files list and add diff=generated attribute - #30745

Merged
miss-islington merged 10 commits into
python:mainfrom
erlend-aasland:git-diff
Jan 21, 2022
Merged

Update generated files list and add diff=generated attribute#30745
miss-islington merged 10 commits into
python:mainfrom
erlend-aasland:git-diff

Conversation

@erlend-aasland

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

Copy link
Copy Markdown
Contributor

As a side effect, the list of generated files is relocated after the language aware diff settings.

Closespython/core-workflow#425

Automerge-Triggered-By: GH:zware

Erlend E. Aasland added 3 commits January 21, 2022 13:45
Erlend E. Aasland
Sort
4d07692
Erlend E. Aasland
Add missing Modules/config.c
1022187
Erlend E. Aasland
Add missing generated files:
e81edae
+ Include/internal/pycore_ast_state.h
+ Lib/keyword.py
+ Parser/parser.c
+ Python/Python-ast.c
+ Python/stdlib_module_names.h
+ Tools/peg_generator/pegen/grammar_parser.py
@erlend-aasland

erlend-aasland commented Jan 21, 2022

Copy link
Copy Markdown
ContributorAuthor

FYI @isidentical, I added some of the missing generated files, mostly related to the parser.

@erlend-aasland

erlend-aasland commented Jan 21, 2022•
edited
Loading

Copy link
Copy Markdown
ContributorAuthor

I'm considering adding a NEWS item for this.

@erlend-aaslanderlend-aasland changed the title Mark generated files with diff=generated attributeUpdate generated files list and add diff=generated attributeJan 21, 2022
@isidenticalisidentical mentioned this pull request Jan 21, 2022
Closed
@arhadthedevarhadthedev mentioned this pull request Jan 21, 2022
Closed
@erlend-aasland

erlend-aasland commented Jan 21, 2022

Copy link
Copy Markdown
ContributorAuthor

Added configure and aclocal.m4 as well (this PR now superseeds #30031). I think that covers everything :)

@erlend-aasland

erlend-aasland commented Jan 21, 2022

Copy link
Copy Markdown
ContributorAuthor

cc. @arhadthedev (I can't directly request your review on the PR)

isidentical
isidentical approved these changes Jan 21, 2022
View reviewed changes

@isidenticalisidentical left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Thanks for the PR @erlend-aasland, LGTM. Assuming this includes everything from our make regen-all targets

arhadthedev
arhadthedev approved these changes Jan 21, 2022
View reviewed changes

@arhadthedevarhadthedev left a comment •
edited
Loading

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Looks good to me, I have no objection on who successfully pushes a solution to a problem.

By the way, what does diff=generated do? Google returned nothing relevant for git diff generated; grepping the repository gives lots of clutter as well. Edit: I found the answer in python/core-workflow#425.

@erlend-aasland

erlend-aasland commented Jan 21, 2022

Copy link
Copy Markdown
ContributorAuthor

Thanks for the PR @erlend-aasland, LGTM. Assuming this includes everything from our make regen-all targets

I went through the Makefile twice, but I may have overlooked something. Feel free to double check 🕵🏻

vstinner
vstinner reviewed Jan 21, 2022
View reviewed changes
Comment thread.gitattributes
zware
zware approved these changes Jan 21, 2022
View reviewed changes
Comment thread.gitattributes
Comment thread.gitattributes Outdated
@erlend-aasland

erlend-aasland commented Jan 21, 2022

Copy link
Copy Markdown
ContributorAuthor

IMO, I don't think it is worth the hassle to backport this. Cry out if you disagree.

zware
zware requested changes Jan 21, 2022
View reviewed changes
Comment thread.gitattributes Outdated
Comment thread.gitattributes
Comment thread.gitattributes Outdated
@bedevere-bot

bedevere-bot commented Jan 21, 2022

Copy link
Copy Markdown

A Python core developer has requested some changes be made to your pull request before we can consider merging it. If you could please address their requests along with any other requests in other reviews from core developers that would be appreciated.

Once you have made the requested changes, please leave a comment on this pull request containing the phrase I have made the requested changes; please review again. I will then notify any core developers who have left a review that you're ready for them to take another look at this pull request.

@miss-islington

miss-islington commented Jan 21, 2022

Copy link
Copy Markdown
Contributor

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

@miss-islington
miss-islington merged commit f1e559b into python:mainJan 21, 2022
@zwarezware mentioned this pull request Jan 21, 2022
Closed
@erlend-aasland
erlend-aasland deleted the git-diff branch January 21, 2022 21:04
@erlend-aaslanderlend-aasland mentioned this pull request Jan 21, 2022
Closed
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@vstinnervstinnervstinner left review comments
@arhadthedevarhadthedevarhadthedev approved these changes
@zwarezwarezware approved these changes
@isidenticalisidenticalisidentical approved these changes
@ambvambvAwaiting requested review from ambv

Assignees

No one assigned

Labels

skip issueskip news

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

Mark generated files with custom generated git diff driver

8 participants

@erlend-aasland@bedevere-bot@miss-islington@vstinner@arhadthedev@zware@isidentical@the-knights-who-say-ni