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

Fix yapf-isort import formatting conflict #1822

Merged
merged 1 commit into from
Sep 18, 2020
Merged

Fix yapf-isort import formatting conflict #1822

merged 1 commit into from
Sep 18, 2020

Conversation

stefsmeets
Copy link
Contributor

@stefsmeets stefsmeets commented Sep 16, 2020 •
edited
Loading

Add trailing comma in isort config. Yapf respects the trailing comma and will not reformat the imports.
See: ESMValGroup/ESMValCore#777

Related to: ESMValGroup/ESMValCore#784

Tasks

  • Create an issue to discuss what you are going to do, if you haven't done so already (and add the link at the bottom)
  • Give this pull request a descriptive title that can be used as a one line summary in a changelog
  • Circle/CI tests pass. Status can be seen below your pull request. If the tests are failing, click the link to find out why.
  • Preferably Codacy code quality checks pass, however a few remaining hard to solve Codacy issues are still acceptable. Status can be seen below your pull request. If there is an error, click the link to find out why. If you suspect Codacy may be wrong, please ask by commenting.

@stefsmeets
Fix yapf-isort import formatting conflict
9420ed6 
Add trailing comma in isort config. Yapf respects the trailing comma
and will not reformat the imports.
See: ESMValGroup/ESMValCore#777
@stefsmeets stefsmeets marked this pull request as ready for review September 16, 2020 07:31
Peter9192
Peter9192 approved these changes Sep 16, 2020
View reviewed changes
Copy link
Contributor

@Peter9192 Peter9192 left a comment

Choose a reason for hiding this comment

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

I tried to create new conflicts, but it seems yapf is now happy with isort's adjustments 👍

@bouweandela bouweandela merged commit bdc8497 into master Sep 18, 2020
@bouweandela bouweandela deleted the fix-isort-yapf-conflict branch September 18, 2020 07:10
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Peter9192 Peter9192 Peter9192 approved these changes

@bouweandela bouweandela Awaiting requested review from bouweandela

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@stefsmeets @Peter9192 @bouweandela