MNT Update ruff #30976

DimitriPapadopoulos · 2025-03-11T17:13:40Z

What does this implement/fix? Explain your changes.

Bump ruff from 0.5.1 to ~~0.9.10~~ 0.11.0
Update comments and URL associated to ruff

Any other comments?

github-actions · 2025-03-11T17:14:57Z

✔️ Linting Passed

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

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

adrinjalali · 2025-03-18T08:42:57Z

Could you please also check that pre-commit run --all-files actually passes on all tests?

DimitriPapadopoulos · 2025-03-18T11:58:45Z

Sure, I'll update to ruff 0.11.0 too while I'm at it.

DimitriPapadopoulos · 2025-03-18T12:24:31Z

I applied pre-commit to the whole code base, but fixes are actually unrelated to the initial PR.

$ pre-commit run -a
check yaml...............................................................Passed
fix end of files.........................................................Passed
trim trailing whitespace.................................................Passed
ruff.....................................................................Passed
black....................................................................Passed
mypy.....................................................................Passed
cython-lint..............................................................Passed
prettier.................................................................Passed
$

DimitriPapadopoulos · 2025-03-18T12:28:41Z

By the way, why not run pre-commit during CI?

adrinjalali · 2025-03-18T13:48:11Z

By the way, why not run pre-commit during CI?

I've been thinking the same. I wouldn't be opposed to that actually.

adrinjalali · 2025-03-18T13:49:18Z

sklearn/datasets/tests/test_samples_generator.py

@@ -112,7 +112,7 @@ def test_make_classification_informative_features():
        (2, [1 / 2] * 2, 2),
        (2, [3 / 4, 1 / 4], 2),
        (10, [1 / 3] * 3, 10),
-        (int(64), [1], 1),
+        ((64), [1], 1),


Suggested change

((64), [1], 1),

(64, [1], 1),

?

Indeed, but these are automatic fixes and neither ruff nor black seem to be catching this one. But then see my comment #30976 (comment). I suggest deferring pre-commit fixes to a different PR anyway.

adrinjalali · 2025-03-18T13:49:45Z

sklearn/externals/_arff.py

we should exclude everything in externals from linters.

Ignore lists are inconsistent between tools such as black and ruff and pre-commit:

scikit-learn/pyproject.toml

Lines 112 to 125 in d2dbcff

exclude = '''

/(

\.eggs # exclude a few common directories in the

| \.git # root of the project

| \.mypy_cache

| \.vscode

| build

| dist

| doc/_build

| doc/auto_examples

| sklearn/externals

| asv_benchmarks/env

)/

'''

scikit-learn/.pre-commit-config.yaml

Lines 14 to 17 in d2dbcff

- repo: https://github.com/psf/black

rev: 24.3.0

hooks:

- id: black

