Merge branch 'main' into PYI051

Author: LaBatata101

.github/workflows/ci.yaml

@@ -50,6 +50,10 @@ jobs:
               - crates/ruff_formatter/**
               - crates/ruff_python_trivia/**
               - crates/ruff_python_ast/**
+              - crates/ruff_source_file/**
+              - crates/ruff_python_index/**
+              - crates/ruff_text_size/**
+              - crates/ruff_python_parser/**
 
 
   cargo-fmt:
@@ -331,7 +335,7 @@ jobs:
       - name: "Cache rust"
         uses: Swatinem/rust-cache@v2
       - name: "Formatter progress"
-        run: scripts/formatter_progress.sh
+        run: scripts/formatter_ecosystem_checks.sh
       - name: "Github step summary"
         run: grep "similarity index" target/progress_projects_report.txt | sort > $GITHUB_STEP_SUMMARY
       # CPython is not black formatted, so we run only the stability check

Cargo.lock

@@ -46,6 +46,9 @@ syn = { version = "2.0.15" }
 test-case = { version = "3.0.0" }
 thiserror = { version = "1.0.43" }
 toml = { version = "0.7.2" }
+tracing = "0.1.37"
+tracing-indicatif = "0.3.4"
+tracing-subscriber = { version = "0.3.17", features = ["env-filter"] }
 wsl = { version = "0.1.0" }
 
 # v1.0.1

Cargo.toml

@@ -140,7 +140,7 @@ Ruff can also be used as a [pre-commit](https://pre-commit.com) hook:
 ```yaml
 - repo: https://github.com/astral-sh/ruff-pre-commit
   # Ruff version.
-  rev: v0.0.280
+  rev: v0.0.281
   hooks:
     - id: ruff
 ```

README.md

@@ -1,6 +1,6 @@
 [package]
 name = "flake8-to-ruff"
-version = "0.0.280"
+version = "0.0.281"
 description = """
 Convert Flake8 configuration files to Ruff configuration files.
 """

crates/flake8_to_ruff/Cargo.toml

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

crates/ruff/Cargo.toml

@@ -0,0 +1,22 @@
+import typing
+import sys
+from typing import TypeAlias
+
+
+_UnusedPrivateTypeAlias: TypeAlias = int | None
+_T: typing.TypeAlias = str
+
+# OK
+_UsedPrivateTypeAlias: TypeAlias = int | None
+
+def func(arg: _UsedPrivateTypeAlias) -> _UsedPrivateTypeAlias:
+  ...
+
+
+if sys.version_info > (3, 9):
+  _PrivateTypeAlias: TypeAlias = str | None
+else:
+  _PrivateTypeAlias: TypeAlias = float | None
+
+
+def func2(arg: _PrivateTypeAlias) -> None: ...

crates/ruff/resources/test/fixtures/flake8_pyi/PYI047.py

@@ -0,0 +1,22 @@
+import typing
+import sys
+from typing import TypeAlias
+
+
+_UnusedPrivateTypeAlias: TypeAlias = int | None
+_T: typing.TypeAlias = str
+
+# OK
+_UsedPrivateTypeAlias: TypeAlias = int | None
+
+def func(arg: _UsedPrivateTypeAlias) -> _UsedPrivateTypeAlias:
+  ...
+
+
+if sys.version_info > (3, 9):
+  _PrivateTypeAlias: TypeAlias = str | None
+else:
+  _PrivateTypeAlias: TypeAlias = float | None
+
+
+def func2(arg: _PrivateTypeAlias) -> None: ...

crates/ruff/resources/test/fixtures/flake8_pyi/PYI047.pyi

@@ -0,0 +1,18 @@
+import typing
+from typing import TypedDict
+
+
+class _UnusedTypedDict(TypedDict):
+    foo: str
+
+
+class _UnusedTypedDict2(typing.TypedDict):
+    bar: int
+
+
+class _UsedTypedDict(TypedDict):
+   foo: bytes
+
+
+class _CustomClass(_UsedTypedDict):
+    bar: list[int]

crates/ruff/resources/test/fixtures/flake8_pyi/PYI049.py

@@ -0,0 +1,32 @@
+import sys
+import typing
+from typing import TypedDict
+
+
+class _UnusedTypedDict(TypedDict):
+    foo: str
+
+
+class _UnusedTypedDict2(typing.TypedDict):
+    bar: int
+
+
+# OK
+class _UsedTypedDict(TypedDict):
+   foo: bytes
+
+
+class _CustomClass(_UsedTypedDict):
+   bar: list[int]
+
+
+if sys.version_info >= (3, 10):
+   class _UsedTypedDict2(TypedDict):
+       foo: int
+else:
+   class _UsedTypedDict2(TypedDict):
+       foo: float
+
+
+class _CustomClass2(_UsedTypedDict2):
+   bar: list[int]

crates/ruff/resources/test/fixtures/flake8_pyi/PYI049.pyi

@@ -30,3 +30,13 @@
 (k for k in obj.keys())  # SIM118
 
 key in (obj or {}).keys()  # SIM118
+
+from typing import KeysView
+
+
+class Foo:
+    def keys(self) -> KeysView[object]:
+        ...
+
+    def __contains__(self, key: object) -> bool:
+        return key in self.keys()  # OK

crates/ruff/resources/test/fixtures/flake8_simplify/SIM118.py

@@ -0,0 +1,10 @@
+"""Regression test: ensure that we don't treat the export entry as a typing-only reference."""
+from __future__ import annotations
+
+from logging import getLogger
+
+__all__ = ("getLogger",)
+
+
+def foo() -> None:
+    pass

crates/ruff/resources/test/fixtures/flake8_type_checking/snapshot.py

@@ -0,0 +1,2 @@
+import bar
+import foo

crates/ruff/resources/test/fixtures/isort/bom_sorted.py

@@ -0,0 +1,2 @@
+import foo
+import bar