Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
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
Normalize files #2334
Normalize files #2334
Changes from 7 commits
2a94669
1a52d58
d5b1f56
eaf4676
178228b
849eb04
b2acae0
cea5452
File filter
Filter by extension
Conversations
Jump to
There are no files selected for viewing
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
should we add here also new GSOC branches?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Yes. This is already the case for the python-flake8 workflow on develop, but since this is on stable I missed it. Again, the issue of having two development branches.
I'll fix this up.EDIT: actually, this is something that needs to be fixed when merging stable into develop. flake8-builtins is also missing here and needs to be considered when merging.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
ok on the next merge of develop to stable we have a new major release and also both branches have a similiar test infrastructure.
And yes stable is the branch we do release from. We have a major develop branch and sometimes based on that other feature branches. That is no issue.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I am not sure if you misunderstood me. I was talking about the next merge from stable to develop, i.e. what should happen right after this PR has been merged, not on the next merge from develop to stable (a major release). These differences between the python-flake8.yml workflow on stable and the python-flake8.yml workflow on develop need to be accounted for in the merge of stable into develop.
This file was deleted.