Add stubs for type params and type aliases

126652b684

.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

@@ -4,7 +4,6 @@ changelog:
     labels:
       - internal
       - documentation
-      - formatter
   categories:
     - title: Breaking Changes
       labels:
@@ -20,9 +19,6 @@ changelog:
     - title: Bug Fixes
       labels:
         - bug
-    - title: Preview
-      labels:
-        - preview
     - title: Other Changes
       labels:
         - "*"

.github/workflows/benchmark.yaml

@@ -0,0 +1,128 @@
+name: Benchmark
+
+on:
+  pull_request:
+  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

@@ -2,7 +2,7 @@ name: CI
 
 on:
   push:
-    branches: [main]
+    branches: [ main ]
   pull_request:
   workflow_dispatch:
 
@@ -16,53 +16,14 @@ env:
   CARGO_TERM_COLOR: always
   RUSTUP_MAX_RETRIES: 10
   PACKAGE_NAME: ruff
-  PYTHON_VERSION: "3.11"
+  PYTHON_VERSION: "3.11" # to build abi3 wheels
 
 jobs:
-  determine_changes:
-    name: "Determine changes"
-    runs-on: ubuntu-latest
-    outputs:
-      linter: ${{ steps.changed.outputs.linter_any_changed }}
-      formatter: ${{ steps.changed.outputs.formatter_any_changed }}
-    steps:
-      - uses: actions/checkout@v4
-        with:
-          fetch-depth: 0
-
-      - uses: tj-actions/changed-files@v39
-        id: changed
-        with:
-          files_yaml: |
-            linter:
-              - Cargo.toml
-              - Cargo.lock
-              - crates/**
-              - "!crates/ruff_python_formatter/**"
-              - "!crates/ruff_formatter/**"
-              - "!crates/ruff_dev/**"
-              - "!crates/ruff_shrinking/**"
-              - scripts/*
-
-            formatter:
-              - Cargo.toml
-              - Cargo.lock
-              - crates/ruff_python_formatter/**
-              - 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/**
-              - 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 +32,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
@@ -85,19 +46,17 @@ jobs:
   cargo-test:
     strategy:
       matrix:
-        os: [ubuntu-latest, windows-latest]
+        os: [ ubuntu-latest, windows-latest ]
     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"
-        uses: taiki-e/install-action@v2
-        with:
-          tool: cargo-insta
-      - run: pip install black[d]==23.1.0
       - uses: Swatinem/rust-cache@v2
+      # cargo insta 1.30.0 fails for some reason (https://github.com/mitsuhiko/insta/issues/392)
+      - run: cargo install cargo-insta@=1.29.0
+      - run: pip install black[d]==23.1.0
       - name: "Run tests (Ubuntu)"
         if: ${{ matrix.os == 'ubuntu-latest' }}
         run: cargo insta test --all --all-features --unreferenced reject
@@ -125,7 +84,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 +100,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 +119,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
@@ -176,13 +135,11 @@ jobs:
   ecosystem:
     name: "ecosystem"
     runs-on: ubuntu-latest
-    needs:
-      - cargo-test
-      - determine_changes
+    needs: cargo-test
     # 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'
+    if: github.event_name == 'pull_request'
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v3
       - uses: actions/setup-python@v4
         with:
           python-version: ${{ env.PYTHON_VERSION }}
@@ -227,7 +184,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
@@ -237,11 +194,12 @@ jobs:
       - name: "Run cargo-udeps"
         run: cargo +nightly-2023-06-08 udeps
 
+
   python-package:
     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 +223,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 +253,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' }}
@@ -324,45 +282,16 @@ jobs:
         if: ${{ env.MKDOCS_INSIDERS_SSH_KEY_EXISTS != 'true' }}
         run: mkdocs build --strict -f mkdocs.generated.yml
 
-  check-formatter-ecosystem:
-    name: "Formatter ecosystem and progress checks"
+  check-formatter-stability:
+    name: "Check formatter stability"
     runs-on: ubuntu-latest
-    needs: determine_changes
-    if: needs.determine_changes.outputs.formatter == 'true' || github.ref == 'refs/heads/main'
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v3
       - name: "Install Rust toolchain"
         run: rustup show
       - name: "Cache rust"
         uses: Swatinem/rust-cache@v2
-      - 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 }}
+      - 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 stability"
+        run: cargo run --bin ruff_dev -- format-dev --stability-check crates/ruff/resources/test/cpython

.github/workflows/docs.yaml

@@ -2,13 +2,8 @@ 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]
+    types: [ published ]
 
 jobs:
   mkdocs:
@@ -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=astral-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 }}
@@ -66,9 +66,9 @@ jobs:
     runs-on: windows-latest
     strategy:
       matrix:
-        target: [x64, x86]
+        target: [ x64, x86 ]
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v3
       - uses: actions/setup-python@v4
         with:
           python-version: ${{ env.PYTHON_VERSION }}
@@ -94,9 +94,9 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        target: [x86_64, i686]
+        target: [ x86_64, i686 ]
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v3
       - uses: actions/setup-python@v4
         with:
           python-version: ${{ env.PYTHON_VERSION }}
@@ -121,9 +121,9 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        target: [aarch64, armv7, s390x, ppc64le, ppc64]
+        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

@@ -3,7 +3,7 @@ name: "[Playground] Release"
 on:
   workflow_dispatch:
   release:
-    types: [published]
+    types: [ published ]
 
 env:
   CARGO_INCREMENTAL: 0
@@ -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,8 +40,8 @@ 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 }}
-          command: pages deploy playground/dist --project-name=ruff-playground --branch ${GITHUB_HEAD_REF} --commit-hash ${GITHUB_SHA}
+          command: pages publish playground/dist --project-name=ruff --branch ${GITHUB_HEAD_REF} --commit-hash ${GITHUB_SHA}

.github/workflows/pr-comment.yaml

@@ -2,8 +2,8 @@ name: PR Check Comment
 
 on:
   workflow_run:
-    workflows: [CI]
-    types: [completed]
+    workflows: [ CI, Benchmark ]
+    types: [ completed ]
   workflow_dispatch:
     inputs:
       workflow_run_id:
@@ -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,22 +398,9 @@ 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: main # We checkout the main branch to check for the commit
-      - 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
+      - uses: actions/checkout@v3
       - name: Check tag consistency
         run: |
-          # Switch to the commit we want to release
-          git checkout ${{ inputs.sha }}
           version=$(grep "version = " pyproject.toml | sed -e 's/version = "\(.*\)"/\1/g')
           if [ "${{ inputs.tag }}" != "${version}" ]; then
             echo "The input tag does not match the version from pyproject.toml:" >&2
@@ -442,6 +410,18 @@ jobs:
           else
             echo "Releasing ${version}"
           fi
+      - name: Check SHA consistency
+        if: ${{ inputs.sha }}
+        run: |
+          git_sha=$(git rev-parse HEAD)
+          if [ "${{ inputs.sha }}" != "${git_sha}" ]; then
+            echo "The specified sha does not match the git checkout" >&2
+            echo "${{ inputs.sha }}" >&2
+            echo "${git_sha}" >&2
+            exit 1
+          else
+            echo "Releasing ${git_sha}"
+          fi
 
   upload-release:
     name: Upload to PyPI
@@ -484,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
@@ -40,13 +42,13 @@ repos:
         name: cargo fmt
         entry: cargo fmt --
         language: system
-        types: [rust]
+        types: [ rust ]
         pass_filenames: false # This makes it a lot faster
       - id: ruff
         name: ruff
         entry: cargo run --bin ruff -- check --no-cache --force-exclude --fix --exit-non-zero-on-fix
         language: system
-        types_or: [python, pyi]
+        types_or: [ python, pyi ]
         require_serial: true
         exclude: |
           (?x)^(
@@ -60,12 +62,5 @@ repos:
     hooks:
       - id: black
 
-  # Prettier
-  - repo: https://github.com/pre-commit/mirrors-prettier
-    rev: v3.0.0
-    hooks:
-      - id: prettier
-        types: [yaml]
-
 ci:
-  skip: [cargo-fmt, dev-generate-all]
+  skip: [ cargo-fmt, dev-generate-all ]

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))
@@ -299,4 +274,4 @@ default.
 `pyproject.toml` files are now resolved hierarchically, such that for each Python file, we find
 the first `pyproject.toml` file in its path, and use that to determine its lint settings.
 
-See the [documentation](https://docs.astral.sh/ruff/configuration/#python-file-discovery) for more.
+See the [documentation](https://beta.ruff.rs/docs/configuration/#python-file-discovery) for more.

CONTRIBUTING.md

@@ -69,16 +69,9 @@ and pre-commit to run some validation checks:
 pipx install pre-commit  # or `pip install pre-commit` if you have a virtualenv
 ```
 
-You can optionally install pre-commit hooks to automatically run the validation checks
-when making a commit:
-
-```shell
-pre-commit install
-```
-
 ### Development
 
-After cloning the repository, run Ruff locally from the repository root with:
+After cloning the repository, run Ruff locally with:
 
 ```shell
 cargo run -p ruff_cli -- check /path/to/file.py --no-cache
@@ -129,9 +122,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_ast`: library crate containing Python-specific AST types and utilities. Note
+    that the AST schema itself is defined in the
+    [rustpython-ast](https://github.com/astral-sh/RustPython-Parser) crate.
 - `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.
@@ -140,9 +133,10 @@ At time of writing, the repository includes the following crates:
     refer to?"
 - `crates/ruff_python_stdlib`: library crate containing Python-specific standard library data, e.g.
     the names of all built-in exceptions and which standard library types are immutable.
-- `crates/ruff_python_trivia`: library crate containing Python-specific trivia utilities (e.g.,
-    for analyzing indentation, newlines, etc.).
-- `crates/ruff_python_parser`: library crate containing the Python parser.
+- `crates/ruff_python_whitespace`: library crate containing Python-specific whitespace analysis
+    logic (indentation and newlines).
+- `crates/ruff_rustpython`: library crate containing `RustPython`-specific utilities.
+- `crates/ruff_textwrap`: library crate to indent and dedent Python source code.
 - `crates/ruff_wasm`: library crate for exposing Ruff as a WebAssembly module. Powers the
     [Ruff Playground](https://play.ruff.rs/).
 
@@ -162,13 +156,10 @@ At a high level, the steps involved in adding a new lint rule are as follows:
     (e.g., `pub(crate) fn assert_false`) based on whatever inputs are required for the rule (e.g.,
     an `ast::StmtAssert` node).
 
-1. Define the logic for invoking the diagnostic in `crates/ruff/src/checkers/ast/analyze` (for
-    AST-based rules), `crates/ruff/src/checkers/tokens.rs` (for token-based rules),
-    `crates/ruff/src/checkers/physical_lines.rs` (for text-based rules),
-    `crates/ruff/src/checkers/filesystem.rs` (for filesystem-based rules), etc. For AST-based rules,
-    you'll likely want to modify `analyze/statement.rs` (if your rule is based on analyzing
-    statements, like imports) or `analyze/expression.rs` (if your rule is based on analyzing
-    expressions, like function calls).
+1. Define the logic for triggering the violation in `crates/ruff/src/checkers/ast/mod.rs` (for
+    AST-based checks), `crates/ruff/src/checkers/tokens.rs` (for token-based checks),
+    `crates/ruff/src/checkers/lines.rs` (for text-based checks), or
+    `crates/ruff/src/checkers/filesystem.rs` (for filesystem-based checks).
 
 1. Map the violation struct to a rule code in `crates/ruff/src/codes.rs` (e.g., `B011`).
 
@@ -230,12 +221,9 @@ Once you've completed the code for the rule itself, you can define tests with th
     For example, if you're adding a new rule named `E402`, you would run:
 
     ```shell
-    cargo run -p ruff_cli -- check crates/ruff/resources/test/fixtures/pycodestyle/E402.py --no-cache --select E402
+    cargo run -p ruff_cli -- check crates/ruff/resources/test/fixtures/pycodestyle/E402.py --no-cache
     ```
 
-    **Note:** Only a subset of rules are enabled by default. When testing a new rule, ensure that
-    you activate it by adding `--select ${rule_code}` to the command.
-
 1. Add the test to the relevant `crates/ruff/src/rules/[linter]/mod.rs` file. If you're contributing
     a rule to a pre-existing set, you should be able to find a similar example to pattern-match
     against. If you're adding a new linter, you'll need to create a new `mod.rs` file (see,
@@ -322,7 +310,7 @@ even patch releases may contain [non-backwards-compatible changes](https://semve
 1. Run the release workflow with the version number (without starting `v`) as input. Make sure
     main has your merged PR as last commit
 1. The release workflow will do the following:
-    1. Build all the assets. If this fails (even though we tested in step 4), we haven't tagged or
+    1. Build all the assets. If this fails (even though we tested in step 4), we haven’t tagged or
         uploaded anything, you can restart after pushing a fix.
     1. Upload to PyPI.
     1. Create and push the Git tag (as extracted from `pyproject.toml`). We create the Git tag only
@@ -572,7 +560,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
@@ -719,8 +707,8 @@ Module {
 - `cargo dev generate-cli-help`, `cargo dev generate-docs` and `cargo dev generate-json-schema`:
     Update just `docs/configuration.md`, `docs/rules` and `ruff.schema.json` respectively.
 - `cargo dev generate-options`: Generate a markdown-compatible table of all `pyproject.toml`
-    options. Used for <https://docs.astral.sh/ruff/settings/>.
-- `cargo dev generate-rules-table`: Generate a markdown-compatible table of all rules. Used for <https://docs.astral.sh/ruff/rules/>.
+    options. Used for <https://beta.ruff.rs/docs/settings/>
+- `cargo dev generate-rules-table`: Generate a markdown-compatible table of all rules. Used for <https://beta.ruff.rs/docs/rules/>
 - `cargo dev round-trip <python file or jupyter notebook>`: Read a Python file or Jupyter Notebook,
     parse it, serialize the parsed representation and write it back. Used to check how good our
     representation is so that fixes don't rewrite irrelevant parts of a file.
@@ -735,9 +723,9 @@ diagnostics, then our current compilation pipeline proceeds as follows:
 
 1. **File discovery**: Given paths like `foo/`, locate all Python files in any specified subdirectories, taking into account our hierarchical settings system and any `exclude` options.
 
-1. **Package resolution**: Determine the "package root" for every file by traversing over its parent directories and looking for `__init__.py` files.
+1. **Package resolution**: Determine the “package root” for every file by traversing over its parent directories and looking for `__init__.py` files.
 
-1. **Cache initialization**: For every "package root", initialize an empty cache.
+1. **Cache initialization**: For every “package root”, initialize an empty cache.
 
 1. **Analysis**: For every file, in parallel:
 
@@ -745,7 +733,7 @@ diagnostics, then our current compilation pipeline proceeds as follows:
 
     1. **Tokenization**: Run the lexer over the file to generate a token stream.
 
-    1. **Indexing**: Extract metadata from the token stream, such as: comment ranges, `# noqa` locations, `# isort: off` locations, "doc lines", etc.
+    1. **Indexing**: Extract metadata from the token stream, such as: comment ranges, `# noqa` locations, `# isort: off` locations, “doc lines”, etc.
 
     1. **Token-based rule evaluation**: Run any lint rules that are based on the contents of the token stream (e.g., commented-out code).
 
@@ -755,9 +743,9 @@ diagnostics, then our current compilation pipeline proceeds as follows:
 
     1. **Parsing**: Run the parser over the token stream to produce an AST. (This consumes the token stream, so anything that relies on the token stream needs to happen before parsing.)
 
-    1. **AST-based rule evaluation**: Run any lint rules that are based on the AST. This includes the vast majority of lint rules. As part of this step, we also build the semantic model for the current file as we traverse over the AST. Some lint rules are evaluated eagerly, as we iterate over the AST, while others are evaluated in a deferred manner (e.g., unused imports, since we can't determine whether an import is unused until we've finished analyzing the entire file), after we've finished the initial traversal.
+    1. **AST-based rule evaluation**: Run any lint rules that are based on the AST. This includes the vast majority of lint rules. As part of this step, we also build the semantic model for the current file as we traverse over the AST. Some lint rules are evaluated eagerly, as we iterate over the AST, while others are evaluated in a deferred manner (e.g., unused imports, since we can’t determine whether an import is unused until we’ve finished analyzing the entire file), after we’ve finished the initial traversal.
 
-    1. **Import-based rule evaluation**: Run any lint rules that are based on the module's imports (e.g., import sorting). These could, in theory, be included in the AST-based rule evaluation phase — they're just separated for simplicity.
+    1. **Import-based rule evaluation**: Run any lint rules that are based on the module’s imports (e.g., import sorting). These could, in theory, be included in the AST-based rule evaluation phase — they’re just separated for simplicity.
 
     1. **Physical line-based rule evaluation**: Run any lint rules that are based on physical lines (e.g., line-length).
 
@@ -766,116 +754,3 @@ diagnostics, then our current compilation pipeline proceeds as follows:
     1. **Cache write**: Write the generated diagnostics to the package cache using the file as a key.
 
 1. **Reporting**: Print diagnostics in the specified format (text, JSON, etc.), to the specified output channel (stdout, a file, etc.).
-
-### Import Categorization
-
-To understand Ruff's import categorization system, we first need to define two concepts:
-
-- "Project root": The directory containing the `pyproject.toml`, `ruff.toml`, or `.ruff.toml` file,
-    discovered by identifying the "closest" such directory for each Python file. (If you're running
-    via `ruff --config /path/to/pyproject.toml`, then the current working directory is used as the
-    "project root".)
-- "Package root": The top-most directory defining the Python package that includes a given Python
-    file. To find the package root for a given Python file, traverse up its parent directories until
-    you reach a parent directory that doesn't contain an `__init__.py` file (and isn't marked as
-    a [namespace package](https://docs.astral.sh/ruff/settings/#namespace-packages)); take the directory
-    just before that, i.e., the first directory in the package.
-
-For example, given:
-
-```text
-my_project
-├── pyproject.toml
-└── src
-    └── foo
-        ├── __init__.py
-        └── bar
-            ├── __init__.py
-            └── baz.py
-```
-
-Then when analyzing `baz.py`, the project root would be the top-level directory (`./my_project`),
-and the package root would be `./my_project/src/foo`.
-
-#### Project root
-
-The project root does not have a significant impact beyond that all relative paths within the loaded
-configuration file are resolved relative to the project root.
-
-For example, to indicate that `bar` above is a namespace package (it isn't, but let's run with it),
-the `pyproject.toml` would list `namespace-packages = ["./src/bar"]`, which would resolve
-to `my_project/src/bar`.
-
-The same logic applies when providing a configuration file via `--config`. In that case, the
-_current working directory_ is used as the project root, and so all paths in that configuration file
-are resolved relative to the current working directory. (As a general rule, we want to avoid relying
-on the current working directory as much as possible, to ensure that Ruff exhibits the same behavior
-regardless of where and how you invoke it — but that's hard to avoid in this case.)
-
-Additionally, if a `pyproject.toml` file _extends_ another configuration file, Ruff will still use
-the directory containing that `pyproject.toml` file as the project root. For example, if
-`./my_project/pyproject.toml` contains:
-
-```toml
-[tool.ruff]
-extend = "/path/to/pyproject.toml"
-```
-
-Then Ruff will use `./my_project` as the project root, even though the configuration file extends
-`/path/to/pyproject.toml`. As such, if the configuration file at `/path/to/pyproject.toml` contains
-any relative paths, they will be resolved relative to `./my_project`.
-
-If a project uses nested configuration files, then Ruff would detect multiple project roots, one for
-each configuration file.
-
-#### Package root
-
-The package root is used to determine a file's "module path". Consider, again, `baz.py`. In that
-case, `./my_project/src/foo` was identified as the package root, so the module path for `baz.py`
-would resolve to  `foo.bar.baz` — as computed by taking the relative path from the package root
-(inclusive of the root itself). The module path can be thought of as "the path you would use to
-import the module" (e.g., `import foo.bar.baz`).
-
-The package root and module path are used to, e.g., convert relative to absolute imports, and for
-import categorization, as described below.
-
-#### Import categorization
-
-When sorting and formatting import blocks, Ruff categorizes every import into one of five
-categories:
-
-1. **"Future"**: the import is a `__future__` import. That's easy: just look at the name of the
-    imported module!
-1. **"Standard library"**: the import comes from the Python standard library (e.g., `import os`).
-    This is easy too: we include a list of all known standard library modules in Ruff itself, so it's
-    a simple lookup.
-1. **"Local folder"**: the import is a relative import (e.g., `from .foo import bar`). This is easy
-    too: just check if the import includes a `level` (i.e., a dot-prefix).
-1. **"First party"**: the import is part of the current project. (More on this below.)
-1. **"Third party"**: everything else.
-
-The real challenge lies in determining whether an import is first-party — everything else is either
-trivial, or (as in the case of third-party) merely defined as "not first-party".
-
-There are three ways in which an import can be categorized as "first-party":
-
-1. **Explicit settings**: the import is marked as such via the `known-first-party` setting. (This
-    should generally be seen as an escape hatch.)
-1. **Same-package**: the imported module is in the same package as the current file. This gets back
-    to the importance of the "package root" and the file's "module path". Imagine that we're
-    analyzing `baz.py` above. If `baz.py` contains any imports that appear to come from the `foo`
-    package (e.g., `from foo import bar` or `import foo.bar`), they'll be classified as first-party
-    automatically. This check is as simple as comparing the first segment of the current file's
-    module path to the first segment of the import.
-1. **Source roots**: Ruff supports a `[src](https://docs.astral.sh/ruff/settings/#src)` setting, which
-    sets the directories to scan when identifying first-party imports. The algorithm is
-    straightforward: given an import, like `import foo`, iterate over the directories enumerated in
-    the `src` setting and, for each directory, check for the existence of a subdirectory `foo` or a
-    file `foo.py`.
-
-By default, `src` is set to the project root. In the above example, we'd want to set
-`src = ["./src"]` to ensure that we locate `./my_project/src/foo` and thus categorize `import foo`
-as first-party in `baz.py`. In practice, for this limited example, setting `src = ["./src"]` is
-unnecessary, as all imports within `./my_project/src/foo` would be categorized as first-party via
-the same-package heuristic; but your project contains multiple packages, you'll want to set `src`
-explicitly.

Cargo.toml

@@ -4,9 +4,9 @@ resolver = "2"
 
 [workspace.package]
 edition = "2021"
-rust-version = "1.71"
-homepage = "https://docs.astral.sh/ruff"
-documentation = "https://docs.astral.sh/ruff"
+rust-version = "1.70"
+homepage = "https://beta.ruff.rs/docs"
+documentation = "https://beta.ruff.rs/docs"
 repository = "https://github.com/astral-sh/ruff"
 authors = ["Charlie Marsh <charlie.r.marsh@gmail.com>"]
 license = "MIT"
@@ -14,49 +14,52 @@ license = "MIT"
 [workspace.dependencies]
 anyhow = { version = "1.0.69" }
 bitflags = { version = "2.3.1" }
-chrono = { version = "0.4.31", default-features = false, features = ["clock"] }
-clap = { version = "4.4.4", 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" }
-itertools = { version = "0.11.0" }
+insta = { version = "1.30.0" }
+is-macro = { version = "0.2.2" }
+itertools = { version = "0.10.5" }
 log = { version = "0.4.17" }
-malachite = { version = "0.4.0", default-features = false, features = ["naturals_and_integers"] }
-memchr = "2.6.3"
+memchr = "2.5.0"
+nohash-hasher = { version = "0.2.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.15" }
+schemars = { version = "0.8.12" }
 serde = { version = "1.0.152", features = ["derive"] }
-serde_json = { version = "1.0.107" }
+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.37" }
-test-case = { version = "3.2.1" }
-thiserror = { version = "1.0.48" }
-toml = { version = "0.7.8" }
-tracing = "0.1.37"
-tracing-indicatif = "0.3.4"
-tracing-subscriber = { version = "0.3.17", features = ["env-filter"] }
-unicode-ident = "1.0.12"
-unicode-width = "0.1.10"
-uuid = { version = "1.4.1", features = ["v4", "fast-rng", "macro-diagnostics", "js"] }
+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.43" }
+toml = { version = "0.7.2" }
 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 }
+
+# Please tag the RustPython version every time you update its revision here and in fuzz/Cargo.toml
+# Tagging the version ensures that older ruff versions continue to build from source even when we rebase our RustPython fork.
+# Note: As of tag v0.0.8 we are cherry-picking commits instead of rebasing so the tag is not necessary
+ruff_text_size = { git = "https://github.com/astral-sh/RustPython-Parser.git", rev = "126652b684910c29a7bcc32293d4ca0f81454e34" }
+rustpython-ast = { git = "https://github.com/astral-sh/RustPython-Parser.git", rev = "126652b684910c29a7bcc32293d4ca0f81454e34" , default-features = false, features = ["num-bigint"]}
+rustpython-format = { git = "https://github.com/astral-sh/RustPython-Parser.git", rev = "126652b684910c29a7bcc32293d4ca0f81454e34", default-features = false, features = ["num-bigint"] }
+rustpython-literal = { git = "https://github.com/astral-sh/RustPython-Parser.git", rev = "126652b684910c29a7bcc32293d4ca0f81454e34", default-features = false }
+rustpython-parser = { git = "https://github.com/astral-sh/RustPython-Parser.git", rev = "126652b684910c29a7bcc32293d4ca0f81454e34" , default-features = false, features = ["full-lexer", "num-bigint"] }
 
 [profile.release]
 lto = "fat"
@@ -70,7 +73,7 @@ opt-level = 3
 
 # Reduce complexity of a parser function that would trigger a locals limit in a wasm tool.
 # https://github.com/bytecodealliance/wasm-tools/blob/b5c3d98e40590512a3b12470ef358d5c7b983b15/crates/wasmparser/src/limits.rs#L29
-[profile.dev.package.ruff_python_parser]
+[profile.dev.package.rustpython-parser]
 opt-level = 1
 
 # Use the `--profile release-debug` flag to show symbols in release mode.

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

@@ -2,13 +2,13 @@
 
 # Ruff
 
-[![Ruff](https://img.shields.io/endpoint?url=https://raw.githubusercontent.com/astral-sh/ruff/main/assets/badge/v2.json)](https://github.com/astral-sh/ruff)
+[![Ruff](https://img.shields.io/endpoint?url=https://raw.githubusercontent.com/charliermarsh/ruff/main/assets/badge/v2.json)](https://github.com/astral-sh/ruff)
 [![image](https://img.shields.io/pypi/v/ruff.svg)](https://pypi.python.org/pypi/ruff)
 [![image](https://img.shields.io/pypi/l/ruff.svg)](https://pypi.python.org/pypi/ruff)
 [![image](https://img.shields.io/pypi/pyversions/ruff.svg)](https://pypi.python.org/pypi/ruff)
 [![Actions status](https://github.com/astral-sh/ruff/workflows/CI/badge.svg)](https://github.com/astral-sh/ruff/actions)
 
-[**Discord**](https://discord.gg/c9MhzV8aU5) | [**Docs**](https://docs.astral.sh/ruff/) | [**Playground**](https://play.ruff.rs/)
+[**Discord**](https://discord.gg/c9MhzV8aU5) | [**Docs**](https://beta.ruff.rs/docs/) | [**Playground**](https://play.ruff.rs/)
 
 An extremely fast Python linter, written in Rust.
 
@@ -30,13 +30,13 @@ 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://docs.astral.sh/ruff/rules/)
-- ⚖️ [Near-parity](https://docs.astral.sh/ruff/faq/#how-does-ruff-compare-to-flake8) with the
+- 📏 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
-- ⌨️ First-party [editor integrations](https://docs.astral.sh/ruff/editor-integrations/) for
+- ⌨️ First-party [editor integrations](https://beta.ruff.rs/docs/editor-integrations/) for
     [VS Code](https://github.com/astral-sh/ruff-vscode) and [more](https://github.com/astral-sh/ruff-lsp)
-- 🌎 Monorepo-friendly, with [hierarchical and cascading configuration](https://docs.astral.sh/ruff/configuration/#pyprojecttoml-discovery)
+- 🌎 Monorepo-friendly, with [hierarchical and cascading configuration](https://beta.ruff.rs/docs/configuration/#pyprojecttoml-discovery)
 
 Ruff aims to be orders of magnitude faster than alternative tools while integrating more
 functionality behind a single, common interface.
@@ -98,7 +98,7 @@ developer of [Zulip](https://github.com/zulip/zulip):
 
 ## Table of Contents
 
-For more, see the [documentation](https://docs.astral.sh/ruff/).
+For more, see the [documentation](https://beta.ruff.rs/docs/).
 
 1. [Getting Started](#getting-started)
 1. [Configuration](#configuration)
@@ -111,7 +111,7 @@ For more, see the [documentation](https://docs.astral.sh/ruff/).
 
 ## Getting Started
 
-For more, see the [documentation](https://docs.astral.sh/ruff/).
+For more, see the [documentation](https://beta.ruff.rs/docs/).
 
 ### Installation
 
@@ -122,7 +122,7 @@ pip install ruff
 ```
 
 You can also install Ruff via [Homebrew](https://formulae.brew.sh/formula/ruff), [Conda](https://anaconda.org/conda-forge/ruff),
-and with [a variety of other package managers](https://docs.astral.sh/ruff/installation/).
+and with [a variety of other package managers](https://beta.ruff.rs/docs/installation/).
 
 ### Usage
 
@@ -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.278
   hooks:
     - id: ruff
 ```
@@ -165,7 +165,7 @@ jobs:
 ### Configuration
 
 Ruff can be configured through a `pyproject.toml`, `ruff.toml`, or `.ruff.toml` file (see:
-[_Configuration_](https://docs.astral.sh/ruff/configuration/), or [_Settings_](https://docs.astral.sh/ruff/settings/)
+[_Configuration_](https://beta.ruff.rs/docs/configuration/), or [_Settings_](https://beta.ruff.rs/docs/settings/)
 for a complete list of all configuration options).
 
 If left unspecified, the default configuration is equivalent to:
@@ -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,12 +233,12 @@ 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.
 
 By default, Ruff enables Flake8's `E` and `F` rules. Ruff supports all rules from the `F` category,
-and a [subset](https://docs.astral.sh/ruff/rules/#error-e) of the `E` category, omitting those
+and a [subset](https://beta.ruff.rs/docs/rules/#error-e) of the `E` category, omitting those
 stylistic rules made obsolete by the use of an autoformatter, like
 [Black](https://github.com/psf/black).
 
@@ -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/)
@@ -304,12 +303,12 @@ quality tools, including:
 - [tryceratops](https://pypi.org/project/tryceratops/)
 - [yesqa](https://pypi.org/project/yesqa/)
 
-For a complete enumeration of the supported rules, see [_Rules_](https://docs.astral.sh/ruff/rules/).
+For a complete enumeration of the supported rules, see [_Rules_](https://beta.ruff.rs/docs/rules/).
 
 ## Contributing
 
 Contributions are welcome and highly appreciated. To get started, check out the
-[**contributing guidelines**](https://docs.astral.sh/ruff/contributing/).
+[**contributing guidelines**](https://beta.ruff.rs/docs/contributing/).
 
 You can also join us on [**Discord**](https://discord.gg/c9MhzV8aU5).
 
@@ -398,8 +397,7 @@ Ruff is used by a number of major open-source projects and companies, including:
 - [PyTorch](https://github.com/pytorch/pytorch)
 - [Pydantic](https://github.com/pydantic/pydantic)
 - [Pylint](https://github.com/PyCQA/pylint)
-- [Reflex](https://github.com/reflex-dev/reflex)
-- [Rippling](https://rippling.com)
+- [Pynecone](https://github.com/pynecone-io/pynecone)
 - [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))
@@ -426,13 +424,13 @@ Ruff is used by a number of major open-source projects and companies, including:
 If you're using Ruff, consider adding the Ruff badge to project's `README.md`:
 
 ```md
-[![Ruff](https://img.shields.io/endpoint?url=https://raw.githubusercontent.com/astral-sh/ruff/main/assets/badge/v2.json)](https://github.com/astral-sh/ruff)
+[![Ruff](https://img.shields.io/endpoint?url=https://raw.githubusercontent.com/charliermarsh/ruff/main/assets/badge/v2.json)](https://github.com/astral-sh/ruff)
 ```
 
 ...or `README.rst`:
 
 ```rst
-.. image:: https://img.shields.io/endpoint?url=https://raw.githubusercontent.com/astral-sh/ruff/main/assets/badge/v2.json
+.. image:: https://img.shields.io/endpoint?url=https://raw.githubusercontent.com/charliermarsh/ruff/main/assets/badge/v2.json
     :target: https://github.com/astral-sh/ruff
     :alt: Ruff
 ```
@@ -440,7 +438,7 @@ If you're using Ruff, consider adding the Ruff badge to project's `README.md`:
 ...or, as HTML:
 
 ```html
-<a href="https://github.com/astral-sh/ruff"><img src="https://img.shields.io/endpoint?url=https://raw.githubusercontent.com/astral-sh/ruff/main/assets/badge/v2.json" alt="Ruff" style="max-width:100%;"></a>
+<a href="https://github.com/astral-sh/ruff"><img src="https://img.shields.io/endpoint?url=https://raw.githubusercontent.com/charliermarsh/ruff/main/assets/badge/v2.json" alt="Ruff" style="max-width:100%;"></a>
 ```
 
 ## License
@@ -449,6 +447,6 @@ MIT
 
 <div align="center">
   <a target="_blank" href="https://astral.sh" style="background:none">
-    <img src="https://raw.githubusercontent.com/astral-sh/ruff/main/assets/svg/Astral.svg">
+    <img src="https://raw.githubusercontent.com/charliermarsh/ruff/main/assets/svg/Astral.svg">
   </a>
 </div>

crates/flake8_to_ruff/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "flake8-to-ruff"
-version = "0.0.290"
+version = "0.0.278"
 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/README.md

@@ -86,7 +86,7 @@ flake8-to-ruff path/to/.flake8 --plugin flake8-builtins --plugin flake8-quotes
     configuration options that don't exist in Flake8.)
 1. Ruff will omit any rule codes that are unimplemented or unsupported by Ruff, including rule
     codes from unsupported plugins. (See the
-    [documentation](https://docs.astral.sh/ruff/faq/#how-does-ruff-compare-to-flake8) for the complete
+    [documentation](https://beta.ruff.rs/docs/faq/#how-does-ruff-compare-to-flake8) for the complete
     list of supported plugins.)
 
 ## License

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.278"
 publish = false
 authors = { workspace = true }
 edition = { workspace = true }
@@ -18,18 +18,14 @@ 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_whitespace = { path = "../ruff_python_whitespace" }
 ruff_python_ast = { path = "../ruff_python_ast", features = ["serde"] }
-ruff_python_codegen = { path = "../ruff_python_codegen" }
-ruff_python_index = { path = "../ruff_python_index" }
-ruff_python_literal = { path = "../ruff_python_literal" }
 ruff_python_semantic = { path = "../ruff_python_semantic" }
 ruff_python_stdlib = { path = "../ruff_python_stdlib" }
-ruff_python_trivia = { path = "../ruff_python_trivia" }
-ruff_python_parser = { path = "../ruff_python_parser" }
-ruff_source_file = { path = "../ruff_source_file", features = ["serde"] }
-ruff_text_size = { path = "../ruff_text_size" }
+ruff_rustpython = { path = "../ruff_rustpython" }
+ruff_text_size = { workspace = true }
+ruff_textwrap = { path = "../ruff_textwrap" }
 
 annotate-snippets = { version = "0.9.1", features = ["color"] }
 anyhow = { workspace = true }
@@ -37,17 +33,20 @@ 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 }
 libcst = { workspace = true }
 log = { workspace = true }
-malachite = { workspace = true }
 memchr = { workspace = true }
 natord = { version = "1.0.9" }
+nohash-hasher = { workspace = true }
+num-bigint = { workspace = true }
 num-traits = { workspace = true }
 once_cell = { workspace = true }
 path-absolutize = { workspace = true, features = [
@@ -56,23 +55,28 @@ path-absolutize = { workspace = true, features = [
 ] }
 pathdiff = { version = "0.2.1" }
 pep440_rs = { version = "0.3.1", features = ["serde"] }
-pyproject-toml = { version = "0.7.0" }
+phf = { version = "0.11", features = ["macros"] }
+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 }
+rustpython-format = { workspace = true }
+rustpython-parser = { 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" }
 
@@ -82,7 +86,6 @@ pretty_assertions = "1.3.0"
 test-case = { workspace = true }
 # Disable colored output in tests
 colored = { workspace = true, features = ["no-color"] }
-tempfile = "3.6.0"
 
 [features]
 default = []

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_bandit/S201.py

@@ -1,22 +0,0 @@
-from flask import Flask
-
-app = Flask(__name__)
-
-@app.route('/')
-def main():
-    raise
-
-# OK
-app.run(debug=True)
-
-# Errors
-app.run()
-app.run(debug=False)
-
-# Unrelated
-run()
-run(debug=True)
-run(debug)
-foo.run(debug=True)
-app = 1
-app.run(debug=True)

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

@@ -67,9 +67,7 @@ cfg.getboolean("hello", True)
 os.set_blocking(0, False)
 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/B002.py

@@ -1,6 +1,6 @@
 """
 Should emit:
-B002 - on lines 18, 19, and 24
+B002 - on lines 15 and 20
 """
 
 
@@ -8,17 +8,13 @@ def this_is_all_fine(n):
     x = n + 1
     y = 1 + n
     z = +x + y
-    a = n - 1
-    b = 1 - n
-    c = -a - b
-    return +z, -c
+    return +z
 
 
 def this_is_buggy(n):
     x = ++n
-    y = --n
-    return x, y
+    return x
 
 
 def this_is_buggy_too(n):
-    return ++n, --n
+    return ++n

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_4.py

@@ -1,9 +0,0 @@
-# formfeed indent
-# https://github.com/astral-sh/ruff/issues/7455#issuecomment-1722458825
-# This is technically a stylist bug (and has a test there), but it surfaced in B006
-
-
-class FormFeedIndent:
-   def __init__(self, a=[]):
-        print(a)
-

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/B007.py

@@ -97,10 +97,3 @@ def f():
 # variable name).
 for line_ in range(self.header_lines):
     fp.readline()
-
-# Regression test: visitor didn't walk the elif test
-for key, value in current_crawler_tags.items():
-    if key:
-        pass
-    elif wanted_tag_value != value:
-        pass

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)
@@ -53,6 +43,3 @@ setattr(foo, "__123abc__", None)
 setattr(foo, "abc123", None)
 setattr(foo, r"abc123", None)
 setattr(foo.bar, r"baz", None)
-
-# Regression test for: https://github.com/astral-sh/ruff/issues/7455#issuecomment-1722458885
-assert getattr(func, '_rpc')is True

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_builtins/A003.py

@@ -17,37 +17,3 @@ from typing import TypedDict
 
 class MyClass(TypedDict):
     id: int
-
-
-from threading import Event
-
-
-class CustomEvent(Event):
-    def set(self) -> None:
-        ...
-
-    def str(self) -> None:
-        ...
-
-
-from logging import Filter, LogRecord
-
-
-class CustomFilter(Filter):
-    def filter(self, record: LogRecord) -> bool:
-        ...
-
-    def str(self) -> None:
-        ...
-
-
-from typing_extensions import override
-
-
-class MyClass:
-    @override
-    def str(self):
-        pass
-
-    def int(self):
-        pass

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

@@ -16,9 +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)
-
-# Regression test for: https://github.com/astral-sh/ruff/issues/7455#issuecomment-1722458940
-dict((*v, k) for k, v in enumerate(calendar.month_abbr))

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_executable/EXE004_4.py

@@ -1,2 +0,0 @@
-
-    #!/usr/bin/env python

crates/ruff/resources/test/fixtures/flake8_implicit_str_concat/ISC.py

@@ -50,12 +50,3 @@ _ = """a""" "b"
 _ = 'a' "b"
 
 _ = rf"a" rf"b"
-
-# Single-line explicit concatenation should be ignored.
-_ = "abc" + "def" + "ghi"
-_ = foo + "abc" + "def"
-_ = "abc" + foo + "def"
-_ = "abc" + "def" + foo
-_ = foo + bar + "abc"
-_ = "abc" + foo + bar
-_ = foo + "abc" + bar

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/LOG002.py

@@ -1,24 +0,0 @@
-import logging
-from logging import getLogger
-
-# Ok
-logging.getLogger(__name__)
-logging.getLogger(name=__name__)
-logging.getLogger("custom")
-logging.getLogger(name="custom")
-
-# LOG002
-getLogger(__file__)
-logging.getLogger(name=__file__)
-
-logging.getLogger(__cached__)
-getLogger(name=__cached__)
-
-
-# Override `logging.getLogger`
-class logging:
-    def getLogger(self):
-        pass
-
-
-logging.getLogger(__file__)

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

@@ -1,16 +0,0 @@
-import logging
-
-logger = logging.getLogger(__name__)
-
-logging.exception("foo")  # OK
-logging.exception("foo", exc_info=False)  # LOG007
-logging.exception("foo", exc_info=[])  # LOG007
-logger.exception("foo")  # OK
-logger.exception("foo", exc_info=False)  # LOG007
-logger.exception("foo", exc_info=[])  # LOG007
-
-
-from logging import exception
-
-exception("foo", exc_info=False)  # LOG007
-exception("foo", exc_info=True)  # OK

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_logging_format/G010.py

@@ -1,10 +1,5 @@
 import logging
 from distutils import log
 
-from logging_setup import logger
-
 logging.warn("Hello World!")
 log.warn("Hello world!")  # This shouldn't be considered as a logger candidate
-logger.warn("Hello world!")
-
-logging . warn("Hello World!")

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/PYI017.py

@@ -1,14 +0,0 @@
-var: int
-a = var  # OK
-
-b = c = int  # OK
-
-a.b = int  # OK
-
-d, e = int, str  # OK
-
-f, g, h = int, str, TypeVar("T")  # OK
-
-i: TypeAlias = int | str  # OK
-
-j: TypeAlias = int  # OK

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

@@ -1,14 +0,0 @@
-var: int
-a = var  # OK
-
-b = c = int  # PYI017
-
-a.b = int  # PYI017
-
-d, e = int, str  # PYI017
-
-f, g, h = int, str, TypeVar("T")  # PYI017
-
-i: TypeAlias = int | str  # OK
-
-j: TypeAlias = int  # OK

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

@@ -1,12 +0,0 @@
-import typing
-from typing import TypeVar
-
-_T = typing.TypeVar("_T")
-_P = TypeVar("_P")
-
-# OK
-_UsedTypeVar = TypeVar("_UsedTypeVar")
-def func(arg: _UsedTypeVar) -> _UsedTypeVar: ...
-
-_A, _B = TypeVar("_A"), TypeVar("_B")
-_C = _D = TypeVar("_C")

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

@@ -1,12 +0,0 @@
-import typing
-from typing import TypeVar
-
-_T = typing.TypeVar("_T")
-_P = TypeVar("_P")
-
-# OK
-_UsedTypeVar = TypeVar("_UsedTypeVar")
-def func(arg: _UsedTypeVar) -> _UsedTypeVar: ...
-
-_A, _B = TypeVar("_A"), TypeVar("_B")
-_C = _D = TypeVar("_C")

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

@@ -1,46 +0,0 @@
-from typing import TypeVar, Self, Type
-
-_S = TypeVar("_S", bound=BadClass)
-_S2 = TypeVar("_S2", BadClass, GoodClass)
-
-class BadClass:
-    def __new__(cls: type[_S], *args: str, **kwargs: int) -> _S: ...  # PYI019
-
-
-    def bad_instance_method(self: _S, arg: bytes) -> _S: ...  # PYI019
-
-
-    @classmethod
-    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
-
-
-class GoodClass:
-    def __new__(cls: type[Self], *args: list[int], **kwargs: set[str]) -> Self: ...
-    def good_instance_method_1(self: Self, arg: bytes) -> Self: ...
-    def good_instance_method_2(self, arg1: _S2, arg2: _S2) -> _S2: ...
-    @classmethod
-    def good_cls_method_1(cls: type[Self], arg: int) -> Self: ...
-    @classmethod
-    def good_cls_method_2(cls, arg1: _S, arg2: _S) -> _S: ...
-    @staticmethod
-    def static_method(arg1: _S) -> _S: ...
-
-
-# Python > 3.12
-class PEP695BadDunderNew[T]:
-  def __new__[S](cls: type[S], *args: Any, ** kwargs: Any) -> S: ...  # PYI019
-
-
-  def generic_instance_method[S](self: S) -> S: ...  # PYI019
-
-
-class PEP695GoodDunderNew[T]:
-  def __new__(cls, *args: Any, **kwargs: Any) -> Self: ...

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

@@ -1,46 +0,0 @@
-from typing import TypeVar, Self, Type
-
-_S = TypeVar("_S", bound=BadClass)
-_S2 = TypeVar("_S2", BadClass, GoodClass)
-
-class BadClass:
-    def __new__(cls: type[_S], *args: str, **kwargs: int) -> _S: ...  # PYI019
-
-
-    def bad_instance_method(self: _S, arg: bytes) -> _S: ...  # PYI019
-
-
-    @classmethod
-    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
-
-
-class GoodClass:
-    def __new__(cls: type[Self], *args: list[int], **kwargs: set[str]) -> Self: ...
-    def good_instance_method_1(self: Self, arg: bytes) -> Self: ...
-    def good_instance_method_2(self, arg1: _S2, arg2: _S2) -> _S2: ...
-    @classmethod
-    def good_cls_method_1(cls: type[Self], arg: int) -> Self: ...
-    @classmethod
-    def good_cls_method_2(cls, arg1: _S, arg2: _S) -> _S: ...
-    @staticmethod
-    def static_method(arg1: _S) -> _S: ...
-
-
-# Python > 3.12
-class PEP695BadDunderNew[T]:
-  def __new__[S](cls: type[S], *args: Any, ** kwargs: Any) -> S: ...  # PYI019
-
-
-  def generic_instance_method[S](self: S) -> S: ...  # PYI019
-
-
-class PEP695GoodDunderNew[T]:
-  def __new__(cls, *args: Any, **kwargs: Any) -> Self: ...

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

@@ -1,11 +1,9 @@
 import collections
 
-person: collections.namedtuple  # Y024 Use "typing.NamedTuple" instead of "collections.namedtuple"
+person: collections.namedtuple  # OK
 
 from collections import namedtuple
 
-person: namedtuple  # Y024 Use "typing.NamedTuple" instead of "collections.namedtuple"
+person: namedtuple  # OK
 
-person = namedtuple(
-    "Person", ["name", "age"]
-)  # Y024 Use "typing.NamedTuple" instead of "collections.namedtuple"
+person = namedtuple("Person", ["name", "age"])  # OK

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

@@ -1,19 +0,0 @@
-import typing
-from typing import TypeAlias, Literal, Any
-
-NewAny = Any
-OptionalStr = typing.Optional[str]
-Foo = Literal["foo"]
-IntOrStr = int | str
-AliasNone = None
-
-NewAny: typing.TypeAlias = Any
-OptionalStr: TypeAlias = typing.Optional[str]
-Foo: typing.TypeAlias = Literal["foo"]
-IntOrStr: TypeAlias = int | str
-IntOrFloat: Foo = int | float
-AliasNone: typing.TypeAlias = None
-
-# these are ok
-VarAlias = str
-AliasFoo = Foo

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

@@ -1,18 +0,0 @@
-from typing import Literal, Any
-
-NewAny = Any
-OptionalStr = typing.Optional[str]
-Foo = Literal["foo"]
-IntOrStr = int | str
-AliasNone = None
-
-NewAny: typing.TypeAlias = Any
-OptionalStr: TypeAlias = typing.Optional[str]
-Foo: typing.TypeAlias = Literal["foo"]
-IntOrStr: TypeAlias = int | str
-IntOrFloat: Foo = int | float
-AliasNone: typing.TypeAlias = None
-
-# these are ok
-VarAlias = str
-AliasFoo = Foo

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

@@ -1,38 +1,24 @@
-import typing
-import typing_extensions
 from typing import Literal
+# Shouldn't emit for any cases in the non-stub file for compatibility with flake8-pyi.
+# Note that this rule could be applied here in the future.
 
-# Shouldn't affect non-union field types.
 field1: Literal[1]  # OK
+field2: Literal[1] | Literal[2]  # OK
 
-# Should emit for duplicate field types.
-field2: Literal[1] | Literal[2]  # Error
-
-# Should emit for union types in arguments.
-def func1(arg1: Literal[1] | Literal[2]):  # Error
+def func1(arg1: Literal[1] | Literal[2]):  # OK
     print(arg1)
 
 
-# Should emit for unions in return types.
-def func2() -> Literal[1] | Literal[2]:  # Error
+def func2() -> Literal[1] | Literal[2]:  # OK
     return "my Literal[1]ing"
 
 
-# Should emit in longer unions, even if not directly adjacent.
-field3: Literal[1] | Literal[2] | str  # Error
-field4: str | Literal[1] | Literal[2]  # Error
-field5: Literal[1] | str | Literal[2]  # Error
-field6: Literal[1] | bool | Literal[2] | str  # Error
-
-# Should emit for non-type unions.
-field7 = Literal[1] | Literal[2]  # Error
-
-# Should emit for parenthesized unions.
-field8: Literal[1] | (Literal[2] | str)  # Error
-
-# Should handle user parentheses when fixing.
-field9: Literal[1] | (Literal[2] | str)  # Error
-field10: (Literal[1] | str) | Literal[2]  # Error
-
-# Should emit for union in generic parent type.
-field11: dict[Literal[1] | Literal[2], str]  # Error
+field3: Literal[1] | Literal[2] | str  # OK
+field4: str | Literal[1] | Literal[2]  # OK
+field5: Literal[1] | str | Literal[2]  # OK
+field6: Literal[1] | bool | Literal[2] | str  # OK
+field7 = Literal[1] | Literal[2]  # OK
+field8: Literal[1] | (Literal[2] | str)  # OK
+field9: Literal[1] | (Literal[2] | str)  # OK
+field10: (Literal[1] | str) | Literal[2]  # OK
+field11: dict[Literal[1] | Literal[2], str]  # OK

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

@@ -3,8 +3,8 @@ import typing
 
 
 class Bad:
-    def __eq__(self, other: Any) -> bool: ...  # Y032
-    def __ne__(self, other: typing.Any) -> typing.Any: ...  # Y032
+    def __eq__(self, other: Any) -> bool: ...  # Fine because not a stub file
+    def __ne__(self, other: typing.Any) -> typing.Any: ...  # Fine because not a stub file
 
 
 class Good:

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

@@ -9,16 +9,16 @@ from typing import (
 
 just_literals_pipe_union: TypeAlias = (
     Literal[True] | Literal["idk"]
-)  # PYI042, since not camel case
+)  # not PYI042 (not a stubfile)
 PublicAliasT: TypeAlias = str | int
 PublicAliasT2: TypeAlias = Union[str, bytes]
 _ABCDEFGHIJKLMNOPQRST: TypeAlias = typing.Any
 _PrivateAliasS: TypeAlias = Literal["I", "guess", "this", "is", "okay"]
 _PrivateAliasS2: TypeAlias = Annotated[str, "also okay"]
 
-snake_case_alias1: TypeAlias = str | int  # PYI042, since not camel case
-_snake_case_alias2: TypeAlias = Literal["whatever"]  # PYI042, since not camel case
-Snake_case_alias: TypeAlias = int | float  # PYI042, since not camel case
+snake_case_alias1: TypeAlias = str | int  # not PYI042 (not a stubfile)
+_snake_case_alias2: TypeAlias = Literal["whatever"]  # not PYI042 (not a stubfile)
+Snake_case_alias: TypeAlias = int | float  # not PYI042 (not a stubfile)
 
 # check that this edge case doesn't crash
 _: TypeAlias = str | int

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

@@ -7,11 +7,11 @@ from typing import (
     Literal,
 )
 
-_PrivateAliasT: TypeAlias = str | int  # PYI043, since this ends in a T
-_PrivateAliasT2: TypeAlias = typing.Any  # PYI043, since this ends in a T
+_PrivateAliasT: TypeAlias = str | int  # not PYI043 (not a stubfile)
+_PrivateAliasT2: TypeAlias = typing.Any  # not PYI043 (not a stubfile)
 _PrivateAliasT3: TypeAlias = Literal[
     "not", "a", "chance"
-]  # PYI043, since this ends in a T
+]  # not PYI043 (not a stubfile)
 just_literals_pipe_union: TypeAlias = Literal[True] | Literal["idk"]
 PublicAliasT: TypeAlias = str | int
 PublicAliasT2: TypeAlias = Union[str, bytes]

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

@@ -1,18 +0,0 @@
-import typing
-from typing import Protocol
-
-
-class _Foo(Protocol):
-    bar: int
-
-
-class _Bar(typing.Protocol):
-    bar: int
-
-
-# OK
-class _UsedPrivateProtocol(Protocol):
-    bar: int
-
-
-def uses__UsedPrivateProtocol(arg: _UsedPrivateProtocol) -> None: ...

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

@@ -1,18 +0,0 @@
-import typing
-from typing import Protocol
-
-
-class _Foo(object, Protocol):
-    bar: int
-
-
-class _Bar(typing.Protocol):
-    bar: int
-
-
-# OK
-class _UsedPrivateProtocol(Protocol):
-    bar: int
-
-
-def uses__UsedPrivateProtocol(arg: _UsedPrivateProtocol) -> None: ...

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

@@ -1,22 +0,0 @@
-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

@@ -1,22 +0,0 @@
-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/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/PYI049.py

@@ -1,18 +0,0 @@
-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.pyi

@@ -1,32 +0,0 @@
-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/PYI051.py

@@ -1,17 +0,0 @@
-import typing
-from typing import Literal, TypeAlias, Union
-
-A: str | Literal["foo"]
-B: TypeAlias = typing.Union[Literal[b"bar", b"foo"], bytes, str]
-C: TypeAlias = typing.Union[Literal[5], int, typing.Union[Literal["foo"], str]]
-D: TypeAlias = typing.Union[Literal[b"str_bytes", 42], bytes, int]
-
-def func(x: complex | Literal[1J], y: Union[Literal[3.14], float]): ...
-
-# OK
-A: Literal["foo"]
-B: TypeAlias = Literal[b"bar", b"foo"]
-C: TypeAlias = typing.Union[Literal[5], Literal["foo"]]
-D: TypeAlias = Literal[b"str_bytes", 42]
-
-def func(x: Literal[1J], y: Literal[3.14]): ...

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

@@ -1,17 +0,0 @@
-import typing
-from typing import Literal, TypeAlias, Union
-
-A: str | Literal["foo"]
-B: TypeAlias = typing.Union[Literal[b"bar", b"foo"], bytes, str]
-C: TypeAlias = typing.Union[Literal[5], int, typing.Union[Literal["foo"], str]]
-D: TypeAlias = typing.Union[Literal[b"str_bytes", 42], bytes, int]
-
-def func(x: complex | Literal[1J], y: Union[Literal[3.14], float]): ...
-
-# OK
-A: Literal["foo"]
-B: TypeAlias = Literal[b"bar", b"foo"]
-C: TypeAlias = typing.Union[Literal[5], Literal["foo"]]
-D: TypeAlias = Literal[b"str_bytes", 42]
-
-def func(x: Literal[1J], y: Literal[3.14]): ...

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

@@ -1,31 +0,0 @@
-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
-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_pyi/PYI055.pyi

@@ -1,24 +0,0 @@
-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
-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_pyi/PYI056.py

@@ -1,12 +0,0 @@
-__all__ = ["A", "B", "C"]
-
-# Errors
-__all__.append("D")
-__all__.extend(["E", "Foo"])
-__all__.remove("A")
-
-# OK
-__all__ += ["D"]
-foo = ["Hello"]
-foo.append("World")
-foo.bar.append("World")

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

@@ -1,12 +0,0 @@
-__all__ = ["A", "B", "C"]
-
-# Errors
-__all__.append("D")
-__all__.extend(["E", "Foo"])
-__all__.remove("A")
-
-# OK
-__all__ += ["D"]
-foo = ["Hello"]
-foo.append("World")
-foo.bar.append("World")

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,21 +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
-
-
-# Regression test for: https://github.com/astral-sh/ruff/issues/7455#issuecomment-1722459517
-(self.assertTrue(
-    "piAx_piAy_beta[r][x][y] = {17}".format(
-        self.model.piAx_piAy_beta[r][x][y])))

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/PT012.py

@@ -11,10 +11,6 @@ async def test_ok_trivial_with():
         with context_manager_under_test():
             pass
 
-    with pytest.raises(ValueError):
-        with context_manager_under_test():
-            raise ValueError
-
     with pytest.raises(AttributeError):
         async with context_manager_under_test():
             pass
@@ -28,16 +24,6 @@ def test_ok_complex_single_call():
         )
 
 
-def test_ok_func_and_class():
-    with pytest.raises(AttributeError):
-        class A:
-            pass
-
-    with pytest.raises(AttributeError):
-        def f():
-            pass
-
-
 def test_error_multiple_statements():
     with pytest.raises(AttributeError):
         len([])
@@ -61,10 +47,13 @@ async def test_error_complex_statement():
         while True:
             [].size
 
+    with pytest.raises(AttributeError):
+        with context_manager_under_test():
+            [].size
+
     with pytest.raises(AttributeError):
         async with context_manager_under_test():
-            if True:
-                raise Exception
+            [].size
 
 
 def test_error_try():

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()