[flake8-pyi] Stabilize: include all python file types for PYI006 (#…

…15340)
astral-sh · Jan 8, 2025 · 1d66c9f · 1d66c9f
1 parent 7913a89
commit 1d66c9f
Show file tree

Hide file tree

Showing 7 changed files with 101 additions and 185 deletions.
diff --git a/crates/ruff_linter/src/checkers/ast/analyze/statement.rs b/crates/ruff_linter/src/checkers/ast/analyze/statement.rs
@@ -1199,40 +1199,38 @@ pub(crate) fn statement(stmt: &Stmt, checker: &mut Checker) {
                 }
             }
             if checker.any_enabled(&[Rule::BadVersionInfoComparison, Rule::BadVersionInfoOrder]) {
-                if checker.source_type.is_stub() || checker.settings.preview.is_enabled() {
-                    fn bad_version_info_comparison(
-                        checker: &mut Checker,
-                        test: &Expr,
-                        has_else_clause: bool,
-                    ) {
-                        if let Expr::BoolOp(ast::ExprBoolOp { values, .. }) = test {
-                            for value in values {
-                                flake8_pyi::rules::bad_version_info_comparison(
-                                    checker,
-                                    value,
-                                    has_else_clause,
-                                );
-                            }
-                        } else {
+                fn bad_version_info_comparison(
+                    checker: &mut Checker,
+                    test: &Expr,
+                    has_else_clause: bool,
+                ) {
+                    if let Expr::BoolOp(ast::ExprBoolOp { values, .. }) = test {
+                        for value in values {
                             flake8_pyi::rules::bad_version_info_comparison(
                                 checker,
-                                test,
+                                value,
                                 has_else_clause,
                             );
                         }
+                    } else {
+                        flake8_pyi::rules::bad_version_info_comparison(
+                            checker,
+                            test,
+                            has_else_clause,
+                        );
                     }
+                }
 
-                    let has_else_clause =
-                        elif_else_clauses.iter().any(|clause| clause.test.is_none());
+                let has_else_clause = elif_else_clauses.iter().any(|clause| clause.test.is_none());
 
-                    bad_version_info_comparison(checker, test.as_ref(), has_else_clause);
-                    for clause in elif_else_clauses {
-                        if let Some(test) = clause.test.as_ref() {
-                            bad_version_info_comparison(checker, test, has_else_clause);
-                        }
+                bad_version_info_comparison(checker, test.as_ref(), has_else_clause);
+                for clause in elif_else_clauses {
+                    if let Some(test) = clause.test.as_ref() {
+                        bad_version_info_comparison(checker, test, has_else_clause);
                     }
                 }
             }
+
             if checker.enabled(Rule::IfKeyInDictDel) {
                 ruff::rules::if_key_in_dict_del(checker, if_);
             }

diff --git a/crates/ruff_linter/src/rules/flake8_pyi/mod.rs b/crates/ruff_linter/src/rules/flake8_pyi/mod.rs
@@ -187,8 +187,6 @@ mod tests {
     }
 
     #[test_case(Rule::FutureAnnotationsInStub, Path::new("PYI044.pyi"))]
-    #[test_case(Rule::BadVersionInfoComparison, Path::new("PYI006.py"))]
-    #[test_case(Rule::BadVersionInfoComparison, Path::new("PYI006.pyi"))]
     fn preview_rules(rule_code: Rule, path: &Path) -> Result<()> {
         let snapshot = format!(
             "preview__{}_{}",

diff --git a/crates/ruff_linter/src/rules/flake8_pyi/rules/bad_version_info_comparison.rs b/crates/ruff_linter/src/rules/flake8_pyi/rules/bad_version_info_comparison.rs
@@ -9,7 +9,7 @@ use crate::registry::Rule;
 
 /// ## What it does
 /// Checks for uses of comparators other than `<` and `>=` for
-/// `sys.version_info` checks in `.pyi` files. All other comparators, such
+/// `sys.version_info` checks. All other comparators, such
 /// as `>`, `<=`, and `==`, are banned.
 ///
 /// ## Why is this bad?
@@ -34,17 +34,15 @@ use crate::registry::Rule;
 /// False
 /// ```
 ///
-/// In [preview], this rule will also flag non-stub files.
-///
 /// ## Example
-/// ```pyi
+/// ```py
 /// import sys
 ///
 /// if sys.version_info > (3, 8): ...
 /// ```
 ///
 /// Use instead:
-/// ```pyi
+/// ```py
 /// import sys
 ///
 /// if sys.version_info >= (3, 9): ...
@@ -144,7 +142,10 @@ pub(crate) fn bad_version_info_comparison(
     }
 
     if matches!(op, CmpOp::Lt) {
-        if checker.enabled(Rule::BadVersionInfoOrder) {
+        if checker.enabled(Rule::BadVersionInfoOrder)
+            // See https://github.com/astral-sh/ruff/issues/15347
+            && (checker.source_type.is_stub() || checker.settings.preview.is_enabled())
+        {
             if has_else_clause {
                 checker
                     .diagnostics

diff --git a/...c/rules/flake8_pyi/snapshots/ruff_linter__rules__flake8_pyi__tests__PYI006_PYI006.py.snap b/...c/rules/flake8_pyi/snapshots/ruff_linter__rules__flake8_pyi__tests__PYI006_PYI006.py.snap
@@ -2,4 +2,76 @@
 source: crates/ruff_linter/src/rules/flake8_pyi/mod.rs
 snapshot_kind: text
 ---
+PYI006.py:8:4: PYI006 Use `<` or `>=` for `sys.version_info` comparisons
+   |
+ 6 | if sys.version_info >= (3, 9): ...  # OK
+ 7 | 
+ 8 | if sys.version_info == (3, 9): ...  # OK
+   |    ^^^^^^^^^^^^^^^^^^^^^^^^^^ PYI006
+ 9 | 
+10 | if sys.version_info == (3, 9): ...  # Error: PYI006 Use only `<` and `>=` for version info comparisons
+   |
 
+PYI006.py:10:4: PYI006 Use `<` or `>=` for `sys.version_info` comparisons
+   |
+ 8 | if sys.version_info == (3, 9): ...  # OK
+ 9 | 
+10 | if sys.version_info == (3, 9): ...  # Error: PYI006 Use only `<` and `>=` for version info comparisons
+   |    ^^^^^^^^^^^^^^^^^^^^^^^^^^ PYI006
+11 | 
+12 | if sys.version_info <= (3, 10): ...  # Error: PYI006 Use only `<` and `>=` for version info comparisons
+   |
+
+PYI006.py:12:4: PYI006 Use `<` or `>=` for `sys.version_info` comparisons
+   |
+10 | if sys.version_info == (3, 9): ...  # Error: PYI006 Use only `<` and `>=` for version info comparisons
+11 | 
+12 | if sys.version_info <= (3, 10): ...  # Error: PYI006 Use only `<` and `>=` for version info comparisons
+   |    ^^^^^^^^^^^^^^^^^^^^^^^^^^^ PYI006
+13 | 
+14 | if sys.version_info <= (3, 10): ...  # Error: PYI006 Use only `<` and `>=` for version info comparisons
+   |
+
+PYI006.py:14:4: PYI006 Use `<` or `>=` for `sys.version_info` comparisons
+   |
+12 | if sys.version_info <= (3, 10): ...  # Error: PYI006 Use only `<` and `>=` for version info comparisons
+13 | 
+14 | if sys.version_info <= (3, 10): ...  # Error: PYI006 Use only `<` and `>=` for version info comparisons
+   |    ^^^^^^^^^^^^^^^^^^^^^^^^^^^ PYI006
+15 | 
+16 | if sys.version_info > (3, 10): ...  # Error: PYI006 Use only `<` and `>=` for version info comparisons
+   |
+
+PYI006.py:16:4: PYI006 Use `<` or `>=` for `sys.version_info` comparisons
+   |
+14 | if sys.version_info <= (3, 10): ...  # Error: PYI006 Use only `<` and `>=` for version info comparisons
+15 | 
+16 | if sys.version_info > (3, 10): ...  # Error: PYI006 Use only `<` and `>=` for version info comparisons
+   |    ^^^^^^^^^^^^^^^^^^^^^^^^^^ PYI006
+17 | elif sys.version_info > (3, 11): ...  # Error: PYI006 Use only `<` and `>=` for version info comparisons
+   |
+
+PYI006.py:17:6: PYI006 Use `<` or `>=` for `sys.version_info` comparisons
+   |
+16 | if sys.version_info > (3, 10): ...  # Error: PYI006 Use only `<` and `>=` for version info comparisons
+17 | elif sys.version_info > (3, 11): ...  # Error: PYI006 Use only `<` and `>=` for version info comparisons
+   |      ^^^^^^^^^^^^^^^^^^^^^^^^^^ PYI006
+18 | 
+19 | if python_version > (3, 10): ...  # Error: PYI006 Use only `<` and `>=` for version info comparisons
+   |
+
+PYI006.py:19:4: PYI006 Use `<` or `>=` for `sys.version_info` comparisons
+   |
+17 | elif sys.version_info > (3, 11): ...  # Error: PYI006 Use only `<` and `>=` for version info comparisons
+18 | 
+19 | if python_version > (3, 10): ...  # Error: PYI006 Use only `<` and `>=` for version info comparisons
+   |    ^^^^^^^^^^^^^^^^^^^^^^^^ PYI006
+20 | elif python_version == (3, 11): ...  # Error: PYI006 Use only `<` and `>=` for version info comparisons
+   |
+
+PYI006.py:20:6: PYI006 Use `<` or `>=` for `sys.version_info` comparisons
+   |
+19 | if python_version > (3, 10): ...  # Error: PYI006 Use only `<` and `>=` for version info comparisons
+20 | elif python_version == (3, 11): ...  # Error: PYI006 Use only `<` and `>=` for version info comparisons
+   |      ^^^^^^^^^^^^^^^^^^^^^^^^^ PYI006
+   |
diff --git a/.../rules/flake8_pyi/snapshots/ruff_linter__rules__flake8_pyi__tests__PYI066_PYI066.pyi.snap b/.../rules/flake8_pyi/snapshots/ruff_linter__rules__flake8_pyi__tests__PYI066_PYI066.pyi.snap
@@ -1,5 +1,6 @@
 ---
 source: crates/ruff_linter/src/rules/flake8_pyi/mod.rs
+snapshot_kind: text
 ---
 PYI066.pyi:3:4: PYI066 Put branches for newer Python versions first when branching on `sys.version_info` comparisons
   |

diff --git a/...lake8_pyi/snapshots/ruff_linter__rules__flake8_pyi__tests__preview__PYI006_PYI006.py.snap b/...lake8_pyi/snapshots/ruff_linter__rules__flake8_pyi__tests__preview__PYI006_PYI006.py.snap
diff --git a/...ake8_pyi/snapshots/ruff_linter__rules__flake8_pyi__tests__preview__PYI006_PYI006.pyi.snap b/...ake8_pyi/snapshots/ruff_linter__rules__flake8_pyi__tests__preview__PYI006_PYI006.pyi.snap