Merge branch 'main' into charlie/metaclass

* main:
  Update conformance suite commit hash (#23746)
  conformance.py: Collapse the summary paragraph when nothing changed (#23745)
  [ty] Make inferred specializations line up with source types more better (#23715)
  Bump 0.15.5 (#23743)
  [ty] Render all changed diagnostics in conformance.py (#23613)
  [ty] Split deferred checks out of `types/infer/builder.rs` (#23740)
  Discover markdown files by default in preview mode (#23434)
  [ty] Use `HasOptionalDefinition` for `except` handlers (#23739)
  [ty] Fix precedence of `all` selector in TOML configurations (#23723)
  [ty] Make `all` selector case sensitive (#23713)
  [ty] Add a diagnostic if a `TypeVar` is used to specialize a `ParamSpec`, or vice versa (#23738)
  [ty] Override home directory in ty tests (#23724)
  [ty] More type-variable default validation (#23639)
  [ty] Validate bare ParamSpec usage in type annotations, and support stringified ParamSpecs as the first argument to `Callable` (#23625)
  [ty] Add `all` selector to ty.json's `schema` (#23721)
  [ty] Add quotes to related issues links (#23720)
  [ty] Fix panic on incomplete except handlers (#23708)
  Update conformance suite commit hash (#23719)

Author: carljm

.github/workflows/typing_conformance.yaml

@@ -34,7 +34,7 @@ env:
   CARGO_TERM_COLOR: always
   RUSTUP_MAX_RETRIES: 10
   RUST_BACKTRACE: 1
-  CONFORMANCE_SUITE_COMMIT: 5b5f2f89bd19462f4707400f0437ab5a48d88bb3
+  CONFORMANCE_SUITE_COMMIT: 7f8f6bbcaac9be6cde08c886f32aab64a3d597d2
   PYTHON_VERSION: 3.12
 
 jobs:

CHANGELOG.md

@@ -1,5 +1,45 @@
 # Changelog
 
+## 0.15.5
+
+Released on 2026-03-05.
+
+### Preview features
+
+- Discover Markdown files by default in preview mode ([#23434](https://github.com/astral-sh/ruff/pull/23434))
+- \[`perflint`\] Extend `PERF102` to comprehensions and generators ([#23473](https://github.com/astral-sh/ruff/pull/23473))
+- \[`refurb`\] Fix `FURB101` and `FURB103` false positives when I/O variable is used later ([#23542](https://github.com/astral-sh/ruff/pull/23542))
+- \[`ruff`\] Add fix for `none-not-at-end-of-union` (`RUF036`) ([#22829](https://github.com/astral-sh/ruff/pull/22829))
+- \[`ruff`\] Fix false positive for `re.split` with empty string pattern (`RUF055`) ([#23634](https://github.com/astral-sh/ruff/pull/23634))
+
+### Bug fixes
+
+- \[`fastapi`\] Handle callable class dependencies with `__call__` method (`FAST003`) ([#23553](https://github.com/astral-sh/ruff/pull/23553))
+- \[`pydocstyle`\] Fix numpy section ordering (`D420`) ([#23685](https://github.com/astral-sh/ruff/pull/23685))
+- \[`pyflakes`\] Fix false positive for names shadowing re-exports (`F811`) ([#23356](https://github.com/astral-sh/ruff/pull/23356))
+- \[`pyupgrade`\] Avoid inserting redundant `None` elements in `UP045` ([#23459](https://github.com/astral-sh/ruff/pull/23459))
+
+### Documentation
+
+- Document extension mapping for Markdown code formatting ([#23574](https://github.com/astral-sh/ruff/pull/23574))
+- Update default Python version examples ([#23605](https://github.com/astral-sh/ruff/pull/23605))
+
+### Other changes
+
+- Publish releases to Astral mirror ([#23616](https://github.com/astral-sh/ruff/pull/23616))
+
+### Contributors
+
+- [@amyreese](https://github.com/amyreese)
+- [@stakeswky](https://github.com/stakeswky)
+- [@chirizxc](https://github.com/chirizxc)
+- [@anishgirianish](https://github.com/anishgirianish)
+- [@bxff](https://github.com/bxff)
+- [@zsol](https://github.com/zsol)
+- [@charliermarsh](https://github.com/charliermarsh)
+- [@ntBre](https://github.com/ntBre)
+- [@kar-ganap](https://github.com/kar-ganap)
+
 ## 0.15.4
 
 Released on 2026-02-26.

Cargo.lock

@@ -152,8 +152,8 @@ curl -LsSf https://astral.sh/ruff/install.sh | sh
 powershell -c "irm https://astral.sh/ruff/install.ps1 | iex"
 
 # For a specific version.
-curl -LsSf https://astral.sh/ruff/0.15.4/install.sh | sh
-powershell -c "irm https://astral.sh/ruff/0.15.4/install.ps1 | iex"
+curl -LsSf https://astral.sh/ruff/0.15.5/install.sh | sh
+powershell -c "irm https://astral.sh/ruff/0.15.5/install.ps1 | iex"
 ```
 
 You can also install Ruff via [Homebrew](https://formulae.brew.sh/formula/ruff), [Conda](https://anaconda.org/conda-forge/ruff),
@@ -186,7 +186,7 @@ Ruff can also be used as a [pre-commit](https://pre-commit.com/) hook via [`ruff
 ```yaml
 - repo: https://github.com/astral-sh/ruff-pre-commit
   # Ruff version.
-  rev: v0.15.4
+  rev: v0.15.5
   hooks:
     # Run the linter.
     - id: ruff-check

README.md

@@ -1,6 +1,6 @@
 [package]
 name = "ruff"
-version = "0.15.4"
+version = "0.15.5"
 publish = true
 authors = { workspace = true }
 edition = { workspace = true }

crates/ruff/Cargo.toml

@@ -11,7 +11,7 @@ use ruff_linter::source_kind::SourceKind;
 use ruff_linter::warn_user_once;
 use ruff_python_ast::{PySourceType, SourceType};
 use ruff_workspace::resolver::{
-    PyprojectConfig, ResolvedFile, match_exclusion, python_files_in_path,
+    PyprojectConfig, ResolvedFile, match_exclusion, project_files_in_path,
 };
 
 use crate::args::ConfigArguments;
@@ -25,10 +25,22 @@ pub(crate) fn add_noqa(
 ) -> Result<usize> {
     // Collect all the files to check.
     let start = Instant::now();
-    let (paths, resolver) = python_files_in_path(files, pyproject_config, config_arguments)?;
+    let (mut paths, resolver) = project_files_in_path(files, pyproject_config, config_arguments)?;
     let duration = start.elapsed();
     debug!("Identified files to lint in: {duration:?}");
 
+    // Filter out paths for file types not supported for linting
+    paths.retain(|path| {
+        if let Ok(ResolvedFile::Root(path) | ResolvedFile::Nested(path)) = path {
+            matches!(
+                SourceType::from(path),
+                SourceType::Python(PySourceType::Python | PySourceType::Stub)
+            )
+        } else {
+            true
+        }
+    });
+
     if paths.is_empty() {
         warn_user_once!("No Python files found under the given path(s)");
         return Ok(0);
@@ -48,11 +60,7 @@ pub(crate) fn add_noqa(
         .par_iter()
         .flatten()
         .filter_map(|resolved_file| {
-            let SourceType::Python(source_type @ (PySourceType::Python | PySourceType::Stub)) =
-                SourceType::from(resolved_file.path())
-            else {
-                return None;
-            };
+            let source_type = SourceType::from(resolved_file.path());
             let path = resolved_file.path();
             let package = resolved_file
                 .path()
@@ -69,7 +77,7 @@ pub(crate) fn add_noqa(
             {
                 return None;
             }
-            let source_kind = match SourceKind::from_path(path, SourceType::Python(source_type)) {
+            let source_kind = match SourceKind::from_path(path, source_type) {
                 Ok(Some(source_kind)) => source_kind,
                 Ok(None) => return None,
                 Err(e) => {
@@ -81,7 +89,7 @@ pub(crate) fn add_noqa(
                 path,
                 package,
                 &source_kind,
-                source_type,
+                source_type.expect_python(),
                 &settings.linter,
                 reason,
             ) {

crates/ruff/src/commands/add_noqa.rs

@@ -11,7 +11,7 @@ use ruff_linter::package::PackageRoot;
 use ruff_linter::source_kind::SourceKind;
 use ruff_linter::{warn_user, warn_user_once};
 use ruff_python_ast::SourceType;
-use ruff_workspace::resolver::{ResolvedFile, match_exclusion, python_files_in_path};
+use ruff_workspace::resolver::{ResolvedFile, match_exclusion, project_files_in_path};
 use rustc_hash::{FxBuildHasher, FxHashMap};
 use std::io::Write;
 use std::path::{Path, PathBuf};
@@ -35,7 +35,16 @@ pub(crate) fn analyze_graph(
 
     // Find all Python files.
     let files = resolve_default_files(args.files, false);
-    let (paths, resolver) = python_files_in_path(&files, &pyproject_config, config_arguments)?;
+    let (mut paths, resolver) = project_files_in_path(&files, &pyproject_config, config_arguments)?;
+
+    // Filter to only Python files
+    paths.retain(|path| {
+        if let Ok(ResolvedFile::Root(path) | ResolvedFile::Nested(path)) = path {
+            matches!(SourceType::from(path), SourceType::Python(_))
+        } else {
+            true
+        }
+    });
 
     if paths.is_empty() {
         warn_user_once!("No Python files found under the given path(s)");
@@ -124,6 +133,7 @@ pub(crate) fn analyze_graph(
                 let string_imports = settings.analyze.string_imports;
                 let include_dependencies = settings.analyze.include_dependencies.get(path).cloned();
                 let type_checking_imports = settings.analyze.type_checking_imports;
+                let source_type = settings.analyze.extension.get_source_type(path);
 
                 // Skip excluded files.
                 if (settings.file_resolver.force_exclude || !resolved_file.is_root())
@@ -136,19 +146,6 @@ pub(crate) fn analyze_graph(
                     continue;
                 }
 
-                // Ignore non-Python files.
-                let source_type = match settings.analyze.extension.get_source_type(path) {
-                    SourceType::Python(source_type) => source_type,
-                    SourceType::Toml(_) => {
-                        debug!("Ignoring TOML file: {}", path.display());
-                        continue;
-                    }
-                    SourceType::Markdown => {
-                        debug!("Ignoring Markdown file: {}", path.display());
-                        continue;
-                    }
-                };
-
                 // Convert to system paths.
                 let Ok(package) = package.map(SystemPathBuf::from_path_buf).transpose() else {
                     warn!("Failed to convert package to system path");
@@ -165,10 +162,7 @@ pub(crate) fn analyze_graph(
                 let result = inner_result.clone();
                 scope.spawn(move |_| {
                     // Extract source code (handles both .py and .ipynb files)
-                    let source_kind = match SourceKind::from_path(
-                        path.as_std_path(),
-                        SourceType::Python(source_type),
-                    ) {
+                    let source_kind = match SourceKind::from_path(path.as_std_path(), source_type) {
                         Ok(Some(source_kind)) => source_kind,
                         Ok(None) => {
                             debug!("Skipping non-Python notebook: {path}");
@@ -186,7 +180,7 @@ pub(crate) fn analyze_graph(
                     let mut imports = ModuleImports::detect(
                         &db,
                         source_code,
-                        source_type,
+                        source_type.expect_python(),
                         &path,
                         package.as_deref(),
                         string_imports,

crates/ruff/src/commands/analyze_graph.rs

@@ -10,6 +10,7 @@ use log::{debug, warn};
 #[cfg(not(target_family = "wasm"))]
 use rayon::prelude::*;
 use ruff_linter::message::create_panic_diagnostic;
+use ruff_python_ast::{SourceType, TomlSourceType};
 use rustc_hash::FxHashMap;
 
 use ruff_db::diagnostic::Diagnostic;
@@ -22,7 +23,7 @@ use ruff_linter::{IOError, Violation, fs, warn_user_once};
 use ruff_source_file::SourceFileBuilder;
 use ruff_text_size::TextRange;
 use ruff_workspace::resolver::{
-    PyprojectConfig, ResolvedFile, match_exclusion, python_files_in_path,
+    PyprojectConfig, ResolvedFile, match_exclusion, project_files_in_path,
 };
 
 use crate::args::ConfigArguments;
@@ -41,9 +42,21 @@ pub(crate) fn check(
 ) -> Result<Diagnostics> {
     // Collect all the Python files to check.
     let start = Instant::now();
-    let (paths, resolver) = python_files_in_path(files, pyproject_config, config_arguments)?;
+    let (mut paths, resolver) = project_files_in_path(files, pyproject_config, config_arguments)?;
     debug!("Identified files to lint in: {:?}", start.elapsed());
 
+    // Filter out paths for file types not supported for linting
+    paths.retain(|path| {
+        if let Ok(ResolvedFile::Root(path) | ResolvedFile::Nested(path)) = path {
+            matches!(
+                SourceType::from(path),
+                SourceType::Python(_) | SourceType::Toml(TomlSourceType::Pyproject)
+            )
+        } else {
+            true
+        }
+    });
+
     if paths.is_empty() {
         warn_user_once!("No Python files found under the given path(s)");
         return Ok(Diagnostics::default());

crates/ruff/src/commands/check.rs

@@ -5,7 +5,7 @@ use ruff_db::diagnostic::Diagnostic;
 use ruff_linter::package::PackageRoot;
 use ruff_linter::packaging;
 use ruff_linter::settings::flags;
-use ruff_workspace::resolver::{PyprojectConfig, Resolver, match_exclusion, python_file_at_path};
+use ruff_workspace::resolver::{PyprojectConfig, Resolver, match_exclusion, project_file_at_path};
 
 use crate::args::ConfigArguments;
 use crate::diagnostics::{Diagnostics, lint_stdin};
@@ -23,7 +23,7 @@ pub(crate) fn check_stdin(
 
     if resolver.force_exclude() {
         if let Some(filename) = filename {
-            if !python_file_at_path(filename, &mut resolver, overrides)? {
+            if !project_file_at_path(filename, &mut resolver, overrides)? {
                 if fix_mode.is_apply() {
                     parrot_stdin()?;
                 }

crates/ruff/src/commands/check_stdin.rs

@@ -38,7 +38,7 @@ use ruff_source_file::{LineIndex, LineRanges, OneIndexed, SourceFileBuilder};
 use ruff_text_size::{TextLen, TextRange, TextSize};
 use ruff_workspace::FormatterSettings;
 use ruff_workspace::resolver::{
-    PyprojectConfig, ResolvedFile, Resolver, match_exclusion, python_files_in_path,
+    PyprojectConfig, ResolvedFile, Resolver, match_exclusion, project_files_in_path,
 };
 
 use crate::args::{ConfigArguments, FormatArguments, FormatRange};
@@ -75,7 +75,7 @@ pub(crate) fn format(
 ) -> Result<ExitStatus> {
     let mode = FormatMode::from_cli(&cli);
     let files = resolve_default_files(cli.files, false);
-    let (paths, resolver) = python_files_in_path(&files, pyproject_config, config_arguments)?;
+    let (paths, resolver) = project_files_in_path(&files, pyproject_config, config_arguments)?;
 
     let output_format = pyproject_config.settings.output_format;
     let preview = pyproject_config.settings.formatter.preview;