MNT Apply ruff/flake8-implicit-str-concat rules (ISC) #30695

DimitriPapadopoulos · 2025-01-21T23:48:43Z

What does this implement/fix? Explain your changes.

Applying rule ISC001 merges split string literals — usually as a result of black unfolding a line.

As for rule ISC003, it may appear it doesn't improve readability in some cases. However, I see such cases as black formatting issues.

Any other comments?

Not sure these rules should be enforced in CI, because I'm not certain they're always compatible with black.

[doc skip]

github-actions · 2025-01-21T23:49:57Z

✔️ Linting Passed

All linting checks passed. Your pull request is in excellent shape! ☀️

_{Generated for commit: eff954f. Link to the linter CI: here}

sklearn/tests/test_min_dependencies_readme.py

-        + r"(([A-Za-z]+\-?)+)"
-        + r"(MinVersion\| replace::)"
-        + r"( [0-9]+\.[0-9]+(\.[0-9]+)?)"
+        r"(([A-Za-z]+\-?)+)"


DimitriPapadopoulos · 2025-03-11T14:10:54Z

examples/mixture/plot_concentration_prior.py

@@ -116,7 +116,7 @@ def plot_results(ax1, ax2, estimator, X, y, title, plot_title=False):
        [0.001, 1, 1000],
    ),
    (
-        "Infinite mixture with a Dirichlet process\n prior and" r"$\gamma_0=$",
+        "Infinite mixture with a Dirichlet process\nprior and $\\gamma_0=$",


This one's debatable.

Note I've also removed an extra space for consistency with previous estimator.

adrinjalali

Otherwise LGTM

examples/mixture/plot_concentration_prior.py

sklearn/metrics/cluster/tests/test_supervised.py

ISC001 Implicitly concatenated string literals on one line

ISC003 Explicitly concatenated string should be implicitly concatenated

adrinjalali

Please avoid force pushing since it makes review harder. It's easier to have the whole history in the PR.

adrinjalali · 2025-03-18T13:54:20Z

I've also wondered about switching to ruff formatter instead of black. One less tool to handle.

DimitriPapadopoulos · 2025-03-18T14:25:46Z

Sure, I could switch to ruff format in a different PR.

EDIT: See #31015.

adrinjalali · 2025-03-18T15:30:55Z

@Charlie-XIAO maybe you could have a look? Should be an easy review.

Charlie-XIAO

This LGTM, thanks! I think we do need to fix CodeQL though.

sklearn/tests/test_min_dependencies_readme.py

Inefficient regular expression This part of the regular expression may cause exponential backtracking on strings starting with `.. |` and containing many repetitions of `A`. Co-authored-by: Yao Xiao <108576690+Charlie-XIAO@users.noreply.github.com>

sklearn/tests/test_min_dependencies_readme.py

This reverts commit 76b2c95.

* Enforce ruff rules (RUF) (scikit-learn#30694) * Apply ruff/flake8-implicit-str-concat rules (ISC) (scikit-learn#30695)

* Enforce ruff rules (RUF) (scikit-learn#30694) * Apply ruff/flake8-implicit-str-concat rules (ISC) (scikit-learn#30695) * black → ruff format (scikit-learn#31015)

DimitriPapadopoulos changed the title ~~Isc~~ MAINT Apply ruff/flake8-implicit-str-concat rules (ISC) Jan 21, 2025

github-advanced-security bot found potential problems Jan 21, 2025

View reviewed changes

DimitriPapadopoulos force-pushed the ISC branch from 038ed2d to 94bbc92 Compare January 21, 2025 23:52

DimitriPapadopoulos changed the title ~~MAINT Apply ruff/flake8-implicit-str-concat rules (ISC)~~ MNT Apply ruff/flake8-implicit-str-concat rules (ISC) Jan 21, 2025

DimitriPapadopoulos force-pushed the ISC branch 2 times, most recently from 2613932 to 8fedcdf Compare March 11, 2025 14:07

DimitriPapadopoulos commented Mar 11, 2025

View reviewed changes

DimitriPapadopoulos force-pushed the ISC branch from 8fedcdf to 039b8e5 Compare March 11, 2025 17:22

adrinjalali reviewed Mar 18, 2025

View reviewed changes

examples/mixture/plot_concentration_prior.py Outdated Show resolved Hide resolved

sklearn/metrics/cluster/tests/test_supervised.py Show resolved Hide resolved

DimitriPapadopoulos force-pushed the ISC branch from 039b8e5 to 09ff827 Compare March 18, 2025 12:39

DimitriPapadopoulos added 2 commits March 18, 2025 13:47

MNT Apply ruff/flake8-implicit-str-concat rule ISC001

b55e351

ISC001 Implicitly concatenated string literals on one line

MNT Apply ruff/flake8-implicit-str-concat rule ISC003

5a96c8e

ISC003 Explicitly concatenated string should be implicitly concatenated

DimitriPapadopoulos force-pushed the ISC branch from 09ff827 to 5a96c8e Compare March 18, 2025 12:47

adrinjalali approved these changes Mar 18, 2025

View reviewed changes

adrinjalali added the No Changelog Needed label Mar 18, 2025

DimitriPapadopoulos mentioned this pull request Mar 18, 2025

MNT black → ruff format #31015

Merged

Charlie-XIAO reviewed Mar 18, 2025

View reviewed changes

sklearn/tests/test_min_dependencies_readme.py Show resolved Hide resolved

MNT Fix CodeQL

76b2c95

Inefficient regular expression This part of the regular expression may cause exponential backtracking on strings starting with `.. |` and containing many repetitions of `A`. Co-authored-by: Yao Xiao <108576690+Charlie-XIAO@users.noreply.github.com>

github-advanced-security bot found potential problems Mar 18, 2025

View reviewed changes

sklearn/tests/test_min_dependencies_readme.py Fixed Show resolved Hide resolved

Revert "MNT Fix CodeQL"

eff954f

This reverts commit 76b2c95.

Charlie-XIAO approved these changes Mar 18, 2025

View reviewed changes

Charlie-XIAO merged commit 5cdbbf1 into scikit-learn:main Mar 18, 2025
32 of 33 checks passed

DimitriPapadopoulos deleted the ISC branch March 18, 2025 20:01

DimitriPapadopoulos added a commit to DimitriPapadopoulos/scikit-learn that referenced this pull request Mar 19, 2025

MNT git ignore recent black/ruff updates

cc98cc5

* Enforce ruff rules (RUF) (scikit-learn#30694) * Apply ruff/flake8-implicit-str-concat rules (ISC) (scikit-learn#30695)

DimitriPapadopoulos mentioned this pull request Mar 19, 2025

MNT git ignore recent black/ruff updates #31026

Merged

DimitriPapadopoulos added a commit to DimitriPapadopoulos/scikit-learn that referenced this pull request Mar 19, 2025

MNT git ignore recent black/ruff updates

cf06efd

* Enforce ruff rules (RUF) (scikit-learn#30694) * Apply ruff/flake8-implicit-str-concat rules (ISC) (scikit-learn#30695)

DimitriPapadopoulos added a commit to DimitriPapadopoulos/scikit-learn that referenced this pull request Mar 24, 2025

MNT git ignore recent black/ruff updates

03943a8

* Enforce ruff rules (RUF) (scikit-learn#30694) * Apply ruff/flake8-implicit-str-concat rules (ISC) (scikit-learn#30695)

DimitriPapadopoulos added a commit to DimitriPapadopoulos/scikit-learn that referenced this pull request Apr 15, 2025

MNT git ignore recent black/ruff updates

dc99887

* Enforce ruff rules (RUF) (scikit-learn#30694) * Apply ruff/flake8-implicit-str-concat rules (ISC) (scikit-learn#30695)

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

MNT Apply ruff/flake8-implicit-str-concat rules (ISC) #30695

MNT Apply ruff/flake8-implicit-str-concat rules (ISC) #30695

DimitriPapadopoulos commented Jan 21, 2025

github-actions bot commented Jan 21, 2025 •

edited

Loading

Check failure

DimitriPapadopoulos Mar 11, 2025 •

edited

Loading

adrinjalali left a comment

adrinjalali left a comment

adrinjalali commented Mar 18, 2025

DimitriPapadopoulos commented Mar 18, 2025 •

edited

Loading

adrinjalali commented Mar 18, 2025

Charlie-XIAO left a comment

MNT Apply ruff/flake8-implicit-str-concat rules (ISC) #30695

MNT Apply ruff/flake8-implicit-str-concat rules (ISC) #30695

Conversation

DimitriPapadopoulos commented Jan 21, 2025

What does this implement/fix? Explain your changes.

Any other comments?

github-actions bot commented Jan 21, 2025 • edited Loading

✔️ Linting Passed

Check failure

DimitriPapadopoulos Mar 11, 2025 • edited Loading

Choose a reason for hiding this comment

adrinjalali left a comment

Choose a reason for hiding this comment

adrinjalali left a comment

Choose a reason for hiding this comment

adrinjalali commented Mar 18, 2025

DimitriPapadopoulos commented Mar 18, 2025 • edited Loading

adrinjalali commented Mar 18, 2025

Charlie-XIAO left a comment

Choose a reason for hiding this comment

github-actions bot commented Jan 21, 2025 •

edited

Loading

DimitriPapadopoulos Mar 11, 2025 •

edited

Loading

DimitriPapadopoulos commented Mar 18, 2025 •

edited

Loading