Skip to content

MAINT: Use black#11667

Merged
larsoner merged 3 commits intomne-tools:mainfrom
larsoner:black
May 2, 2023
Merged

MAINT: Use black#11667
larsoner merged 3 commits intomne-tools:mainfrom
larsoner:black

Conversation

@larsoner
Copy link
Copy Markdown
Member

Closes #10641

I think it's time :) Happy to help with fixing any open PRs that need a rebase/merge fix. First step is to add to CIs and see that they fail :) Then I'll push a commit to fix all the files in the repo. Then I think we can merge, then add that commit to a new git blame skip file

@agramfort
Copy link
Copy Markdown
Member

so be it ! :)

@larsoner larsoner added this to the 1.4 milestone May 1, 2023
@larsoner larsoner force-pushed the black branch 2 times, most recently from 4001300 to 11911c0 Compare May 2, 2023 17:31
@larsoner larsoner marked this pull request as ready for review May 2, 2023 17:31
@larsoner
Copy link
Copy Markdown
Member Author

larsoner commented May 2, 2023

Okay this should be working. For anyone curious:

  • 97bbc37 enables black just in our CI checks and changes some files so that when black is run on them the noqas work as expected
  • e81ec52 is the huge commit to run black . (don't look at this commit unless you want your browser to cry)
  • 39abba0 11911c0 adds the .git-blame-ignore-revs file, adds mention of it to contributing.rst, and fixes get_testing_version.sh to respect the new double-quoting, EDIT: and adds the ignore file to MANIFEST.in ignores and fixes test_docstring_parameters.py, and fixed the docs animation embed limit

All devs should do git config --local blame.ignoreRevsFile .git-blame-ignore-revs locally after this if they want to use git blame effectively.

Once this is green, I will temporarily reenable merge-commiting for this repo, merge this PR that way (so that the git-blame-ignore-revs commit number is correct) then disable merge-committing again. Alternatively I could push these directly to main. Any preference @drammock ? Okay to proceed?

@drammock
Copy link
Copy Markdown
Member

drammock commented May 2, 2023

I was expecting/assuming a rebase merge would be needed for this so that's fine with me

@larsoner larsoner merged commit 16fe5b5 into mne-tools:main May 2, 2023
@larsoner larsoner deleted the black branch May 3, 2023 14:10
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

MAINT: Use black

3 participants