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.

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

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

Merged
merged 10 commits into from Jan 21, 2022

Conversation

erlend-aasland
Copy link
Contributor

@erlend-aasland erlend-aasland commented Jan 21, 2022

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

Closes python/core-workflow#425

Automerge-Triggered-By: GH:zware

+ 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
Copy link
Contributor Author

@erlend-aasland erlend-aasland commented Jan 21, 2022

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

@erlend-aasland
Copy link
Contributor Author

@erlend-aasland erlend-aasland commented Jan 21, 2022

I'm considering adding a NEWS item for this.

@erlend-aasland erlend-aasland changed the title Mark generated files with diff=generated attribute Update generated files list and add diff=generated attribute Jan 21, 2022
@erlend-aasland
Copy link
Contributor Author

@erlend-aasland erlend-aasland commented Jan 21, 2022

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

@erlend-aasland
Copy link
Contributor Author

@erlend-aasland erlend-aasland commented Jan 21, 2022

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

Copy link
Member

@isidentical isidentical left a comment

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

Copy link
Contributor

@arhadthedev arhadthedev left a comment

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
Copy link
Contributor Author

@erlend-aasland erlend-aasland commented Jan 21, 2022

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 🕵🏻

.gitattributes Show resolved Hide resolved
zware
zware approved these changes Jan 21, 2022
.gitattributes Show resolved Hide resolved
.gitattributes Outdated Show resolved Hide resolved
@erlend-aasland
Copy link
Contributor Author

@erlend-aasland erlend-aasland commented Jan 21, 2022

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

.gitattributes Outdated Show resolved Hide resolved
.gitattributes Show resolved Hide resolved
.gitattributes Outdated Show resolved Hide resolved
@bedevere-bot
Copy link

@bedevere-bot bedevere-bot commented Jan 21, 2022

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.

@erlend-aasland erlend-aasland requested a review from zware Jan 21, 2022
zware
zware approved these changes Jan 21, 2022
@miss-islington
Copy link
Contributor

@miss-islington miss-islington commented Jan 21, 2022

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

@miss-islington miss-islington merged commit f1e559b into python:main Jan 21, 2022
11 checks passed
@erlend-aasland erlend-aasland deleted the git-diff branch Jan 21, 2022
erlend-aasland added a commit to erlend-aasland/cpython that referenced this issue Feb 11, 2022
…nGH-30745)

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

Closes python/core-workflow#425

Automerge-Triggered-By: GH:zware
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment