8000 MAINT Adds target_version to black config by thomasjpfan · Pull Request #20293 · scikit-learn/scikit-learn · GitHub
[go: up one dir, main page]
Skip to content

MAINT Adds target_version to black config #20293

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
Merged
merged 1 commit into from
Jun 17, 2021
Merged

MAINT Adds target_version to black config #20293

merged 1 commit into from
Jun 17, 2021

Conversation

thomasjpfan
Copy link
Member
@thomasjpfan thomasjpfan commented Jun 17, 2021 •
edited
Loading

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:

  1. git merge --abort
  2. git fetch upstream
  3. git merge 0e7761cdc4f244adb4803f1a97f0a9fe4b365a99
  4. New step: git cherry-pick THIS_PR
  5. pip install black==21.6b0
  6. black .
  7. Commit black formatted changes.
  8. Merge with main.

CC @ogrisel @rth

@thomasjpfan thomasjpfan mentioned this pull request Jun 17, 2021
Merged
@rth
Copy link
Member
rth commented Jun 17, 2021

This is indeed consistent with discussion in psf/black#751

@thomasjpfan
Copy link
Member Author

The CI is expected to fail because black --check . is using the new target_version. I do not want to run black . here because I want this PR to be easy to cherry-pick.

With #20294 merged the black --check . will pass again.

@rth
Copy link
Member
rth commented Jun 17, 2021

Merging with @glemaitre's review in #20294

@rth rth merged commit e8f58cd into scikit-learn:main Jun 17, 2021
cmarmo pushed a commit to cmarmo/scikit-learn that referenced this pull request Jun 19, 2021
@thomasjpfan @cmarmo
MAINT Adds target_version to black config (scikit-learn#20293)
c2c13a0
thomasjpfan added a commit to MaxwellLZH/scikit-learn that referenced this pull request Jun 19, 2021
@thomasjpfan
MAINT Adds target_version to black config (scikit-learn#20293)
67112fb
samronsin pushed a commit to samronsin/scikit-learn that referenced this pull request Jun 21, 2021
@thomasjpfan @samronsin
MAINT Adds target_version to black config (scikit-learn#20293)
c2e6e4e
robert-robison pushed a commit to robert-robison/scikit-learn that referenced this pull request Jun 22, 2021
@thomasjpfan @robert-robison
MAINT Adds target_version to black config (scikit-learn#20293)
a47784f
glemaitre pushed a commit to glemaitre/scikit-learn that referenced this pull request Jun 22, 2021
@thomasjpfan @glemaitre
MAINT Adds target_version to black config (scikit-learn#20293)
ef463a7
hongshaoyang pushed a commit to hongshaoyang/scikit-learn that referenced this pull request Jun 23, 2021
@thomasjpfan @hongshaoyang
MAINT Adds target_version to black config (scikit-learn#20293)
e7a5f37
adrinjalali pushed a commit to adrinjalali/scikit-learn that referenced this pull request Jun 23, 2021
@thomasjpfan @adrinjalali
MAINT Adds target_version to black config (scikit-learn#20293)
bce14b4
madhuracj pushed a commit to madhuracj/scikit-learn that referenced this pull request Jun 24, 2021
@thomasjpfan @madhuracj
MAINT Adds target_version to black config (scikit-learn#20293)
0e8a535
wowry pushed a commit to wowry/scikit-learn that referenced this pull request Jun 25, 2021
@thomasjpfan @wowry
MAINT Adds target_version to black config (scikit-learn#20293)
63a1bfa
lorentzenchr pushed a commit to lorentzenchr/scikit-learn that referenced this pull request Jun 26, 2021
@thomasjpfan @lorentzenchr
MAINT Adds target_version to black config (scikit-learn#20293)
b7aa297
jnothman pushed a commit to jnothman/scikit-learn that referenced this pull request Jul 12, 2021
@thomasjpfan @jnothman
MAINT Adds target_version to black config (scikit-learn#20293)
68798cb
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@rth rth rth approved these changes

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

Successfully merging this pull request may close these issues.
2 participants
@thomasjpfan @rth
0