Ignore deprecated rules unless selected by exact code #20167

LoicRiegel · 2025-08-30T14:45:35Z

Summary

After this change:

All deprecated rules are deselected by default
They are only selected if the user specifically selects them by code, e.g. --select UP038
Thus, --select ALL --select UP --select UP0 won't select the deprecated rule UP038
Documented the change in version policy. From now on, deprecating a rule should increase the minor version

Test Plan

Integration tests in "integration_tests.rs"

Also tested with a temporary test package:

~> ../../ruff/target/debug/ruff.exe check --select UP038
warning: Rule `UP038` is deprecated and will be removed in a future release.
warning: Detected debug build without --no-cache.
UP038 Use `X | Y` in `isinstance` call instead of `(X, Y)`
 --> main.py:2:11
  |
1 | def main():
2 |     print(isinstance(25, (str, int)))
  |           ^^^^^^^^^^^^^^^^^^^^^^^^^^
  |
help: Convert to `X | Y`

Found 1 error.
No fixes available (1 hidden fix can be enabled with the `--unsafe-fixes` option).

~> ../../ruff/target/debug/ruff.exe check --select UP03
warning: Detected debug build without --no-cache.
All checks passed!

~> ../../ruff/target/debug/ruff.exe check --select UP0
warning: Detected debug build without --no-cache.
All checks passed!

~> ../../ruff/target/debug/ruff.exe check --select UP
warning: Detected debug build without --no-cache.
All checks passed!

~> ../../ruff/target/debug/ruff.exe check --select ALL
# warnings and errors, but because of other errors, UP038 was deselected

…in a minor version increase

ntBre

Thank you! The code and docs changes look good to me, I just had a few nits about the tests.

ntBre · 2025-09-03T14:56:36Z

crates/ruff/tests/integration_test.rs

