Ruff 0.10

.github/workflows/build-docker.yml

@@ -163,7 +163,7 @@ jobs:
         # Mapping of base image followed by a comma followed by one or more base tags (comma separated)
         # Note, org.opencontainers.image.version label will use the first base tag (use the most specific tag first)
         image-mapping:
-          - alpine:3.20,alpine3.20,alpine
+          - alpine:3.21,alpine3.21,alpine
           - debian:bookworm-slim,bookworm-slim,debian-slim
           - buildpack-deps:bookworm,bookworm,debian
     steps:

crates/ruff/tests/lint.rs

@@ -2470,7 +2470,7 @@ fn create_a005_module_structure(tempdir: &TempDir) -> Result<()> {
     Ok(())
 }
 
-/// Test A005 with `builtins-strict-checking = true`
+/// Test A005 with `strict-checking = true`
 #[test]
 fn a005_module_shadowing_strict() -> Result<()> {
     let tempdir = TempDir::new()?;
@@ -2482,7 +2482,7 @@ fn a005_module_shadowing_strict() -> Result<()> {
         assert_cmd_snapshot!(Command::new(get_cargo_bin(BIN_NAME))
             .args(STDIN_BASE_OPTIONS)
             .arg("--config")
-            .arg(r#"lint.flake8-builtins.builtins-strict-checking = true"#)
+            .arg(r#"lint.flake8-builtins.strict-checking = true"#)
             .args(["--select", "A005"])
             .current_dir(tempdir.path()),
             @r"
@@ -2504,7 +2504,7 @@ fn a005_module_shadowing_strict() -> Result<()> {
     Ok(())
 }
 
-/// Test A005 with `builtins-strict-checking = false`
+/// Test A005 with `strict-checking = false`
 #[test]
 fn a005_module_shadowing_non_strict() -> Result<()> {
     let tempdir = TempDir::new()?;
@@ -2516,7 +2516,7 @@ fn a005_module_shadowing_non_strict() -> Result<()> {
         assert_cmd_snapshot!(Command::new(get_cargo_bin(BIN_NAME))
             .args(STDIN_BASE_OPTIONS)
             .arg("--config")
-            .arg(r#"lint.flake8-builtins.builtins-strict-checking = false"#)
+            .arg(r#"lint.flake8-builtins.strict-checking = false"#)
             .args(["--select", "A005"])
             .current_dir(tempdir.path()),
             @r"
@@ -2535,7 +2535,7 @@ fn a005_module_shadowing_non_strict() -> Result<()> {
     Ok(())
 }
 
-/// Test A005 with `builtins-strict-checking` unset
+/// Test A005 with `strict-checking` unset
 /// TODO(brent) This should currently match the strict version, but after the next minor
 /// release it will match the non-strict version directly above
 #[test]
@@ -2556,11 +2556,7 @@ fn a005_module_shadowing_strict_default() -> Result<()> {
         ----- stdout -----
         abc/__init__.py:1:1: A005 Module `abc` shadows a Python standard-library module
         collections/__init__.py:1:1: A005 Module `collections` shadows a Python standard-library module
-        collections/abc/__init__.py:1:1: A005 Module `abc` shadows a Python standard-library module
-        foobar/abc/__init__.py:1:1: A005 Module `abc` shadows a Python standard-library module
-        foobar/collections/__init__.py:1:1: A005 Module `collections` shadows a Python standard-library module
-        foobar/collections/abc/__init__.py:1:1: A005 Module `abc` shadows a Python standard-library module
-        Found 6 errors.
+        Found 2 errors.
 
         ----- stderr -----
         ");

crates/ruff/tests/snapshots/show_settings__display_default_settings.snap

@@ -226,10 +226,12 @@ linter.flake8_bandit.hardcoded_tmp_directory = [
 	/dev/shm,
 ]
 linter.flake8_bandit.check_typed_exception = false
+linter.flake8_bandit.extend_markup_names = []
+linter.flake8_bandit.allowed_markup_calls = []
 linter.flake8_bugbear.extend_immutable_calls = []
-linter.flake8_builtins.builtins_allowed_modules = []
-linter.flake8_builtins.builtins_ignorelist = []
-linter.flake8_builtins.builtins_strict_checking = true
+linter.flake8_builtins.allowed_modules = []
+linter.flake8_builtins.ignorelist = []
+linter.flake8_builtins.strict_checking = false
 linter.flake8_comprehensions.allow_dict_calls_with_keyword_arguments = false
 linter.flake8_copyright.notice_rgx = (?i)Copyright\s+((?:\(C\)|©)\s+)?\d{4}((-|,\s)\d{4})*
 linter.flake8_copyright.author = none
@@ -369,8 +371,6 @@ linter.pylint.max_public_methods = 20
 linter.pylint.max_locals = 15
 linter.pyupgrade.keep_runtime_typing = false
 linter.ruff.parenthesize_tuple_in_subscript = false
-linter.ruff.extend_markup_names = []
-linter.ruff.allowed_markup_calls = []
 
 # Formatter Settings
 formatter.exclude = []

crates/ruff_linter/resources/test/fixtures/ruff/RUF035.py → crates/ruff_linter/resources/test/fixtures/flake8_bandit/S704.py

@@ -2,17 +2,17 @@
 from markupsafe import Markup, escape
 
 content = "<script>alert('Hello, world!')</script>"
-Markup(f"unsafe {content}")  # RUF035
-flask.Markup("unsafe {}".format(content))  # RUF035
+Markup(f"unsafe {content}")  # S704
+flask.Markup("unsafe {}".format(content))  # S704
 Markup("safe {}").format(content)
 flask.Markup(b"safe {}", encoding='utf-8').format(content)
 escape(content)
-Markup(content)  # RUF035
-flask.Markup("unsafe %s" % content)  # RUF035
+Markup(content)  # S704
+flask.Markup("unsafe %s" % content)  # S704
 Markup(object="safe")
 Markup(object="unsafe {}".format(content))  # Not currently detected
 
 # NOTE: We may be able to get rid of these false positives with red-knot
 #       if it includes comprehensive constant expression detection/evaluation.
-Markup("*" * 8)  # RUF035 (false positive)
-flask.Markup("hello {}".format("world"))  # RUF035 (false positive)
+Markup("*" * 8)  # S704 (false positive)
+flask.Markup("hello {}".format("world"))  # S704 (false positive)

crates/ruff_linter/resources/test/fixtures/ruff/RUF035_extend_markup_names.py → crates/ruff_linter/resources/test/fixtures/flake8_bandit/S704_extend_markup_names.py

@@ -2,5 +2,5 @@
 from webhelpers.html import literal
 
 content = "<script>alert('Hello, world!')</script>"
-Markup(f"unsafe {content}")  # RUF035
-literal(f"unsafe {content}")  # RUF035
+Markup(f"unsafe {content}")  # S704
+literal(f"unsafe {content}")  # S704

crates/ruff_linter/resources/test/fixtures/ruff/RUF035_skip_early_out.py → crates/ruff_linter/resources/test/fixtures/flake8_bandit/S704_skip_early_out.py

@@ -4,4 +4,4 @@
 #       additional markup names to be skipped if we don't import either
 #       markupsafe or flask first.
 content = "<script>alert('Hello, world!')</script>"
-literal(f"unsafe {content}")  # RUF035
+literal(f"unsafe {content}")  # S704

crates/ruff_linter/resources/test/fixtures/ruff/RUF035_whitelisted_markup_calls.py → crates/ruff_linter/resources/test/fixtures/flake8_bandit/S704_whitelisted_markup_calls.py

@@ -6,4 +6,4 @@
 
 # indirect assignments are currently not supported
 cleaned = clean(content)
-Markup(cleaned)  # RUF035
+Markup(cleaned)  # S704

crates/ruff_linter/resources/test/fixtures/flake8_type_checking/TC005.py

@@ -4,13 +4,6 @@
     pass  # TC005
 
 
-if False:
-    pass  # TC005
-
-if 0:
-    pass  # TC005
-
-
 def example():
     if TYPE_CHECKING:
         pass  # TC005
@@ -32,13 +25,6 @@ class Test:
     x: List
 
 
-if False:
-    x: List
-
-if 0:
-    x: List
-
-
 from typing_extensions import TYPE_CHECKING
 
 if TYPE_CHECKING:

crates/ruff_linter/resources/test/fixtures/ruff/noqa.py

@@ -19,5 +19,6 @@ def f():
 
 
 def f():
-    # Only `E741` should be ignored by the `noqa`.
+    # Neither of these are ignored and warning is
+    # logged to user
     I = 1  # noqa: E741.F841

crates/ruff_linter/src/checkers/ast/analyze/expression.rs

@@ -428,7 +428,7 @@ pub(crate) fn expression(expr: &Expr, checker: &Checker) {
                 flake8_2020::rules::name_or_attribute(checker, expr);
             }
             if checker.enabled(Rule::DatetimeMinMax) {
-                flake8_datetimez::rules::datetime_max_min(checker, expr);
+                flake8_datetimez::rules::datetime_min_max(checker, expr);
             }
             if checker.enabled(Rule::BannedApi) {
                 flake8_tidy_imports::rules::banned_attribute_access(checker, expr);
@@ -1129,7 +1129,7 @@ pub(crate) fn expression(expr: &Expr, checker: &Checker) {
                 refurb::rules::int_on_sliced_str(checker, call);
             }
             if checker.enabled(Rule::UnsafeMarkupUse) {
-                ruff::rules::unsafe_markup_call(checker, call);
+                flake8_bandit::rules::unsafe_markup_call(checker, call);
             }
             if checker.enabled(Rule::MapIntVersionParsing) {
                 ruff::rules::map_int_version_parsing(checker, call);

crates/ruff_linter/src/checkers/ast/mod.rs

@@ -246,11 +246,7 @@ impl<'a> Checker<'a> {
         notebook_index: Option<&'a NotebookIndex>,
         target_version: PythonVersion,
     ) -> Checker<'a> {
-        let mut semantic = SemanticModel::new(&settings.typing_modules, path, module);
-        if settings.preview.is_enabled() {
-            // Set the feature flag to test `TYPE_CHECKING` semantic changes
-            semantic.flags |= SemanticModelFlags::NEW_TYPE_CHECKING_BLOCK_DETECTION;
-        }
+        let semantic = SemanticModel::new(&settings.typing_modules, path, module);
         Self {
             parsed,
             parsed_type_annotation: None,
@@ -293,7 +289,14 @@ impl<'a> Checker<'a> {
         if !self.noqa.is_enabled() {
             return false;
         }
-        noqa::rule_is_ignored(code, offset, self.noqa_line_for, self.locator)
+
+        noqa::rule_is_ignored(
+            code,
+            offset,
+            self.noqa_line_for,
+            self.comment_ranges(),
+            self.locator,
+        )
     }
 
     /// Create a [`Generator`] to generate source code based on the current AST state.

crates/ruff_linter/src/checkers/noqa.rs

@@ -38,7 +38,8 @@ pub(crate) fn check_noqa(
     let exemption = FileExemption::from(&file_noqa_directives);
 
     // Extract all `noqa` directives.
-    let mut noqa_directives = NoqaDirectives::from_commented_ranges(comment_ranges, path, locator);
+    let mut noqa_directives =
+        NoqaDirectives::from_commented_ranges(comment_ranges, &settings.external, path, locator);
 
     // Indices of diagnostics that were ignored by a `noqa` directive.
     let mut ignored_diagnostics = vec![];