The problem is that pre-commit will explicitly run black, ruff and other tools on each individual file, without taking into account the filters in pryproject.toml. What happens then depends on whether tools such as black or ruff skip an explicit file argument if the file is part of its ignore list. Clearly black does not (psf/black#438?):

$ black sklearn/externals/_arff.py reformatted sklearn/externals/_arff.py All done! ✨ 🍰 ✨ 1 file reformatted. $

I suggest deferring pre-commit fixes to a different PR: pre-commit is currently broken and fixing it is unrelated to the initial intent of this PR.

DimitriPapadopoulos · 2025-03-18T13:55:50Z

By the way, why not run pre-commit during CI?

I've been thinking the same. I wouldn't be opposed to that actually.

A maintainer should authorize pre-commit.ci as an app in the settings of this repository:
https://pre-commit.ci/

DimitriPapadopoulos · 2025-03-18T14:56:43Z

Also, ruff and black are already run by Azure pipelines. It wouldn't make sense to run these tools both in pre-commit.ci and Azure pipelines.

DimitriPapadopoulos · 2025-03-18T15:01:50Z

I have reverted the pre-commit fixes. Please follow-up in #31013.

The linter really needed an update.

RUF007 Prefer `itertools.pairwise()` over `zip()` when iterating over successive pairs

RUF040 Non-string literal used as assert message

RUF046 Value being cast to `int` is already an integer

It will infer the Python version from pyproject.toml itself: requires-python = ">=3.10"

adrinjalali · 2025-03-24T08:55:45Z

A maintainer should authorize pre-commit.ci as an app in the settings of this repository:
https://pre-commit.ci/

I meant running pre-commit as a command in the CI, not the action. That action is a massive one, and rather not depend on it, and we also won't be using its capability of fixing issues in the PRs anyway.

DimitriPapadopoulos changed the title ~~MNT Updates around ruff~~ MNT Update ruff Mar 12, 2025

DimitriPapadopoulos force-pushed the updates branch from f78034c to d2ab2d2 Compare March 18, 2025 12:24

adrinjalali reviewed Mar 18, 2025

View reviewed changes

DimitriPapadopoulos force-pushed the updates branch 2 times, most recently from 2b1bf4e to 41f1acb Compare March 18, 2025 14:59

DimitriPapadopoulos mentioned this pull request Mar 18, 2025

MNT Fix pre-commit #31013

Merged

DimitriPapadopoulos force-pushed the updates branch from 41f1acb to 0267935 Compare March 18, 2025 15:35

DimitriPapadopoulos mentioned this pull request Mar 18, 2025

MNT Update black and ruff config to match min Python version #31016

Closed

DimitriPapadopoulos added 2 commits March 18, 2025 18:59

MNT Bump ruff

a9cf465

The linter really needed an update.

MNT Update ruff rules in preview and URL

255dcd8

DimitriPapadopoulos force-pushed the updates branch from ce35f28 to e992b1e Compare March 18, 2025 18:01

DimitriPapadopoulos added 4 commits March 18, 2025 19:12

Apply ruff rule RUF007

253bbcd

RUF007 Prefer `itertools.pairwise()` over `zip()` when iterating over successive pairs

MNT Apply ruff rule RUF040

c59dbf5

RUF040 Non-string literal used as assert message

MNT Apply ruff rule RUF046

8f89798

RUF046 Value being cast to `int` is already an integer

MNT let ruff infer the min Python

650d5c9

It will infer the Python version from pyproject.toml itself: requires-python = ">=3.10"

DimitriPapadopoulos force-pushed the updates branch from e992b1e to 650d5c9 Compare March 18, 2025 18:16

DimitriPapadopoulos mentioned this pull request Mar 18, 2025

MNT Update mypy #31018

Merged

MNT Bump Python in CircleCI to match min version

dea5100

DimitriPapadopoulos mentioned this pull request Mar 22, 2025

MNT black → ruff format #31015

Merged

adrinjalali added the No Changelog Needed label Mar 24, 2025

adrinjalali approved these changes Mar 24, 2025

View reviewed changes

adrinjalali merged commit 87d1e19 into scikit-learn:main Mar 24, 2025
36 of 37 checks passed

lucyleeow pushed a commit to lucyleeow/scikit-learn that referenced this pull request Apr 2, 2025

MNT Update ruff to 0.11.1 (scikit-learn#30976)

f13686e

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

MNT Update ruff #30976

MNT Update ruff #30976

DimitriPapadopoulos commented Mar 11, 2025 •

edited

Loading

github-actions bot commented Mar 11, 2025 •

edited

Loading

adrinjalali commented Mar 18, 2025

DimitriPapadopoulos commented Mar 18, 2025

DimitriPapadopoulos commented Mar 18, 2025 •

edited

Loading

DimitriPapadopoulos commented Mar 18, 2025

adrinjalali commented Mar 18, 2025

adrinjalali Mar 18, 2025

DimitriPapadopoulos Mar 18, 2025 •

edited

Loading

adrinjalali Mar 18, 2025

DimitriPapadopoulos Mar 18, 2025 •

edited

Loading

DimitriPapadopoulos commented Mar 18, 2025 •

edited

Loading

DimitriPapadopoulos commented Mar 18, 2025

DimitriPapadopoulos commented Mar 18, 2025

adrinjalali commented Mar 24, 2025

	exclude = '''
	/(
	\.eggs # exclude a few common directories in the
	\| \.git # root of the project
	\| \.mypy_cache
	\| \.vscode
	\| build
	\| dist
	\| doc/_build
	\| doc/auto_examples
	\| sklearn/externals
	\| asv_benchmarks/env
	)/
	'''

	- repo: https://github.com/psf/black
	rev: 24.3.0
	hooks:
	- id: black

MNT Update ruff #30976

MNT Update ruff #30976

Conversation

DimitriPapadopoulos commented Mar 11, 2025 • edited Loading

What does this implement/fix? Explain your changes.

Any other comments?

github-actions bot commented Mar 11, 2025 • edited Loading

✔️ Linting Passed

adrinjalali commented Mar 18, 2025

DimitriPapadopoulos commented Mar 18, 2025

DimitriPapadopoulos commented Mar 18, 2025 • edited Loading

DimitriPapadopoulos commented Mar 18, 2025

adrinjalali commented Mar 18, 2025

adrinjalali Mar 18, 2025

Choose a reason for hiding this comment

DimitriPapadopoulos Mar 18, 2025 • edited Loading

Choose a reason for hiding this comment

adrinjalali Mar 18, 2025

Choose a reason for hiding this comment

DimitriPapadopoulos Mar 18, 2025 • edited Loading

Choose a reason for hiding this comment

DimitriPapadopoulos commented Mar 18, 2025 • edited Loading

DimitriPapadopoulos commented Mar 18, 2025

DimitriPapadopoulos commented Mar 18, 2025

adrinjalali commented Mar 24, 2025

DimitriPapadopoulos commented Mar 11, 2025 •

edited

Loading

github-actions bot commented Mar 11, 2025 •

edited

Loading

DimitriPapadopoulos commented Mar 18, 2025 •

edited

Loading

DimitriPapadopoulos Mar 18, 2025 •

edited

Loading

DimitriPapadopoulos Mar 18, 2025 •

edited

Loading

DimitriPapadopoulos commented Mar 18, 2025 •

edited

Loading