Formatter: Show preceding, following and enclosing of comments

**Summary** I used to always add `dbg!` for preceding, following and enclosing. With this change `--print-comments` can do this instead.
```python
import re  # import

def to_camel_case(node: str) -> str:
    """Converts PascalCase to camel_case"""
    return re.sub("([A-Z])", r"_\1", node).lower().lstrip("_")

# a
if True:
    pass  # b
else:
    print()
```
Debug output:
```
11..19 Some((StmtImport, 0..9)) Some((StmtFunctionDef, 22..165)) (ModModule, 0..213) "# import"
168..171 Some((StmtFunctionDef, 22..165)) Some((StmtIf, 172..212)) (ModModule, 0..213) "# a"
191..194 Some((StmtPass, 185..189)) Some((ElifElseClause, 195..212)) (StmtIf, 172..212) "# b"
```

**Test Plan** n/a

.editorconfig

@@ -10,7 +10,7 @@ indent_style = space
 insert_final_newline = true
 indent_size = 2
 
-[*.{rs,py,pyi}]
+[*.{rs,py}]
 indent_size = 4
 
 [*.snap]

.github/dependabot.yml

@@ -4,10 +4,8 @@ updates:
     directory: "/"
     schedule:
       interval: "weekly"
-    labels: ["internal"]
-
-  - package-ecosystem: "cargo"
-    directory: "/"
-    schedule:
-      interval: "daily"
-    labels: ["internal"]
+      day: "monday"
+      time: "12:00"
+      timezone: "America/New_York"
+    commit-message:
+      prefix: "ci(deps)"

.github/release.yml

@@ -20,9 +20,6 @@ changelog:
     - title: Bug Fixes
       labels:
         - bug
-    - title: Preview
-      labels:
-        - preview
     - title: Other Changes
       labels:
         - "*"

.github/workflows/benchmark.yaml

@@ -0,0 +1,136 @@
+name: Benchmark
+
+on:
+  pull_request:
+    paths:
+      - "Cargo.toml"
+      - "Cargo.lock"
+      - "rust-toolchain"
+      - "crates/**"
+      - "!crates/ruff_dev"
+      - "!crates/ruff_shrinking"
+
+  workflow_dispatch:
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref_name }}-${{ github.event.pull_request.number || github.sha }}
+  cancel-in-progress: true
+
+jobs:
+  run-benchmark:
+    if: github.event_name == 'pull_request'
+    name: "Run | ${{ matrix.os }}"
+    strategy:
+      matrix:
+        os: [ubuntu-latest, windows-latest]
+    runs-on: ${{ matrix.os }}
+
+    steps:
+      - name: "PR - Checkout Branch"
+        uses: actions/checkout@v3
+        with:
+          ref: ${{ github.event.pull_request.head.sha }}
+
+      - name: "PR - Install Rust toolchain"
+        run: rustup show
+
+      - uses: Swatinem/rust-cache@v2
+
+      - name: "PR - Build benchmarks"
+        run: cargo bench -p ruff_benchmark --no-run
+
+      - name: "PR - Run benchmarks"
+        run: cargo benchmark --save-baseline=pr
+
+      - name: "Main - Checkout Branch"
+        uses: actions/checkout@v3
+        with:
+          clean: false
+          ref: main
+
+      - name: "Main - Install Rust toolchain"
+        run: rustup show
+
+      - name: "Main - Build benchmarks"
+        run: cargo bench -p ruff_benchmark --no-run
+
+      - name: "Main - Run benchmarks"
+        run: cargo benchmark --save-baseline=main
+
+      - name: "Upload benchmark results"
+        uses: actions/upload-artifact@v3
+        with:
+          name: benchmark-results-${{ matrix.os }}
+          path: ./target/criterion
+
+      # Cleanup
+      - name: Remove Criterion Artifact
+        uses: JesseTG/rm@v1.0.3
+        with:
+          path: ./target/criterion
+
+  benchmark-compare:
+    if: github.event_name == 'pull_request'
+    runs-on: ubuntu-latest
+    name: Compare
+    needs:
+      - run-benchmark
+
+    steps:
+      - name: "Install Rust toolchain"
+        run: rustup show
+
+      - name: "Install critcmp"
+        uses: taiki-e/install-action@v2
+        with:
+          tool: critcmp
+
+      - name: "Linux | Download PR benchmark results"
+        uses: actions/download-artifact@v3
+        with:
+          name: benchmark-results-ubuntu-latest
+          path: ./target/criterion
+
+      - name: "Linux | Compare benchmark results"
+        shell: bash
+        run: |
+          echo "### Benchmark" >> summary.md
+          echo "#### Linux" >> summary.md
+          echo "\`\`\`" >> summary.md
+          critcmp main pr >> summary.md
+          echo "\`\`\`" >> summary.md
+          echo "" >> summary.md
+
+      - name: "Linux | Cleanup benchmark results"
+        run: rm -rf ./target/criterion
+
+      - name: "Windows | Download PR benchmark results"
+        uses: actions/download-artifact@v3
+        with:
+          name: benchmark-results-windows-latest
+          path: ./target/criterion
+
+      - name: "Windows | Compare benchmark results"
+        shell: bash
+        run: |
+          echo "#### Windows" >> summary.md
+          echo "\`\`\`" >> summary.md
+          critcmp main pr >> summary.md
+          echo "\`\`\`" >> summary.md
+          echo "" >> summary.md
+
+          echo ${{ github.event.pull_request.number }} > pr-number
+
+          cat summary.md > $GITHUB_STEP_SUMMARY
+
+      - uses: actions/upload-artifact@v3
+        name: Upload PR Number
+        with:
+          name: pr-number
+          path: pr-number
+
+      - uses: actions/upload-artifact@v3
+        name: Upload Summary
+        with:
+          name: summary
+          path: summary.md

.github/workflows/ci.yaml

@@ -26,11 +26,11 @@ jobs:
       linter: ${{ steps.changed.outputs.linter_any_changed }}
       formatter: ${{ steps.changed.outputs.formatter_any_changed }}
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v3
         with:
           fetch-depth: 0
 
-      - uses: tj-actions/changed-files@v39
+      - uses: tj-actions/changed-files@v37
         id: changed
         with:
           files_yaml: |
@@ -42,7 +42,7 @@ jobs:
               - "!crates/ruff_formatter/**"
               - "!crates/ruff_dev/**"
               - "!crates/ruff_shrinking/**"