+fn deprecated_selected_exact() {
+    // A deprecated rule should be included if selected by exact code


This is a pretty small nit, but I'd lean toward not changing any names or comments unless they're really outdated. I think this case, and deprecated_multiple_direct at least were okay with the old names.

ntBre · 2025-09-03T14:58:08Z

crates/ruff/tests/integration_test.rs

+fn deprecated_selected_prefix() {
+    // A deprecated rule should not be included if selected by rule prefix


Similar to the above, I think the name here was okay. But the new comment makes sense to me given the changed test result.

ntBre · 2025-09-03T15:00:14Z

crates/ruff/tests/integration_test.rs

@@ -1549,38 +1542,38 @@ fn deprecated_direct_preview_enabled() {
 }

 #[test]
-fn deprecated_indirect_preview_enabled() {
-    // `RUF920` is deprecated and should be off by default in preview.
+fn deprecated_selected_exact_multiple_preview_enabled() {


I'd kind of prefer to preserve the existing tests and add new ones rather than modify these, unless they're now redundant with other tests. Is that the case?

ntBre · 2025-09-03T15:07:21Z

I also labeled this breaking, as Micha mentioned here. But we're preparing for a minor release next week, so we can merge this into the release branch instead of main. GitHub warned me that changing the base branch might remove review comments, though, so I held off for now.

github-actions · 2025-09-03T15:16:24Z

`ruff-ecosystem` results

Linter (stable)

ℹ️ ecosystem check detected linter changes. (+0 -1 violations, +0 -0 fixes in 1 projects; 54 projects unchanged)

rotki/rotki (+0 -1 violations, +0 -0 fixes)

- rotkehlchen/externalapis/blockscout.py:205:40: UP038 Use `X | Y` in `isinstance` call instead of `(X, Y)`

Changes by rule (1 rules affected)

code	total	+ violation	- violation	+ fix	- fix
UP038	1	0	1	0	0

Linter (preview)

✅ ecosystem check detected no linter changes.

LoicRiegel · 2025-09-03T15:23:27Z

Thank you for the review, I will make the changes now.
Do you want me to keep the commit history clean, or will you squash everything anyway?

ntBre · 2025-09-03T15:25:11Z

Thank you! We'll squash everything when merging, so it's actually a bit easier to review if you push additional commits, in my opinion

LoicRiegel · 2025-09-03T21:41:52Z

I just pushed three commits where

I reverted the tests to the way they were
Wrote comments for all tests concerned by this change so they are more precise and all consistent
I swapped two tests to make the order consistent, I hope that's okay

Tell me if everything's alright now :)

ntBre

Thanks! Just a few more test suggestions to reduce the diff a bit more. I have a better understanding of the tests now and think they mostly still look relevant in their original form.

crates/ruff/tests/integration_test.rs

This reverts commit 97131ad.

This reverts commit 8f18183.

LoicRiegel · 2025-09-07T11:21:52Z

Thanks! Just a few more test suggestions to reduce the diff a bit more. I have a better understanding of the tests now and think they mostly still look relevant in their original form.

Done :)
Now the diff is as small as it can be :)

ntBre

Thank you!

## Summary Closes #18349 After this change: - All deprecated rules are deselected by default - They are only selected if the user specifically selects them by code, e.g. `--select UP038` - Thus, `--select ALL --select UP --select UP0` won't select the deprecated rule UP038 - Documented the change in version policy. From now on, deprecating a rule should increase the minor version ## Test Plan Integration tests in "integration_tests.rs" Also tested with a temporary test package: ``` ~> ../../ruff/target/debug/ruff.exe check --select UP038 warning: Rule `UP038` is deprecated and will be removed in a future release. warning: Detected debug build without --no-cache. UP038 Use `X | Y` in `isinstance` call instead of `(X, Y)` --> main.py:2:11 | 1 | def main(): 2 | print(isinstance(25, (str, int))) | ^^^^^^^^^^^^^^^^^^^^^^^^^^ | help: Convert to `X | Y` Found 1 error. No fixes available (1 hidden fix can be enabled with the `--unsafe-fixes` option). ~> ../../ruff/target/debug/ruff.exe check --select UP03 warning: Detected debug build without --no-cache. All checks passed! ~> ../../ruff/target/debug/ruff.exe check --select UP0 warning: Detected debug build without --no-cache. All checks passed! ~> ../../ruff/target/debug/ruff.exe check --select UP warning: Detected debug build without --no-cache. All checks passed! ~> ../../ruff/target/debug/ruff.exe check --select ALL # warnings and errors, but because of other errors, UP038 was deselected ```

* main: (26 commits) Ignore deprecated rules unless selected by exact code (#20167) Stabilize adding future import via config option (#20277) [`flake8-errmsg`] Stabilize extending `raw-string-in-exception` (`EM101`) to support byte strings (#20273) Stabilize the remaining Airflow rules (#20250) [`flake8-bugbear`] Stabilize support for non-context-manager calls in `assert-raises-exception` (`B017`) (#20274) [`flake8-commas`] Stabilize support for trailing comma checks in type parameter lists (`COM812`, `COM819`) (#20275) [`pygrep_hooks`] Stabilize using`AsyncMock` methods in `invalid-mock-access` (`PGH005`) (#20272) Stabilize new strategy for classifying imports as first party (#20268) [`pylint`] Stabilize ignoring `__init__.py` for `useless-import-alias` (`PLC0414`) (#20271) [`pylint`] Stabilize adding U+061C to `bidirectional-unicode` (`PLE2502`) (#20276) [`flake8-simplify`] Stabilize fix safety of `multiple-with-statements` (`SIM117`) (#20270) Stabilize `pytest-raises-ambiguous-pattern` (`RUF043`) (#20253) Stabilize `f-string-number-format` (`FURB116`) (#20247) [`pyupgrade`] Remove `non-pep604-isinstance` (`UP038`) (#19156) [`pandas-vet`] Remove `pandas-df-variable-name` (`PD901`) (#19223) Remove deprecated macOS config file discovery (#19210) Stabilize `redundant-none-literal` (`PYI061`) (#20236) Stabilize `generic-not-last-base-class` (`PYI059`) (#20246) Stabilize `useless-class-metaclass-type` (`UP050`) (#20230) Stabilize `os-symlink` (`PTH211`) (#20229) ...

LoicRiegel added 2 commits August 30, 2025 14:17

docs: versioning policy states that a rule deprecation should result …

6fd6e0e

…in a minor version increase

feat: exclude deprecated rules by default unless selected by exact code

b3b1419

ntBre added this to the v0.13 milestone Sep 3, 2025

ntBre reviewed Sep 3, 2025

View reviewed changes

ntBre added breaking Breaking API change cli Related to the command-line interface labels Sep 3, 2025

LoicRiegel added 3 commits September 3, 2025 23:36

revert tests

13578a7

harmonize test comments

8f18183

reorder tests for consistency

97131ad

ntBre reviewed Sep 5, 2025

View reviewed changes

LoicRiegel added 4 commits September 7, 2025 12:54

Revert "reorder tests for consistency"

e0f217c

This reverts commit 97131ad.

Revert "harmonize test comments"

5fe9232

This reverts commit 8f18183.

fix tests

3229f3d

add comment in test

072c7bf

ntBre approved these changes Sep 8, 2025

View reviewed changes

ntBre changed the title ~~Feat/ignore deprecated rules by unless selected by exact code~~ Ignore deprecated rules unless selected by exact code Sep 8, 2025

ntBre changed the base branch from main to brent/0.13.0 September 8, 2025 15:59

ntBre merged commit 4149d64 into astral-sh:brent/0.13.0 Sep 8, 2025
35 checks passed

ntBre mentioned this pull request Sep 8, 2025

Ruff 0.13 #20194

Merged

2 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Ignore deprecated rules unless selected by exact code #20167

Ignore deprecated rules unless selected by exact code #20167

Uh oh!

LoicRiegel commented Aug 30, 2025

Uh oh!

ntBre left a comment

Uh oh!

ntBre Sep 3, 2025

Uh oh!

ntBre Sep 3, 2025

Uh oh!

ntBre Sep 3, 2025

Uh oh!

ntBre commented Sep 3, 2025

Uh oh!

github-actions bot commented Sep 3, 2025 •

edited

Loading

Uh oh!

LoicRiegel commented Sep 3, 2025

Uh oh!

ntBre commented Sep 3, 2025

Uh oh!

LoicRiegel commented Sep 3, 2025

Uh oh!

ntBre left a comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

LoicRiegel commented Sep 7, 2025

Uh oh!

ntBre left a comment

Uh oh!

Uh oh!

Uh oh!

		fn deprecated_selected_exact() {
		// A deprecated rule should be included if selected by exact code

		fn deprecated_selected_prefix() {
		// A deprecated rule should not be included if selected by rule prefix

Ignore deprecated rules unless selected by exact code #20167

Ignore deprecated rules unless selected by exact code #20167

Uh oh!

Conversation

LoicRiegel commented Aug 30, 2025

Summary

Test Plan

Uh oh!

ntBre left a comment

Choose a reason for hiding this comment

Uh oh!

ntBre Sep 3, 2025

Choose a reason for hiding this comment

Uh oh!

ntBre Sep 3, 2025

Choose a reason for hiding this comment

Uh oh!

ntBre Sep 3, 2025

Choose a reason for hiding this comment

Uh oh!

ntBre commented Sep 3, 2025

Uh oh!

github-actions bot commented Sep 3, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

ruff-ecosystem results

Linter (stable)

Linter (preview)

Uh oh!

LoicRiegel commented Sep 3, 2025

Uh oh!

ntBre commented Sep 3, 2025

Uh oh!

LoicRiegel commented Sep 3, 2025

Uh oh!

ntBre left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

LoicRiegel commented Sep 7, 2025

Uh oh!

ntBre left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

github-actions bot commented Sep 3, 2025 •

edited

Loading

`ruff-ecosystem` results