MAINT Adds target_version to black config#20293
Merged
rth merged 1 commit intoscikit-learn:mainfrom Jun 17, 2021
Merged
Conversation
rth
approved these changes
Jun 17, 2021
Member
|
This is indeed consistent with discussion in psf/black#751 |
Member
Author
|
The CI is expected to fail because With #20294 merged the |
Member
|
Merging with @glemaitre's review in #20294 |
cmarmo
pushed a commit
to cmarmo/scikit-learn
that referenced
this pull request
Jun 19, 2021
thomasjpfan
added a commit
to MaxwellLZH/scikit-learn
that referenced
this pull request
Jun 19, 2021
samronsin
pushed a commit
to samronsin/scikit-learn
that referenced
this pull request
Jun 21, 2021
robert-robison
pushed a commit
to robert-robison/scikit-learn
that referenced
this pull request
Jun 22, 2021
glemaitre
pushed a commit
to glemaitre/scikit-learn
that referenced
this pull request
Jun 22, 2021
hongshaoyang
pushed a commit
to hongshaoyang/scikit-learn
that referenced
this pull request
Jun 23, 2021
adrinjalali
pushed a commit
to adrinjalali/scikit-learn
that referenced
this pull request
Jun 23, 2021
madhuracj
pushed a commit
to madhuracj/scikit-learn
that referenced
this pull request
Jun 24, 2021
wowry
pushed a commit
to wowry/scikit-learn
that referenced
this pull request
Jun 25, 2021
lorentzenchr
pushed a commit
to lorentzenchr/scikit-learn
that referenced
this pull request
Jun 26, 2021
jnothman
pushed a commit
to jnothman/scikit-learn
that referenced
this pull request
Jul 12, 2021
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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.
Reference Issues/PRs
Follow up to #20260
What does this implement/fix? Explain your changes.
I forgot to include this configuration option. It basically adds trailing commas which was only support for python >= 3.6. You can see the diff at: #20294
With this change I think we need to update the "how to deal with merge conflicts" with an extra step:
git merge --abortgit fetch upstreamgit merge 0e7761cdc4f244adb4803f1a97f0a9fe4b365a99git cherry-pick THIS_PRpip install black==21.6b0black .CC @ogrisel @rth