-              - scripts/*
+              - scripts/check_ecosystem.py
 
             formatter:
               - Cargo.toml
@@ -56,13 +56,12 @@ jobs:
               - crates/ruff_text_size/**
               - crates/ruff_python_parser/**
               - crates/ruff_dev/**
-              - scripts/*
 
   cargo-fmt:
     name: "cargo fmt"
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v3
       - name: "Install Rust toolchain"
         run: rustup component add rustfmt
       - run: cargo fmt --all --check
@@ -71,7 +70,7 @@ jobs:
     name: "cargo clippy"
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v3
       - name: "Install Rust toolchain"
         run: |
           rustup component add clippy
@@ -89,7 +88,7 @@ jobs:
     runs-on: ${{ matrix.os }}
     name: "cargo test | ${{ matrix.os }}"
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v3
       - name: "Install Rust toolchain"
         run: rustup show
       - name: "Install cargo insta"
@@ -125,7 +124,7 @@ jobs:
     runs-on: ubuntu-latest
     name: "cargo fuzz"
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v3
       - name: "Install Rust toolchain"
         run: rustup show
       - uses: Swatinem/rust-cache@v2
@@ -141,7 +140,7 @@ jobs:
     runs-on: ubuntu-latest
     name: "cargo test (wasm)"
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v3
       - name: "Install Rust toolchain"
         run: rustup target add wasm32-unknown-unknown
       - uses: actions/setup-node@v3
@@ -160,7 +159,7 @@ jobs:
     name: "test scripts"
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v3
       - name: "Install Rust toolchain"
         run: rustup component add rustfmt
       - uses: Swatinem/rust-cache@v2
@@ -182,7 +181,7 @@ jobs:
     # Only runs on pull requests, since that is the only we way we can find the base version for comparison.
     if: github.event_name == 'pull_request' && needs.determine_changes.outputs.linter == 'true'
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v3
       - uses: actions/setup-python@v4
         with:
           python-version: ${{ env.PYTHON_VERSION }}
@@ -227,7 +226,7 @@ jobs:
     name: "cargo udeps"
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v3
       - name: "Install nightly Rust toolchain"
         # Only pinned to make caching work, update freely
         run: rustup toolchain install nightly-2023-06-08
@@ -241,7 +240,7 @@ jobs:
     name: "python package"
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v3
       - uses: actions/setup-python@v4
         with:
           python-version: ${{ env.PYTHON_VERSION }}
@@ -265,7 +264,7 @@ jobs:
     name: "pre-commit"
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v3
       - uses: actions/setup-python@v4
         with:
           python-version: ${{ env.PYTHON_VERSION }}
@@ -295,7 +294,7 @@ jobs:
     env:
       MKDOCS_INSIDERS_SSH_KEY_EXISTS: ${{ secrets.MKDOCS_INSIDERS_SSH_KEY != '' }}
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v3
       - uses: actions/setup-python@v4
       - name: "Add SSH key"
         if: ${{ env.MKDOCS_INSIDERS_SSH_KEY_EXISTS == 'true' }}
@@ -328,9 +327,9 @@ jobs:
     name: "Formatter ecosystem and progress checks"
     runs-on: ubuntu-latest
     needs: determine_changes
-    if: needs.determine_changes.outputs.formatter == 'true' || github.ref == 'refs/heads/main'
+    if: needs.determine_changes.outputs.formatter == 'true'
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v3
       - name: "Install Rust toolchain"
         run: rustup show
       - name: "Cache rust"
@@ -338,59 +337,9 @@ jobs:
       - name: "Formatter progress"
         run: scripts/formatter_ecosystem_checks.sh
       - name: "Github step summary"
-        run: cat target/progress_projects_stats.txt > $GITHUB_STEP_SUMMARY
-      - name: "Remove checkouts from cache"
-        run: rm -r target/progress_projects
-
-  benchmarks:
-    runs-on: ubuntu-latest
-    steps:
-      - name: "Checkout Branch"
-        uses: actions/checkout@v4
-
-      - name: "Install Rust toolchain"
-        run: rustup show
-
-      - name: "Install codspeed"
-        uses: taiki-e/install-action@v2
-        with:
-          tool: cargo-codspeed
-
-      - uses: Swatinem/rust-cache@v2
-
-      - name: "Build benchmarks"
-        run: cargo codspeed build --features codspeed -p ruff_benchmark
-
-      - name: "Run benchmarks"
-        uses: CodSpeedHQ/action@v1
-        with:
-          run: cargo codspeed run
-          token: ${{ secrets.CODSPEED_TOKEN }}
-
-  tmp:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v4
-        with:
-          ref: main # We checkout the main branch to check for the commit
-      - name: Check main branch
-        run: |
-          # Fetch the main branch since a shallow checkout is used by default
-          git fetch origin main --unshallow
-          if ! git branch --contains 0c030b5bf31e425cb6070db7386243eca6dbd8f1 | grep -E '(^|\s)main$'; then
-            echo "The specified sha is not on the main branch" >&2
-            exit 1
-          fi
-      - name: Check tag consistency
-        run: |
-          # Switch to the commit we want to release
-          git checkout 0c030b5bf31e425cb6070db7386243eca6dbd8f1
-          version=$(grep "version = " pyproject.toml | sed -e 's/version = "\(.*\)"/\1/g')
-          if [ "0.0.290" != "${version}" ]; then
-            echo "The input tag does not match the version from pyproject.toml:" >&2
-            echo "0.0.290" >&2
-            echo "${version}" >&2
-            exit 1
-          else
-            echo "Releasing ${version}"
-          fi
+        run: grep "similarity index" target/progress_projects_log.txt | sort > $GITHUB_STEP_SUMMARY
+      # CPython is not black formatted, so we run only the stability check
+      - name: "Clone CPython 3.10"
+        run: git clone --branch 3.10 --depth 1 https://github.com/python/cpython.git crates/ruff/resources/test/cpython
+      - name: "Check CPython stability"
+        run: cargo run --bin ruff_dev -- format-dev --stability-check crates/ruff/resources/test/cpython

.github/workflows/docs.yaml

@@ -2,11 +2,6 @@ name: mkdocs
 
 on:
   workflow_dispatch:
-    inputs:
-      ref:
-        description: "The commit SHA, tag, or branch to publish. Uses the default branch if not specified."
-        default: ""
-        type: string
   release:
     types: [published]
 
@@ -17,9 +12,7 @@ jobs:
       CF_API_TOKEN_EXISTS: ${{ secrets.CF_API_TOKEN != '' }}
       MKDOCS_INSIDERS_SSH_KEY_EXISTS: ${{ secrets.MKDOCS_INSIDERS_SSH_KEY != '' }}
     steps:
-      - uses: actions/checkout@v4
-        with:
-          ref: ${{ inputs.ref }}
+      - uses: actions/checkout@v3
       - uses: actions/setup-python@v4
       - name: "Add SSH key"
         if: ${{ env.MKDOCS_INSIDERS_SSH_KEY_EXISTS == 'true' }}
@@ -47,9 +40,8 @@ jobs:
         run: mkdocs build --strict -f mkdocs.generated.yml
       - name: "Deploy to Cloudflare Pages"
         if: ${{ env.CF_API_TOKEN_EXISTS == 'true' }}
-        uses: cloudflare/wrangler-action@v3.1.1
+        uses: cloudflare/wrangler-action@2.0.0
         with:
           apiToken: ${{ secrets.CF_API_TOKEN }}
           accountId: ${{ secrets.CF_ACCOUNT_ID }}
-          # `github.head_ref` is only set during pull requests and for manual runs or tags we use `main` to deploy to production
-          command: pages deploy site --project-name=ruff-docs --branch ${{ github.head_ref || 'main' }} --commit-hash ${GITHUB_SHA}
+          command: pages publish site --project-name=ruff-docs --branch ${GITHUB_HEAD_REF} --commit-hash ${GITHUB_SHA}

.github/workflows/flake8-to-ruff.yaml

@@ -19,7 +19,7 @@ jobs:
   macos-x86_64:
     runs-on: macos-latest
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v3
       - uses: actions/setup-python@v4
         with:
           python-version: ${{ env.PYTHON_VERSION }}
@@ -42,7 +42,7 @@ jobs:
   macos-universal:
     runs-on: macos-latest
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v3
       - uses: actions/setup-python@v4
         with:
           python-version: ${{ env.PYTHON_VERSION }}
@@ -68,7 +68,7 @@ jobs:
       matrix:
         target: [x64, x86]
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v3
       - uses: actions/setup-python@v4
         with:
           python-version: ${{ env.PYTHON_VERSION }}
@@ -96,7 +96,7 @@ jobs:
       matrix:
         target: [x86_64, i686]
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v3
       - uses: actions/setup-python@v4
         with:
           python-version: ${{ env.PYTHON_VERSION }}
@@ -123,7 +123,7 @@ jobs:
       matrix:
         target: [aarch64, armv7, s390x, ppc64le, ppc64]
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v3
       - uses: actions/setup-python@v4
         with:
           python-version: ${{ env.PYTHON_VERSION }}
@@ -160,7 +160,7 @@ jobs:
           - x86_64-unknown-linux-musl
           - i686-unknown-linux-musl
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v3
       - uses: actions/setup-python@v4
         with:
           python-version: ${{ env.PYTHON_VERSION }}
@@ -196,7 +196,7 @@ jobs:
           - target: armv7-unknown-linux-musleabihf
             arch: armv7
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v3
       - uses: actions/setup-python@v4
         with:
           python-version: ${{ env.PYTHON_VERSION }}

.github/workflows/playground.yaml

@@ -17,7 +17,7 @@ jobs:
     env:
       CF_API_TOKEN_EXISTS: ${{ secrets.CF_API_TOKEN != '' }}
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v3
       - name: "Install Rust toolchain"
         run: rustup target add wasm32-unknown-unknown
       - uses: actions/setup-node@v3
@@ -40,7 +40,7 @@ jobs:
         working-directory: playground
       - name: "Deploy to Cloudflare Pages"
         if: ${{ env.CF_API_TOKEN_EXISTS == 'true' }}
-        uses: cloudflare/wrangler-action@v3.1.1
+        uses: cloudflare/wrangler-action@2.0.0
         with:
           apiToken: ${{ secrets.CF_API_TOKEN }}
           accountId: ${{ secrets.CF_ACCOUNT_ID }}

.github/workflows/pr-comment.yaml

@@ -2,7 +2,7 @@ name: PR Check Comment
 
 on:
   workflow_run:
-    workflows: [CI]
+    workflows: [CI, Benchmark]
     types: [completed]
   workflow_dispatch:
     inputs:
@@ -43,34 +43,42 @@ jobs:
           path: pr/ecosystem
           if_no_artifact_found: ignore
 
+      - uses: dawidd6/action-download-artifact@v2
+        name: "Download Benchmark Result"
+        id: download-benchmark-result
+        if: steps.pr-number.outputs.pr-number
+        with:
+          name: summary
+          workflow: benchmark.yaml
+          pr: ${{ steps.pr-number.outputs.pr-number }}
+          path: pr/benchmark
+          if_no_artifact_found: ignore
+
       - name: Generate Comment
         id: generate-comment
-        if: steps.download-ecosystem-result.outputs.found_artifact == 'true'
+        if: steps.download-ecosystem-result.outputs.found_artifact == 'true' || steps.download-benchmark-result.outputs.found_artifact == 'true'
         run: |
-          echo '## PR Check Results' >> comment.txt
-
-          echo "### Ecosystem" >> comment.txt
-          cat pr/ecosystem/ecosystem-result >> comment.txt
-          echo "" >> comment.txt
-
           echo 'comment<<EOF' >> $GITHUB_OUTPUT
-          cat comment.txt >> $GITHUB_OUTPUT
+          echo '## PR Check Results' >> $GITHUB_OUTPUT
+
+          if [[ -f pr/ecosystem/ecosystem-result ]]
+          then
+            echo "### Ecosystem" >> $GITHUB_OUTPUT
+            cat pr/ecosystem/ecosystem-result >> $GITHUB_OUTPUT
+            echo "" >> $GITHUB_OUTPUT
+          fi
+
+          if [[ -f pr/benchmark/summary.md ]]
+          then
+            cat pr/benchmark/summary.md >> $GITHUB_OUTPUT
+          fi
+
           echo 'EOF' >> $GITHUB_OUTPUT
 
-      - name: Find Comment
-        uses: peter-evans/find-comment@v2
-        if: steps.generate-comment.outcome == 'success'
-        id: find-comment
-        with:
-          issue-number: ${{ steps.pr-number.outputs.pr-number }}
-          comment-author: "github-actions[bot]"
-          body-includes: PR Check Results
-
       - name: Create or update comment
-        if: steps.find-comment.outcome == 'success'
-        uses: peter-evans/create-or-update-comment@v3
+        if: steps.generate-comment.outputs.comment
+        uses: thollander/actions-comment-pull-request@v2
         with:
-          comment-id: ${{ steps.find-comment.outputs.comment-id }}
-          issue-number: ${{ steps.pr-number.outputs.pr-number }}
-          body-path: comment.txt
-          edit-mode: replace
+          pr_number: ${{ steps.pr-number.outputs.pr-number }}
+          message: ${{ steps.generate-comment.outputs.comment }}
+          comment_tag: PR Check Results

.github/workflows/release.yaml

@@ -7,15 +7,12 @@ on:
         description: "The version to tag, without the leading 'v'. If omitted, will initiate a dry run (no uploads)."
         type: string
       sha:
-        description: "The full sha of the commit to be released. If omitted, the latest commit on the default branch will be used."
-        default: ""
+        description: "Optionally, the full sha of the commit to be released"
         type: string
   pull_request:
     paths:
       # When we change pyproject.toml, we want to ensure that the maturin builds still work
       - pyproject.toml
-      # And when we change this workflow itself...
-      - .github/workflows/release.yaml
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.ref }}
@@ -33,9 +30,7 @@ jobs:
   sdist:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
-        with:
-          ref: ${{ inputs.sha }}
+      - uses: actions/checkout@v3
       - uses: actions/setup-python@v4
         with:
           python-version: ${{ env.PYTHON_VERSION }}
@@ -61,9 +56,7 @@ jobs:
   macos-x86_64:
     runs-on: macos-latest
     steps:
-      - uses: actions/checkout@v4
-        with:
-          ref: ${{ inputs.sha }}
+      - uses: actions/checkout@v3
       - uses: actions/setup-python@v4
         with:
           python-version: ${{ env.PYTHON_VERSION }}
@@ -101,9 +94,7 @@ jobs:
   macos-universal:
     runs-on: macos-latest
     steps:
-      - uses: actions/checkout@v4
-        with:
-          ref: ${{ inputs.sha }}
+      - uses: actions/checkout@v3
       - uses: actions/setup-python@v4
         with:
           python-version: ${{ env.PYTHON_VERSION }}
@@ -149,9 +140,7 @@ jobs:
           - target: aarch64-pc-windows-msvc
             arch: x64
     steps:
-      - uses: actions/checkout@v4
-        with:
-          ref: ${{ inputs.sha }}
+      - uses: actions/checkout@v3
       - uses: actions/setup-python@v4
         with:
           python-version: ${{ env.PYTHON_VERSION }}
@@ -197,9 +186,7 @@ jobs:
           - x86_64-unknown-linux-gnu
           - i686-unknown-linux-gnu
     steps:
-      - uses: actions/checkout@v4
-        with:
-          ref: ${{ inputs.sha }}
+      - uses: actions/checkout@v3
       - uses: actions/setup-python@v4
         with:
           python-version: ${{ env.PYTHON_VERSION }}
@@ -256,9 +243,7 @@ jobs:
             arch: ppc64
 
     steps:
-      - uses: actions/checkout@v4
-        with:
-          ref: ${{ inputs.sha }}
+      - uses: actions/checkout@v3
       - uses: actions/setup-python@v4
         with:
           python-version: ${{ env.PYTHON_VERSION }}
@@ -311,9 +296,7 @@ jobs:
           - x86_64-unknown-linux-musl
           - i686-unknown-linux-musl
     steps:
-      - uses: actions/checkout@v4
-        with:
-          ref: ${{ inputs.sha }}
+      - uses: actions/checkout@v3
       - uses: actions/setup-python@v4
         with:
           python-version: ${{ env.PYTHON_VERSION }}
@@ -367,9 +350,7 @@ jobs:
             arch: armv7
 
     steps:
-      - uses: actions/checkout@v4
-        with:
-          ref: ${{ inputs.sha }}
+      - uses: actions/checkout@v3
       - uses: actions/setup-python@v4
         with:
           python-version: ${{ env.PYTHON_VERSION }}
@@ -417,9 +398,7 @@ jobs:
     # If you don't set an input tag, it's a dry run (no uploads).
     if: ${{ inputs.tag }}
     steps:
-      - uses: actions/checkout@v4
-        with:
-          ref: ${{ inputs.sha }}
+      - uses: actions/checkout@v3
       - name: Check tag consistency
         run: |
           version=$(grep "version = " pyproject.toml | sed -e 's/version = "\(.*\)"/\1/g')
@@ -431,15 +410,6 @@ jobs:
           else
             echo "Releasing ${version}"
           fi
-      - name: Check main branch
-        if: ${{ inputs.sha }}
-        run: |
-          # Fetch the main branch since a shallow checkout is used by default
-          git fetch origin main --unshallow
-          if ! git branch --contains ${{ inputs.sha }} | grep -E '(^|\s)main$'; then
-            echo "The specified sha is not on the main branch" >&2
-            exit 1
-          fi
       - name: Check SHA consistency
         if: ${{ inputs.sha }}
         run: |
@@ -494,9 +464,7 @@ jobs:
       # For git tag
       contents: write
     steps:
-      - uses: actions/checkout@v4
-        with:
-          ref: ${{ inputs.sha }}
+      - uses: actions/checkout@v3
       - name: git tag
         run: |
           git config user.email "hey@astral.sh"

.pre-commit-config.yaml

@@ -23,6 +23,8 @@ repos:
       - id: mdformat
         additional_dependencies:
           - mdformat-mkdocs
+          - mdformat-black
+          - black==23.1.0 # Must be the latest version of Black
 
   - repo: https://github.com/igorshubovych/markdownlint-cli
     rev: v0.33.0

BREAKING_CHANGES.md

@@ -1,30 +1,5 @@
 # Breaking Changes
 
-## 0.0.288
-
-### Remove support for emoji identifiers ([#7212](https://github.com/astral-sh/ruff/pull/7212))
-
-Previously, Ruff supported the non-standard compliant emoji identifiers e.g. `📦 = 1`.
-We decided to remove this non-standard language extension, and Ruff now reports syntax errors for emoji identifiers in your code, the same as CPython.
-
-### Improved GitLab fingerprints ([#7203](https://github.com/astral-sh/ruff/pull/7203))
-
-GitLab uses fingerprints to identify new, existing, or fixed violations. Previously, Ruff included the violation's position in the fingerprint. Using the location has the downside that changing any code before the violation causes the fingerprint to change, resulting in GitLab reporting one fixed and one new violation even though it is a pre-existing violation.
-
-Ruff now uses a more stable location-agnostic fingerprint to minimize that existing violations incorrectly get marked as fixed and re-reported as new violations.
-
-Expect GitLab to report each pre-existing violation in your project as fixed and a new violation in your Ruff upgrade PR.
-
-## 0.0.283 / 0.284
-
-### The target Python version now defaults to 3.8 instead of 3.10 ([#6397](https://github.com/astral-sh/ruff/pull/6397))
-
-Previously, when a target Python version was not specified, Ruff would use a default of Python 3.10. However, it is safer to default to an _older_ Python version to avoid assuming the availability of new features. We now default to the oldest supported Python version which is currently Python 3.8.
-
-(We still support Python 3.7 but since [it has reached EOL](https://devguide.python.org/versions/#unsupported-versions) we've decided not to make it the default here.)
-
-Note this change was announced in 0.0.283 but not active until 0.0.284.
-
 ## 0.0.277
 
 ### `.ipynb_checkpoints`, `.pyenv`, `.pytest_cache`, and `.vscode` are now excluded by default ([#5513](https://github.com/astral-sh/ruff/pull/5513))

CONTRIBUTING.md

@@ -129,9 +129,9 @@ At time of writing, the repository includes the following crates:
     intermediate representation. The backend for `ruff_python_formatter`.
 - `crates/ruff_index`: library crate inspired by `rustc_index`.
 - `crates/ruff_macros`: proc macro crate containing macros used by Ruff.
-- `crates/ruff_notebook`: library crate for parsing and manipulating Jupyter notebooks.
 - `crates/ruff_python_ast`: library crate containing Python-specific AST types and utilities.
 - `crates/ruff_python_codegen`: library crate containing utilities for generating Python source code.
+- `crates/ruff_python_codegen`: library crate containing utilities for generating Python source code.
 - `crates/ruff_python_formatter`: library crate implementing the Python formatter. Emits an
     intermediate representation for each node, which `ruff_formatter` prints based on the configured
     line length.
@@ -572,7 +572,7 @@ An alternative is to convert the perf data to `flamegraph.svg` using
 [flamegraph](https://github.com/flamegraph-rs/flamegraph) (`cargo install flamegraph`):
 
 ```shell
-flamegraph --perfdata perf.data --no-inline
+flamegraph --perfdata perf.data
 ```
 
 #### Mac

Cargo.toml

@@ -14,49 +14,45 @@ license = "MIT"
 [workspace.dependencies]
 anyhow = { version = "1.0.69" }
 bitflags = { version = "2.3.1" }
-chrono = { version = "0.4.30", default-features = false, features = ["clock"] }
-clap = { version = "4.4.3", features = ["derive"] }
+chrono = { version = "0.4.23", default-features = false, features = ["clock"] }
+clap = { version = "4.1.8", features = ["derive"] }
 colored = { version = "2.0.0" }
 filetime = { version = "0.2.20" }
 glob = { version = "0.3.1" }
 globset = { version = "0.4.10" }
 ignore = { version = "0.4.20" }
 insta = { version = "1.31.0", feature = ["filters", "glob"] }
-is-macro = { version = "0.3.0" }
+is-macro = { version = "0.2.2" }
 itertools = { version = "0.10.5" }
 log = { version = "0.4.17" }
-memchr = "2.6.3"
+memchr = "2.5.0"
 num-bigint = { version = "0.4.3" }
 num-traits = { version = "0.2.15" }
 once_cell = { version = "1.17.1" }
-path-absolutize = { version = "3.1.1" }
-proc-macro2 = { version = "1.0.67" }
+path-absolutize = { version = "3.0.14" }
+proc-macro2 = { version = "1.0.51" }
 quote = { version = "1.0.23" }
-regex = { version = "1.9.5" }
+regex = { version = "1.7.1" }
 rustc-hash = { version = "1.1.0" }
 schemars = { version = "0.8.12" }
 serde = { version = "1.0.152", features = ["derive"] }
-serde_json = { version = "1.0.106" }
+serde_json = { version = "1.0.93" }
 shellexpand = { version = "3.0.0" }
 similar = { version = "2.2.1", features = ["inline"] }
 smallvec = { version = "1.10.0" }
-static_assertions = "1.1.0"
-strum = { version = "0.25.0", features = ["strum_macros"] }
-strum_macros = { version = "0.25.2" }
-syn = { version = "2.0.33" }
+strum = { version = "0.24.1", features = ["strum_macros"] }
+strum_macros = { version = "0.24.3" }
+syn = { version = "2.0.15" }
 test-case = { version = "3.0.0" }
-thiserror = { version = "1.0.48" }
-toml = { version = "0.7.8" }
+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"] }
-unicode-ident = "1.0.11"
-unicode-width = "0.1.10"
-uuid = { version = "1.4.1", features = ["v4", "fast-rng", "macro-diagnostics", "js"] }
 wsl = { version = "0.1.0" }
 
 # v1.0.1
-libcst = { version = "0.1.0", default-features = false }
+libcst = { git = "https://github.com/Instagram/LibCST.git", rev = "3cacca1a1029f05707e50703b49fe3dd860aa839", default-features = false }
 
 [profile.release]
 lto = "fat"

LICENSE

@@ -1224,31 +1224,6 @@ are:
     SOFTWARE.
   """
 
-- flake8-logging, licensed as follows:
-  """
-    MIT License
-
-    Copyright (c) 2023 Adam Johnson
-
-    Permission is hereby granted, free of charge, to any person obtaining a copy
-    of this software and associated documentation files (the "Software"), to deal
-    in the Software without restriction, including without limitation the rights
-    to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-    copies of the Software, and to permit persons to whom the Software is
-    furnished to do so, subject to the following conditions:
-
-    The above copyright notice and this permission notice shall be included in all
-    copies or substantial portions of the Software.
-
-    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-    IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-    FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-    AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-    LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-    OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-    SOFTWARE.
-  """
-
 - Pyright, licensed as follows:
   """
     MIT License

README.md

@@ -30,7 +30,7 @@ An extremely fast Python linter, written in Rust.
 - 🤝 Python 3.11 compatibility
 - 📦 Built-in caching, to avoid re-analyzing unchanged files
 - 🔧 Autofix support, for automatic error correction (e.g., automatically remove unused imports)
-- 📏 Over [600 built-in rules](https://beta.ruff.rs/docs/rules/)
+- 📏 Over [500 built-in rules](https://beta.ruff.rs/docs/rules/)
 - ⚖️ [Near-parity](https://beta.ruff.rs/docs/faq/#how-does-ruff-compare-to-flake8) with the
     built-in Flake8 rule set
 - 🔌 Native re-implementations of dozens of Flake8 plugins, like flake8-bugbear
@@ -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.290
+  rev: v0.0.282
   hooks:
     - id: ruff
 ```
@@ -211,8 +211,8 @@ line-length = 88
 # Allow unused variables when underscore-prefixed.
 dummy-variable-rgx = "^(_+|(_+[a-zA-Z0-9_]*[a-zA-Z0-9]+?))$"
 
-# Assume Python 3.8
-target-version = "py38"
+# Assume Python 3.10.
+target-version = "py310"
 
 [tool.ruff.mccabe]
 # Unlike Flake8, default to a complexity level of 10.
@@ -233,7 +233,7 @@ linting command.
 
 <!-- Begin section: Rules -->
 
-**Ruff supports over 600 lint rules**, many of which are inspired by popular tools like Flake8,
+**Ruff supports over 500 lint rules**, many of which are inspired by popular tools like Flake8,
 isort, pyupgrade, and others. Regardless of the rule's origin, Ruff re-implements every rule in
 Rust as a first-party feature.
 
@@ -274,7 +274,6 @@ quality tools, including:
 - [flake8-gettext](https://pypi.org/project/flake8-gettext/)
 - [flake8-implicit-str-concat](https://pypi.org/project/flake8-implicit-str-concat/)
 - [flake8-import-conventions](https://github.com/joaopalmeiro/flake8-import-conventions)
-- [flake8-logging](https://pypi.org/project/flake8-logging/)
 - [flake8-logging-format](https://pypi.org/project/flake8-logging-format/)
 - [flake8-no-pep420](https://pypi.org/project/flake8-no-pep420)
 - [flake8-pie](https://pypi.org/project/flake8-pie/)
@@ -399,7 +398,6 @@ Ruff is used by a number of major open-source projects and companies, including:
 - [Pydantic](https://github.com/pydantic/pydantic)
 - [Pylint](https://github.com/PyCQA/pylint)
 - [Reflex](https://github.com/reflex-dev/reflex)
-- [Rippling](https://rippling.com)
 - [Robyn](https://github.com/sansyrox/robyn)
 - Scale AI ([Launch SDK](https://github.com/scaleapi/launch-python-client))
 - Snowflake ([SnowCLI](https://github.com/Snowflake-Labs/snowcli))

crates/flake8_to_ruff/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "flake8-to-ruff"
-version = "0.0.290"
+version = "0.0.282"
 description = """
 Convert Flake8 configuration files to Ruff configuration files.
 """
@@ -14,16 +14,12 @@ license = { workspace = true }
 
 [dependencies]
 ruff = { path = "../ruff", default-features = false }
-ruff_workspace = { path = "../ruff_workspace" }
 
 anyhow = { workspace = true }
 clap = { workspace = true }
 colored = { workspace = true }
 configparser = { version = "3.0.2" }
-itertools = { workspace = true }
-log = { workspace = true }
 once_cell = { workspace = true }
-pep440_rs = { version = "0.3.1", features = ["serde"] }
 regex = { workspace = true }
 rustc-hash = { workspace = true }
 serde = { workspace = true }
@@ -31,6 +27,3 @@ serde_json = { workspace = true }
 strum = { workspace = true }
 strum_macros = { workspace = true }
 toml = { workspace = true }
-
-[dev-dependencies]
-pretty_assertions = "1.3.0"

crates/flake8_to_ruff/src/external_config.rs

@@ -1,10 +0,0 @@
-use super::black::Black;
-use super::isort::Isort;
-use super::pep621::Project;
-
-#[derive(Default)]
-pub(crate) struct ExternalConfig<'a> {
-    pub(crate) black: Option<&'a Black>,
-    pub(crate) isort: Option<&'a Isort>,
-    pub(crate) project: Option<&'a Project>,
-}

crates/flake8_to_ruff/src/main.rs

@@ -1,24 +1,12 @@
 //! Utility to generate Ruff's `pyproject.toml` section from a Flake8 INI file.
 
-mod black;
-mod converter;
-mod external_config;
-mod isort;
-mod parser;
-mod pep621;
-mod plugin;
-mod pyproject;
-
 use std::path::PathBuf;
 
 use anyhow::Result;
 use clap::Parser;
 use configparser::ini::Ini;
 
-use crate::converter::convert;
-use crate::external_config::ExternalConfig;
-use crate::plugin::Plugin;
-use crate::pyproject::parse;
+use ruff::flake8_to_ruff::{self, ExternalConfig};
 use ruff::logging::{set_up_logging, LogLevel};
 
 #[derive(Parser)]
@@ -37,7 +25,7 @@ struct Args {
     pyproject: Option<PathBuf>,
     /// List of plugins to enable.
     #[arg(long, value_delimiter = ',')]
-    plugin: Option<Vec<Plugin>>,
+    plugin: Option<Vec<flake8_to_ruff::Plugin>>,
 }
 
 fn main() -> Result<()> {
@@ -51,7 +39,7 @@ fn main() -> Result<()> {
     let config = ini.load(args.file).map_err(|msg| anyhow::anyhow!(msg))?;
 
     // Read the pyproject.toml file.
-    let pyproject = args.pyproject.map(parse).transpose()?;
+    let pyproject = args.pyproject.map(flake8_to_ruff::parse).transpose()?;
     let external_config = pyproject
         .as_ref()
         .and_then(|pyproject| pyproject.tool.as_ref())
@@ -69,7 +57,7 @@ fn main() -> Result<()> {
     };
 
     // Create Ruff's pyproject.toml section.
-    let pyproject = convert(&config, &external_config, args.plugin);
+    let pyproject = flake8_to_ruff::convert(&config, &external_config, args.plugin)?;
 
     #[allow(clippy::print_stdout)]
     {

crates/ruff/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "ruff"
-version = "0.0.290"
+version = "0.0.282"
 publish = false
 authors = { workspace = true }
 edition = { workspace = true }
@@ -18,7 +18,6 @@ name = "ruff"
 ruff_cache = { path = "../ruff_cache" }
 ruff_diagnostics = { path = "../ruff_diagnostics", features = ["serde"] }
 ruff_index = { path = "../ruff_index" }
-ruff_notebook = { path = "../ruff_notebook" }
 ruff_macros = { path = "../ruff_macros" }
 ruff_python_ast = { path = "../ruff_python_ast", features = ["serde"] }
 ruff_python_codegen = { path = "../ruff_python_codegen" }
@@ -37,9 +36,11 @@ bitflags = { workspace = true }
 chrono = { workspace = true }
 clap = { workspace = true, features = ["derive", "string"], optional = true }
 colored = { workspace = true }
+dirs = { version = "5.0.0" }
 fern = { version = "0.6.1" }
 glob = { workspace = true }
 globset = { workspace = true }
+ignore = { workspace = true }
 imperative = { version = "1.0.4" }
 is-macro = { workspace = true }
 itertools = { workspace = true }
@@ -56,23 +57,27 @@ path-absolutize = { workspace = true, features = [
 ] }
 pathdiff = { version = "0.2.1" }
 pep440_rs = { version = "0.3.1", features = ["serde"] }
-pyproject-toml = { version = "0.7.0" }
+pyproject-toml = { version = "0.6.0" }
 quick-junit = { version = "0.3.2" }
 regex = { workspace = true }
 result-like = { version = "0.4.6" }
 rustc-hash = { workspace = true }
+
+
 schemars = { workspace = true, optional = true }
 semver = { version = "1.0.16" }
 serde = { workspace = true }
 serde_json = { workspace = true }
+serde_with = { version = "3.0.0" }
 similar = { workspace = true }
+shellexpand = { workspace = true }
 smallvec = { workspace = true }
 strum = { workspace = true }
 strum_macros = { workspace = true }
-thiserror = { workspace = true }
+thiserror = { version = "1.0.43" }
 toml = { workspace = true }
 typed-arena = { version = "2.0.2" }
-unicode-width = { workspace = true }
+unicode-width = { version = "0.1.10" }
 unicode_names2 = { version = "0.6.0", git = "https://github.com/youknowone/unicode_names2.git", rev = "4ce16aa85cbcdd9cc830410f1a72ef9a235f2fde" }
 wsl = { version = "0.1.0" }
 

crates/ruff/resources/test/fixtures/eradicate/ERA001.py

@@ -19,12 +19,3 @@ def foo(x, y, z):
 class A():
     pass
     # b = c
-
-
-dictionary = {
-    # "key1": 123,  # noqa: ERA001
-    # "key2": 456,
-    # "key3": 789,  # test
-}
-
-#import os  # noqa

crates/ruff/resources/test/fixtures/flake8_annotations/annotation_presence.py

@@ -152,9 +152,3 @@ def f(a: Union[str, bytes, Any]) -> None: ...
 def f(a: Optional[Any]) -> None: ...
 def f(a: Annotated[Any, ...]) -> None: ...
 def f(a: "Union[str, bytes, Any]") -> None: ...
-
-
-class Foo:
-    @decorator()
-    def __init__(self: "Foo", foo: int):
-       ...

crates/ruff/resources/test/fixtures/flake8_bandit/S108.py

@@ -14,19 +14,3 @@ with open("/dev/shm/unit/test", "w") as f:
 # not ok by config
 with open("/foo/bar", "w") as f:
     f.write("def")
-
-# Using `tempfile` module should be ok
-import tempfile
-from tempfile import TemporaryDirectory
-
-with tempfile.NamedTemporaryFile(dir="/tmp") as f:
-    f.write(b"def")
-
-with tempfile.NamedTemporaryFile(dir="/var/tmp") as f:
-    f.write(b"def")
-
-with tempfile.TemporaryDirectory(dir="/dev/shm") as d:
-    pass
-
-with TemporaryDirectory(dir="/tmp") as d:
-    pass

crates/ruff/resources/test/fixtures/flake8_boolean_trap/FBT.py

@@ -69,7 +69,6 @@ g_action.set_enabled(True)
 settings.set_enable_developer_extras(True)
 foo.is_(True)
 bar.is_not(False)
-next(iter([]), False)
 
 class Registry:
     def __init__(self) -> None:

crates/ruff/resources/test/fixtures/flake8_bugbear/B006_1.py

@@ -1,5 +0,0 @@
-# Docstring followed by a newline
-
-def foobar(foor, bar={}):    
-    """
-    """

crates/ruff/resources/test/fixtures/flake8_bugbear/B006_2.py

@@ -1,6 +0,0 @@
-# Docstring followed by whitespace with no newline
-# Regression test for https://github.com/astral-sh/ruff/issues/7155
-
-def foobar(foor, bar={}):    
-    """
-    """                    

crates/ruff/resources/test/fixtures/flake8_bugbear/B006_3.py

@@ -1,6 +0,0 @@
-# Docstring with no newline
-
-
-def foobar(foor, bar={}):    
-    """
-    """

crates/ruff/resources/test/fixtures/flake8_bugbear/B006_B008.py

@@ -68,20 +68,6 @@ def this_is_also_wrong(value={}):
     ...
 
 
-class Foo:
-    @staticmethod
-    def this_is_also_wrong_and_more_indented(value={}):
-        pass
-
-
-def multiline_arg_wrong(value={
-
-}):
-    ...
-
-def single_line_func_wrong(value = {}): ...
-
-
 def and_this(value=set()):
     ...
 
@@ -230,10 +216,6 @@ def timedelta_okay(value=dt.timedelta(hours=1)):
 def path_okay(value=Path(".")):
     pass
 
-# B008 allow arbitrary call with immutable annotation
-def immutable_annotation_call(value: Sequence[int] = foo()):
-    pass
-
 # B006 and B008
 # We should handle arbitrary nesting of these B008.
 def nested_combo(a=[float(3), dt.datetime.now()]):
@@ -258,16 +240,12 @@ def foo(f=lambda x: print(x)):
 
 from collections import abc
 from typing import Annotated, Dict, Optional, Sequence, Union, Set
-import typing_extensions
 
 
 def immutable_annotations(
     a: Sequence[int] | None = [],
     b: Optional[abc.Mapping[int, int]] = {},
     c: Annotated[Union[abc.Set[str], abc.Sized], "annotation"] = set(),
-    d: typing_extensions.Annotated[
-        Union[abc.Set[str], abc.Sized], "annotation"
-    ] = set(),
 ):
     pass
 
@@ -276,39 +254,5 @@ def mutable_annotations(
     a: list[int] | None = [],
     b: Optional[Dict[int, int]] = {},
     c: Annotated[Union[Set[str], abc.Sized], "annotation"] = set(),
-    d: typing_extensions.Annotated[Union[Set[str], abc.Sized], "annotation"] = set(),
 ):
     pass
-
-
-def single_line_func_wrong(value: dict[str, str] = {}):
-    """Docstring"""
-
-
-def single_line_func_wrong(value: dict[str, str] = {}):
-    """Docstring"""
-    ...
-
-
-def single_line_func_wrong(value: dict[str, str] = {}):
-    """Docstring"""; ...
-
-
-def single_line_func_wrong(value: dict[str, str] = {}):
-    """Docstring"""; \
-        ...
-
-
-def single_line_func_wrong(value: dict[str, str] = {
-    # This is a comment
-}):
-    """Docstring"""
-
-
-def single_line_func_wrong(value: dict[str, str] = {}) \
-    : \
-    """Docstring"""
-
-
-def single_line_func_wrong(value: dict[str, str] = {}):
-    """Docstring without newline"""

crates/ruff/resources/test/fixtures/flake8_bugbear/B006_extended.py

@@ -1,18 +0,0 @@
-import custom
-from custom import ImmutableTypeB
-
-
-def okay(foo: ImmutableTypeB = []):
-    ...
-
-
-def okay(foo: custom.ImmutableTypeA = []):
-    ...
-
-
-def okay(foo: custom.ImmutableTypeB = []):
-    ...
-
-
-def error_due_to_missing_import(foo: ImmutableTypeA = []):
-    ...

crates/ruff/resources/test/fixtures/flake8_bugbear/B008_extended.py

@@ -1,7 +1,6 @@
 from typing import List
 
 import fastapi
-import custom
 from fastapi import Query
 
 
@@ -17,9 +16,5 @@ def okay(data: List[str] = Query(None)):
     ...
 
 
-def okay(data: custom.ImmutableTypeA = foo()):
-    ...
-
-
 def error_due_to_missing_import(data: List[str] = Depends(None)):
     ...

crates/ruff/resources/test/fixtures/flake8_bugbear/B009_B010.py

@@ -1,7 +1,7 @@
 """
 Should emit:
-B009 - Lines 19-31
-B010 - Lines 40-45
+B009 - Line 19, 20, 21, 22, 23, 24
+B010 - Line 40, 41, 42, 43, 44, 45
 """
 
 # Valid getattr usage
@@ -24,16 +24,6 @@ getattr(foo, r"abc123")
 _ = lambda x: getattr(x, "bar")
 if getattr(x, "bar"):
     pass
-getattr(1, "real")
-getattr(1., "real")
-getattr(1.0, "real")
-getattr(1j, "real")
-getattr(True, "real")
-getattr(x := 1, "real")
-getattr(x + y, "real")
-getattr("foo"
-        "bar", "real")
-
 
 # Valid setattr usage
 setattr(foo, bar, None)

crates/ruff/resources/test/fixtures/flake8_bugbear/B013.py

@@ -1,5 +1,3 @@
-retriable_exceptions = (FileExistsError, FileNotFoundError)
-
 try:
     pass
 except (ValueError,):
@@ -8,7 +6,3 @@ except AttributeError:
     pass
 except (ImportError, TypeError):
     pass
-except (*retriable_exceptions,):
-    pass
-except(ValueError,):
-    pass

crates/ruff/resources/test/fixtures/flake8_bugbear/B014.py

@@ -74,10 +74,3 @@ try:
 except (ValueError, binascii.Error):
     # binascii.Error is a subclass of ValueError.
     pass
-
-
-# https://github.com/astral-sh/ruff/issues/6412
-try:
-    pass
-except (ValueError, ValueError, TypeError):
-    pass

crates/ruff/resources/test/fixtures/flake8_comprehensions/C402.py

@@ -16,6 +16,3 @@ def f(x):
     return x
 
 print(f'Hello {dict((x,f(x)) for x in "abc")} World')
-
-# Regression test for: https://github.com/astral-sh/ruff/issues/7086
-dict((k,v)for k,v in d.iteritems() if k in only_args)

crates/ruff/resources/test/fixtures/flake8_comprehensions/C404.py

@@ -11,6 +11,3 @@ f"{dict([(s,f(s)) for s in 'ab'])}"
 
 f'{dict([(s,s) for s in "ab"]) | dict([(s,s) for s in "ab"])}'
 f'{ dict([(s,s) for s in "ab"]) | dict([(s,s) for s in "ab"]) }'
-
-# Regression test for: https://github.com/astral-sh/ruff/issues/7087
-saved.append(dict([(k, v)for k,v in list(unique_instance.__dict__.items()) if k in [f.name for f in unique_instance._meta.fields]]))

crates/ruff/resources/test/fixtures/flake8_comprehensions/C413.py

@@ -7,13 +7,6 @@ reversed(sorted(x, reverse=True))
 reversed(sorted(x, key=lambda e: e, reverse=True))
 reversed(sorted(x, reverse=True, key=lambda e: e))
 reversed(sorted(x, reverse=False))
-reversed(sorted(x, reverse=x))
-reversed(sorted(x, reverse=not x))
-
-# Regression test for: https://github.com/astral-sh/ruff/issues/7289
-reversed(sorted(i for i in range(42)))
-reversed(sorted((i for i in range(42)), reverse=True))
-
 
 def reversed(*args, **kwargs):
     return None

crates/ruff/resources/test/fixtures/flake8_comprehensions/C414.py

@@ -22,10 +22,6 @@ tuple(
         "o"]
     )
 )
-set(set())
-set(list())
-set(tuple())
-sorted(reversed())
 
 # Nested sorts with differing keyword arguments. Not flagged.
 sorted(sorted(x, key=lambda y: y))

crates/ruff/resources/test/fixtures/flake8_comprehensions/C416.py

@@ -7,8 +7,6 @@ d = {"a": 1, "b": 2, "c": 3}
 {i for i in x}
 {k: v for k, v in y}
 {k: v for k, v in d.items()}
-[(k, v) for k, v in d.items()]
-{k: (a, b) for k, (a, b) in d.items()}
 
 [i for i, in z]
 [i for i, j in y]
@@ -19,6 +17,3 @@ d = {"a": 1, "b": 2, "c": 3}
 {k.foo: k for k in y}
 {k["foo"]: k for k in y}
 {k: v if v else None for k, v in y}
-
-# Regression test for: https://github.com/astral-sh/ruff/issues/7196
-any(len(symbol_table.get_by_type(symbol_type)) > 0 for symbol_type in[t for t in SymbolType])

crates/ruff/resources/test/fixtures/flake8_comprehensions/C417.py

@@ -5,18 +5,21 @@ map(lambda x: str(x), nums)
 list(map(lambda x: x * 2, nums))
 set(map(lambda x: x % 2 == 0, nums))
 dict(map(lambda v: (v, v**2), nums))
-dict(map(lambda v: [v, v**2], nums))
 map(lambda: "const", nums)
 map(lambda _: 3.0, nums)
 _ = "".join(map(lambda x: x in nums and "1" or "0", range(123)))
 all(map(lambda v: isinstance(v, dict), nums))
 filter(func, map(lambda v: v, nums))
-list(map(lambda x, y: x * y, nums))
 
 # When inside f-string, then the fix should be surrounded by whitespace
 _ = f"{set(map(lambda x: x % 2 == 0, nums))}"
 _ = f"{dict(map(lambda v: (v, v**2), nums))}"
 
+# Error, but unfixable.
+# For simple expressions, this could be: `(x if x else 1 for x in nums)`.
+# For more complex expressions, this would differ: `(x + 2 if x else 3 for x in nums)`.
+map(lambda x=1: x, nums)
+
 # False negatives.
 map(lambda x=2, y=1: x + y, nums, nums)
 set(map(lambda x, y: x, nums, nums))
@@ -34,16 +37,3 @@ map(lambda x: lambda: x, range(4))
 
 # Error: the `x` is overridden by the inner lambda.
 map(lambda x: lambda x: x, range(4))
-
-# Ok because of the default parameters, and variadic arguments.
-map(lambda x=1: x, nums)
-map(lambda *args: len(args), range(4))
-map(lambda **kwargs: len(kwargs), range(4))
-
-# Ok because multiple arguments are allowed.
-dict(map(lambda k, v: (k, v), keys, values))
-
-# Regression test for: https://github.com/astral-sh/ruff/issues/7121
-map(lambda x: x, y if y else z)
-map(lambda x: x, (y if y else z))
-map(lambda x: x, (x, y, z))

crates/ruff/resources/test/fixtures/flake8_import_conventions/defaults.py

@@ -1,31 +1,22 @@
-def not_checked():
-    import math
+import math  # not checked
 
+import altair  # unconventional
+import matplotlib.pyplot  # unconventional
+import numpy  # unconventional
+import pandas  # unconventional
+import seaborn  # unconventional
+import tkinter  # unconventional
 
-def unconventional():
-    import altair
-    import matplotlib.pyplot
-    import numpy
-    import pandas
-    import seaborn
-    import tkinter
-    import networkx
+import altair as altr  # unconventional
+import matplotlib.pyplot as plot  # unconventional
+import numpy as nmp  # unconventional
+import pandas as pdas  # unconventional
+import seaborn as sbrn  # unconventional
+import tkinter as tkr  # unconventional
 
-
-def unconventional_aliases():
-    import altair as altr
-    import matplotlib.pyplot as plot
-    import numpy as nmp
-    import pandas as pdas
-    import seaborn as sbrn
-    import tkinter as tkr
-    import networkx as nxy
-
-def conventional_aliases():
-    import altair as alt
-    import matplotlib.pyplot as plt
-    import numpy as np
-    import pandas as pd
-    import seaborn as sns
-    import tkinter as tk
-    import networkx as nx
+import altair as alt  # conventional
+import matplotlib.pyplot as plt  # conventional
+import numpy as np  # conventional
+import pandas as pd  # conventional
+import seaborn as sns  # conventional
+import tkinter as tk  # conventional

crates/ruff/resources/test/fixtures/flake8_import_conventions/tricky.py

@@ -1,9 +0,0 @@
-"""Test cases for difficult renames."""
-
-
-def rename_global():
-    try:
-        global pandas
-        import pandas
-    except ImportError:
-        return False

crates/ruff/resources/test/fixtures/flake8_logging/LOG001.py

@@ -1,5 +0,0 @@
-import logging
-
-logging.Logger(__name__)
-logging.Logger()
-logging.getLogger(__name__)

crates/ruff/resources/test/fixtures/flake8_logging/LOG009.py

@@ -1,9 +0,0 @@
-import logging
-
-logging.WARN  # LOG009
-logging.WARNING  # OK
-
-from logging import WARN, WARNING
-
-WARN  # LOG009
-WARNING  # OK

crates/ruff/resources/test/fixtures/flake8_logging_format/G004.py

@@ -3,6 +3,3 @@ import logging
 name = "world"
 logging.info(f"Hello {name}")
 logging.log(logging.INFO, f"Hello {name}")
-
-_LOGGER = logging.getLogger()
-_LOGGER.info(f"{__name__}")

crates/ruff/resources/test/fixtures/flake8_pie/PIE808.py

@@ -1,13 +0,0 @@
-# PIE808
-range(0, 10)
-
-# OK
-range(x, 10)
-range(-15, 10)
-range(10)
-range(0)
-range(0, 10, x)
-range(0, 10, 1)
-range(0, 10, step=1)
-range(start=0, stop=10)
-range(0, stop=10)

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

@@ -3,20 +3,16 @@ def bar():
 
 
 def foo():
-    """foo"""  # OK, docstrings are handled by another rule
+    """foo"""  # OK
 
 
 def buzz():
-    print("buzz")  # ERROR PYI010
+    print("buzz")  # OK, not in stub file
 
 
 def foo2():
-    123  # ERROR PYI010
+    123  # OK, not in a stub file
 
 
 def bizz():
-    x = 123  # ERROR PYI010
-
-
-def foo3():
-    pass  # OK, pass is handled by another rule
+    x = 123  # OK, not in a stub file

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

@@ -1,6 +1,6 @@
 def bar(): ...  # OK
 def foo():
-    """foo"""  # OK, docstrings are handled by another rule
+    """foo"""  # OK, strings are handled by another rule
 
 def buzz():
     print("buzz")  # ERROR PYI010
@@ -10,6 +10,3 @@ def foo2():
 
 def bizz():
     x = 123  # ERROR PYI010
-
-def foo3():
-    pass  # OK, pass is handled by another rule

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

@@ -1,19 +1,20 @@
-import typing
-
 # Shouldn't affect non-union field types.
 field1: str
 
 # Should emit for duplicate field types.
 field2: str | str  # PYI016: Duplicate union member `str`
 
+
 # Should emit for union types in arguments.
 def func1(arg1: int | int):  # PYI016: Duplicate union member `int`
     print(arg1)
 
+
 # Should emit for unions in return types.
 def func2() -> str | str:  # PYI016: Duplicate union member `str`
     return "my string"
 
+
 # Should emit in longer unions, even if not directly adjacent.
 field3: str | str | int  # PYI016: Duplicate union member `str`
 field4: int | int | str  # PYI016: Duplicate union member `int`
@@ -32,55 +33,3 @@ field10: (str | int) | str  # PYI016: Duplicate union member `str`
 
 # Should emit for nested unions.
 field11: dict[int | int, str]
-
-# Should emit for unions with more than two cases
-field12: int | int | int  # Error
-field13: int | int | int | int  # Error
-
-# Should emit for unions with more than two cases, even if not directly adjacent
-field14: int | int | str | int  # Error
-
-# Should emit for duplicate literal types; also covered by PYI030
-field15: typing.Literal[1] | typing.Literal[1]  # Error
-
-# Shouldn't emit if in new parent type
-field16: int | dict[int, str]  # OK
-
-# Shouldn't emit if not in a union parent
-field17: dict[int, int]  # OK
-
-# Should emit in cases with newlines
-field18: typing.Union[
-    set[
-        int  # foo
-    ],
-    set[
-        int  # bar
-    ],
-]  # Error, newline and comment will not be emitted in message
-
-# Should emit in cases with `typing.Union` instead of `|`
-field19: typing.Union[int, int]  # Error
-
-# Should emit in cases with nested `typing.Union`
-field20: typing.Union[int, typing.Union[int, str]]  # Error
-
-# Should emit in cases with mixed `typing.Union` and `|`
-field21: typing.Union[int, int | str]  # Error
-
-# Should emit only once in cases with multiple nested `typing.Union`
-field22: typing.Union[int, typing.Union[int, typing.Union[int, int]]]  # Error
-
-# Should emit in cases with newlines
-field23: set[  # foo
-    int] | set[int]
-
-# Should emit twice (once for each `int` in the nested union, both of which are
-# duplicates of the outer `int`), but not three times (which would indicate that
-# we incorrectly re-checked the nested union).
-field24: typing.Union[int, typing.Union[int, int]]  # PYI016: Duplicate union member `int`
-
-# Should emit twice (once for each `int` in the nested union, both of which are
-# duplicates of the outer `int`), but not three times (which would indicate that
-# we incorrectly re-checked the nested union).
-field25: typing.Union[int, int | int]  # PYI016: Duplicate union member `int`

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

@@ -74,13 +74,3 @@ field22: typing.Union[int, typing.Union[int, typing.Union[int, int]]]  # Error
 # Should emit in cases with newlines
 field23: set[  # foo
     int] | set[int]
-
-# Should emit twice (once for each `int` in the nested union, both of which are
-# duplicates of the outer `int`), but not three times (which would indicate that
-# we incorrectly re-checked the nested union).
-field24: typing.Union[int, typing.Union[int, int]]  # PYI016: Duplicate union member `int`
-
-# Should emit twice (once for each `int` in the nested union, both of which are
-# duplicates of the outer `int`), but not three times (which would indicate that
-# we incorrectly re-checked the nested union).
-field25: typing.Union[int, int | int]  # PYI016: Duplicate union member `int`

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

@@ -14,10 +14,6 @@ class BadClass:
     def bad_class_method(cls: type[_S], arg: int) -> _S: ...  # PYI019
 
 
-    @classmethod
-    def bad_posonly_class_method(cls: type[_S], /) -> _S: ...  # PYI019
-
-
     @classmethod
     def excluded_edge_case(cls: Type[_S], arg: int) -> _S: ...  # Ok
 

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

@@ -14,10 +14,6 @@ class BadClass:
     def bad_class_method(cls: type[_S], arg: int) -> _S: ...  # PYI019
 
 
-    @classmethod
-    def bad_posonly_class_method(cls: type[_S], /) -> _S: ...  # PYI019
-
-
     @classmethod
     def excluded_edge_case(cls: Type[_S], arg: int) -> _S: ...  # Ok
 

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

@@ -1,27 +1,19 @@
-def bar():
-    ...  # OK
+def bar():    # OK
+    ...
 
 
-def bar():
-    pass  # OK
-
-
-def bar():
-    """oof"""  # OK
-
-
-def oof():  # ERROR PYI048
+def oof():    # OK, docstrings are handled by another rule
     """oof"""
     print("foo")
 
 
-def foo():  # ERROR PYI048
+def foo():    # Ok not in Stub file
     """foo"""
     print("foo")
     print("foo")
 
 
-def buzz():  # ERROR PYI048
+def buzz():    # Ok not in Stub file
     print("fizz")
     print("buzz")
     print("test")

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

@@ -1,20 +1,20 @@
-def bar(): ...  # OK
 def bar():
-    pass  # OK
+    ...  # OK
 
-def bar():
-    """oof"""  # OK
 
-def oof():  # ERROR PYI048
-    """oof"""
-    print("foo")
+def oof():   # OK, docstrings are handled by another rule
+  """oof"""
+  print("foo")
 
-def foo():  # ERROR PYI048
+
+
+def foo():   # ERROR PYI048
     """foo"""
     print("foo")
     print("foo")
 
-def buzz():  # ERROR PYI048
+
+def buzz():   # ERROR PYI048
     print("fizz")
     print("buzz")
     print("test")

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

@@ -1,6 +1,7 @@
 import builtins
 from typing import Union
 
+
 w: builtins.type[int] | builtins.type[str] | builtins.type[complex]
 x: type[int] | type[str] | type[float]
 y: builtins.type[int] | type[str] | builtins.type[complex]
@@ -8,9 +9,7 @@ z: Union[type[float], type[complex]]
 z: Union[type[float, int], type[complex]]
 
 
-def func(arg: type[int] | str | type[float]) -> None:
-    ...
-
+def func(arg: type[int] | str | type[float]) -> None: ...
 
 # OK
 x: type[int, str, float]
@@ -18,14 +17,4 @@ y: builtins.type[int, str, complex]
 z: Union[float, complex]
 
 
-def func(arg: type[int, float] | str) -> None:
-    ...
-
-
-# OK
-item: type[requests_mock.Mocker] | type[httpretty] = requests_mock.Mocker
-
-
-def func():
-    # PYI055
-    item: type[requests_mock.Mocker] | type[httpretty] = requests_mock.Mocker
+def func(arg: type[int, float] | str) -> None: ...

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

@@ -1,12 +1,14 @@
 import builtins
 from typing import Union
 
+
 w: builtins.type[int] | builtins.type[str] | builtins.type[complex]
 x: type[int] | type[str] | type[float]
 y: builtins.type[int] | type[str] | builtins.type[complex]
 z: Union[type[float], type[complex]]
 z: Union[type[float, int], type[complex]]
 
+
 def func(arg: type[int] | str | type[float]) -> None: ...
 
 # OK
@@ -14,11 +16,5 @@ x: type[int, str, float]
 y: builtins.type[int, str, complex]
 z: Union[float, complex]
 
+
 def func(arg: type[int, float] | str) -> None: ...
-
-# OK
-item: type[requests_mock.Mocker] | type[httpretty] = requests_mock.Mocker
-
-def func():
-    # PYI055
-    item: type[requests_mock.Mocker] | type[httpretty] = requests_mock.Mocker

crates/ruff/resources/test/fixtures/flake8_pytest_style/PT006.py

@@ -64,8 +64,3 @@ def test_implicit_str_concat_no_parens(param1, param2, param3):
 @pytest.mark.parametrize((("param1, " "param2, " "param3")), [(1, 2, 3), (4, 5, 6)])
 def test_implicit_str_concat_with_multi_parens(param1, param2, param3):
     ...
-
-
-@pytest.mark.parametrize(("param1,param2"), [(1, 2), (3, 4)])
-def test_csv_with_parens(param1, param2):
-    ...

crates/ruff/resources/test/fixtures/flake8_pytest_style/PT009.py

@@ -80,15 +80,3 @@ class Test(unittest.TestCase):
 
     def test_assert_not_regexp_matches(self):
         self.assertNotRegex("abc", r"abc")  # Error
-
-    def test_fail_if(self):
-        self.failIf("abc")  # Error
-
-    def test_fail_unless(self):
-        self.failUnless("abc")  # Error
-
-    def test_fail_unless_equal(self):
-        self.failUnlessEqual(1, 2)  # Error
-
-    def test_fail_if_equal(self):
-        self.failIfEqual(1, 2)  # Error

crates/ruff/resources/test/fixtures/flake8_pytest_style/PT011.py

@@ -1,4 +1,3 @@
-from pickle import PicklingError, UnpicklingError
 import socket
 
 import pytest
@@ -21,12 +20,6 @@ def test_error_no_argument_given():
     with pytest.raises(socket.error):
         raise ValueError("Can't divide 1 by 0")
 
-    with pytest.raises(PicklingError):
-        raise PicklingError("Can't pickle")
-
-    with pytest.raises(UnpicklingError):
-        raise UnpicklingError("Can't unpickle")
-
 
 def test_error_match_is_empty():
     with pytest.raises(ValueError, match=None):

crates/ruff/resources/test/fixtures/flake8_pytest_style/PT014.py

@@ -1,53 +0,0 @@
-import pytest
-
-
-@pytest.mark.parametrize("x", [1, 1, 2])
-def test_error_literal(x):
-    ...
-
-
-a = 1
-b = 2
-c = 3
-
-
-@pytest.mark.parametrize("x", [a, a, b, b, b, c])
-def test_error_expr_simple(x):
-    ...
-
-
-@pytest.mark.parametrize(
-    "x",
-    [
-        (a, b),
-        # comment
-        (a, b),
-        (b, c),
-    ],
-)
-def test_error_expr_complex(x):
-    ...
-
-
-@pytest.mark.parametrize("x", [a, b, (a), c, ((a))])
-def test_error_parentheses(x):
-    ...
-
-
-@pytest.mark.parametrize(
-    "x",
-    [
-        a,
-        b,
-        (a),
-        c,
-        ((a)),
-    ],
-)
-def test_error_parentheses_trailing_comma(x):
-    ...
-
-
-@pytest.mark.parametrize("x", [1, 2])
-def test_ok(x):
-    ...

crates/ruff/resources/test/fixtures/flake8_pytest_style/PT018.py

@@ -43,30 +43,3 @@ message
 assert something  # OK
 assert something and something_else  # Error
 assert something and something_else and something_third  # Error
-
-
-def test_multiline():
-    assert something and something_else; x = 1
-
-    x = 1; assert something and something_else
-
-    x = 1; \
-        assert something and something_else
-
-
-# Regression test for: https://github.com/astral-sh/ruff/issues/7143
-def test_parenthesized_not():
-    assert not (
-        self.find_graph_output(node.output[0])
-        or self.find_graph_input(node.input[0])
-        or self.find_graph_output(node.input[0])
-    )
-
-    assert (not (
-        self.find_graph_output(node.output[0])
-        or self.find_graph_input(node.input[0])
-        or self.find_graph_output(node.input[0])
-    ))
-
-    assert (not self.find_graph_output(node.output[0]) or
-            self.find_graph_input(node.input[0]))

crates/ruff/resources/test/fixtures/flake8_pytest_style/PT027_0.py

@@ -1,48 +0,0 @@
-import unittest
-
-
-class Test(unittest.TestCase):
-    def test_errors(self):
-        with self.assertRaises(ValueError):
-            raise ValueError
-        with self.assertRaises(expected_exception=ValueError):
-            raise ValueError
-
-        with self.failUnlessRaises(ValueError):
-            raise ValueError
-
-        with self.assertRaisesRegex(ValueError, "test"):
-            raise ValueError("test")
-
-        with self.assertRaisesRegex(ValueError, expected_regex="test"):
-            raise ValueError("test")
-
-        with self.assertRaisesRegex(
-            expected_exception=ValueError, expected_regex="test"
-        ):
-            raise ValueError("test")
-
-        with self.assertRaisesRegex(
-            expected_regex="test", expected_exception=ValueError
-        ):
-            raise ValueError("test")
-
-        with self.assertRaisesRegexp(ValueError, "test"):
-            raise ValueError("test")
-
-    def test_unfixable_errors(self):
-        with self.assertRaises(ValueError, msg="msg"):
-            raise ValueError
-
-        with self.assertRaises(
-            # comment
-            ValueError
-        ):
-            raise ValueError
-
-        with (
-            self
-            # comment
-            .assertRaises(ValueError)
-        ):
-            raise ValueError

crates/ruff/resources/test/fixtures/flake8_pytest_style/PT027_1.py

@@ -1,12 +0,0 @@
-import unittest
-import pytest
-
-
-class Test(unittest.TestCase):
-    def test_pytest_raises(self):
-        with pytest.raises(ValueError):
-            raise ValueError
-
-    def test_errors(self):
-        with self.assertRaises(ValueError):
-            raise ValueError

crates/ruff/resources/test/fixtures/flake8_raise/RSE102.py

@@ -19,20 +19,11 @@ raise TypeError ()
 raise TypeError \
     ()
 
-# RSE102
-raise TypeError \
-    ();
-
 # RSE102
 raise TypeError(
 
 )
 
-# RSE102
-raise (TypeError) (
-
-)
-
 # RSE102
 raise TypeError(
     # Hello, world!
@@ -61,21 +52,3 @@ class Class:
 
 # OK
 raise Class.error()
-
-
-import ctypes
-
-
-# OK
-raise ctypes.WinError(1)
-
-
-# RSE102
-raise IndexError()from ZeroDivisionError
-
-raise IndexError()\
-from ZeroDivisionError
-
-raise IndexError() from ZeroDivisionError
-
-raise IndexError();

crates/ruff/resources/test/fixtures/flake8_return/RET503.py

@@ -320,9 +320,3 @@ def end_of_statement():
         if True:
             return "" \
                 ;  # type: ignore
-
-
-def end_of_file():
-    if False:
-        return 1
-    x = 2 \

crates/ruff/resources/test/fixtures/flake8_return/RET504.py

@@ -357,9 +357,3 @@ def foo():
 def foo():
     a = 1  # Comment
     return a
-
-
-# Regression test for: https://github.com/astral-sh/ruff/issues/7098
-def mavko_debari(P_kbar):
-    D=0.4853881 + 3.6006116*P - 0.0117368*(P-1.3822)**2
-    return D

crates/ruff/resources/test/fixtures/flake8_self/SLF001.py

@@ -73,7 +73,3 @@ print(foo.__dict__)
 print(foo.__str__())
 print(foo().__class__)
 print(foo._asdict())
-
-import os
-
-os._exit()

crates/ruff/resources/test/fixtures/flake8_self/SLF001_extended.py

@@ -1,10 +0,0 @@
-def foo(obj):
-    obj._meta  # OK
-
-
-def foo(obj):
-    obj._asdict  # SLF001
-
-
-def foo(obj):
-    obj._bar  # SLF001

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

@@ -8,7 +8,6 @@ try:
 except ValueError:
     pass
 
-
 # SIM105
 try:
     foo()
@@ -111,20 +110,3 @@ try:
     print()
 except "not an exception":
     pass
-
-# Regression test for: https://github.com/astral-sh/ruff/issues/7123
-def write_models(directory, Models):
-    try:
-        os.makedirs(model_dir);
-    except OSError:
-        pass;
-
-    try: os.makedirs(model_dir);
-    except OSError:
-        pass;
-
-    try: os.makedirs(model_dir);
-    except OSError:
-        pass; \
-            \
-            #

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

@@ -31,8 +31,6 @@ for key in list(obj.keys()):
 
 key in (obj or {}).keys()  # SIM118
 
-(key) in (obj or {}).keys()  # SIM118
-
 from typing import KeysView
 
 
@@ -42,17 +40,3 @@ class Foo:
 
     def __contains__(self, key: object) -> bool:
         return key in self.keys()  # OK
-
-
-# Regression test for: https://github.com/astral-sh/ruff/issues/7124
-key in obj.keys()and foo
-(key in obj.keys())and foo
-key in (obj.keys())and foo
-
-# Regression test for: https://github.com/astral-sh/ruff/issues/7200
-for key in (
-    self.experiment.surveys[0]
-        .stations[0]
-        .keys()
-):
-    continue

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

@@ -13,8 +13,3 @@ def f():
         return False
 
     a = True if b else False
-
-
-# Regression test for: https://github.com/astral-sh/ruff/issues/7076
-samesld = True if (psl.privatesuffix(urlparse(response.url).netloc) ==
-                                   psl.privatesuffix(src.netloc)) else False

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

@@ -152,11 +152,3 @@ if (a or [1] or True or [2]) == (a or [1]):  # SIM222
 
 if f(a or [1] or True or [2]):  # SIM222
     pass
-
-# Regression test for: https://github.com/astral-sh/ruff/issues/7099
-def secondToTime(s0: int) -> (int, int, int) or str:
-    m, s = divmod(s0, 60)
-
-
-def secondToTime(s0: int) -> ((int, int, int) or str):
-    m, s = divmod(s0, 60)

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

@@ -14,8 +14,6 @@ YODA >= age  # SIM300
 JediOrder.YODA == age  # SIM300
 0 < (number - 100)  # SIM300
 SomeClass().settings.SOME_CONSTANT_VALUE > (60 * 60)  # SIM300
-B<A[0][0]or B
-B or(B)<A[0][0]
 
 # OK
 compare == "yoda"

crates/ruff/resources/test/fixtures/flake8_tidy_imports/TID253.py

@@ -1,31 +0,0 @@
-## Banned modules ##
-import torch
-
-from torch import *
-
-from tensorflow import a, b, c
-
-import torch as torch_wearing_a_trenchcoat
-
-# this should count as module level
-x = 1; import tensorflow
-
-# banning a module also bans any submodules
-import torch.foo.bar
-
-from tensorflow.foo import bar
-
-from torch.foo.bar import *
-
-# unlike TID251, inline imports are *not* banned
-def my_cool_function():
-    import tensorflow.foo.bar
-
-def another_cool_function():
-    from torch.foo import bar
-
-def import_alias():
-    from torch.foo import bar
-
-if TYPE_CHECKING:
-    import torch

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

@@ -1,12 +0,0 @@
-from __future__ import annotations
-
-from datetime import date
-
-from sqlalchemy.orm import DeclarativeBase, Mapped, mapped_column
-
-
-class Birthday(DeclarativeBase):
-
-    __tablename__ = "birthday"
-    id: Mapped[int] = mapped_column(primary_key=True)
-    day: Mapped[date]

crates/ruff/resources/test/fixtures/flake8_unused_arguments/ARG.py

@@ -27,8 +27,6 @@ def f(cls, x):
 ###
 lambda x: print("Hello, world!")
 
-lambda: print("Hello, world!")
-
 
 class C:
     ###
@@ -204,14 +202,3 @@ class C:
 ###
 def f(x: None) -> None:
     _ = cast(Any, _identity)(x=x)
-
-###
-# Unused arguments with `locals`.
-###
-def f(bar: str):
-    print(locals())
-
-
-class C:
-    def __init__(self, x) -> None:
-        print(locals())

crates/ruff/resources/test/fixtures/flynt/FLY002.py

@@ -16,8 +16,3 @@ nok4 = "a".join([a, a, *a])  # Not OK (not a static length)
 nok5 = "a".join([choice("flarp")])  # Not OK (not a simple call)
 nok6 = "a".join(x for x in "feefoofum")  # Not OK (generator)
 nok7 = "a".join([f"foo{8}", "bar"])  # Not OK (contains an f-string)
-
-
-# Regression test for: https://github.com/astral-sh/ruff/issues/7197
-def create_file_public_url(url, filename):
-    return''.join([url, filename])

crates/ruff/resources/test/fixtures/isort/detect_same_package/foo/bar.py

@@ -1,3 +0,0 @@
-import os
-import pandas
-import foo.baz

crates/ruff/resources/test/fixtures/isort/detect_same_package/pyproject.toml

@@ -1,2 +0,0 @@
-[tool.ruff]
-line-length = 88

crates/ruff/resources/test/fixtures/isort/required_imports/comments_and_newlines.py

@@ -1,6 +0,0 @@
-#!/usr/bin/env python3
-# A copyright notice could go here
-
-# A linter directive could go here
-
-x = 1

crates/ruff/resources/test/fixtures/jupyter/isort.ipynb

@@ -25,23 +25,6 @@
     "def foo():\n",
     "    pass"
    ]
-  },
-  {
-   "cell_type": "code",
-   "execution_count": null,
-   "id": "16214f6f-bb32-4594-81be-79fb27c6ec92",
-   "metadata": {},
-   "outputs": [],
-   "source": [
-    "from pathlib import Path\n",
-    "import sys\n",
-    "\n",
-    "%matplotlib \\\n",
-    "    --inline\n",
-    "\n",
-    "import math\n",
-    "import abc"
-   ]
   }
  ],
  "metadata": {

crates/ruff/resources/test/fixtures/jupyter/isort_expected.ipynb

@@ -27,23 +27,6 @@
     "def foo():\n",
     "    pass"
    ]
-  },
-  {
-   "cell_type": "code",
-   "execution_count": null,
-   "id": "6d6c55c6-4a34-4662-914b-4ee11c9c24a5",
-   "metadata": {},
-   "outputs": [],
-   "source": [
-    "import sys\n",
-    "from pathlib import Path\n",
-    "\n",
-    "%matplotlib \\\n",
-    "    --inline\n",
-    "\n",
-    "import abc\n",
-    "import math"
-   ]
   }
  ],
  "metadata": {

crates/ruff/resources/test/fixtures/numpy/NPY001.py

@@ -18,8 +18,3 @@ pdf = pd.DataFrame(
 )
 
 _ = arr.astype(np.int)
-
-# Regression test for: https://github.com/astral-sh/ruff/issues/6952
-from numpy import float
-
-float(1)

crates/ruff/resources/test/fixtures/numpy/NPY003.py

@@ -1,18 +1,15 @@
-def func():
-    import numpy as np
+import numpy as np
 
-    np.round_(np.random.rand(5, 5), 2)
-    np.product(np.random.rand(5, 5))
-    np.cumproduct(np.random.rand(5, 5))
-    np.sometrue(np.random.rand(5, 5))
-    np.alltrue(np.random.rand(5, 5))
+np.round_(np.random.rand(5, 5), 2)
+np.product(np.random.rand(5, 5))
+np.cumproduct(np.random.rand(5, 5))
+np.sometrue(np.random.rand(5, 5))
+np.alltrue(np.random.rand(5, 5))
 
+from numpy import round_, product, cumproduct, sometrue, alltrue
 
-def func():
-    from numpy import round_, product, cumproduct, sometrue, alltrue
-
-    round_(np.random.rand(5, 5), 2)
-    product(np.random.rand(5, 5))
-    cumproduct(np.random.rand(5, 5))
-    sometrue(np.random.rand(5, 5))
-    alltrue(np.random.rand(5, 5))
+round_(np.random.rand(5, 5), 2)
+product(np.random.rand(5, 5))
+cumproduct(np.random.rand(5, 5))
+sometrue(np.random.rand(5, 5))
+alltrue(np.random.rand(5, 5))

crates/ruff/resources/test/fixtures/pandas_vet/PD002.py

@@ -29,5 +29,3 @@ x.apply(lambda x: x.sort_values("a", inplace=True))
 import torch
 
 torch.m.ReLU(inplace=True)  # safe because this isn't a pandas call
-
-(x.drop(["a"], axis=1, inplace=True))

crates/ruff/resources/test/fixtures/pep8_naming/N806.py

@@ -1,6 +1,8 @@
 import collections
 from collections import namedtuple
-from typing import TypeAlias, TypeVar, NewType, NamedTuple, TypedDict
+from typing import TypeVar
+from typing import NewType
+from typing import NamedTuple, TypedDict
 
 GLOBAL: str = "foo"
 
@@ -19,11 +21,9 @@ def assign():
     T = TypeVar("T")
     UserId = NewType("UserId", int)
 
-    Employee = NamedTuple("Employee", [("name", str), ("id", int)])
+    Employee = NamedTuple('Employee', [('name', str), ('id', int)])
 
-    Point2D = TypedDict("Point2D", {"in": int, "x-y": int})
-
-    IntOrStr: TypeAlias = int | str
+    Point2D = TypedDict('Point2D', {'in': int, 'x-y': int})
 
 
 def aug_assign(rank, world_size):

crates/ruff/resources/test/fixtures/perflint/PERF203.py

@@ -21,29 +21,3 @@ while i < 10:
         print("error")
 
     i += 1
-
-# OK - no other way to write this
-for i in range(10):
-    try:
-        print(f"{i}")
-        break
-    except:
-        print("error")
-
-# OK - no other way to write this
-for i in range(10):
-    try:
-        print(f"{i}")
-        continue
-    except:
-        print("error")
-
-
-# OK - no other way to write this
-for i in range(10):
-    try:
-        print(f"{i}")
-        if i > 0:
-            break
-    except:
-        print("error")