Use rustup-show instead of actions-rs

.github/CONTRIBUTING.md

@@ -14,10 +14,9 @@ If you're looking for a place to start, we recommend implementing a new lint rul
 pattern-match against the examples in the existing codebase. Many lint rules are inspired by
 existing Python plugins, which can be used as a reference implementation.
 
-As a concrete example: consider taking on one of the rules from the [`tryceratops`](https://github.com/charliermarsh/ruff/issues/2056)
-plugin, and looking to the originating [Python source](https://github.com/guilatrova/tryceratops)
-for guidance. [`flake8-simplify`](https://github.com/charliermarsh/ruff/issues/998) has a few rules
-left too.
+As a concrete example: consider taking on one of the rules in [`flake8-simplify`](https://github.com/charliermarsh/ruff/issues/998),
+and looking to the originating [Python source](https://github.com/MartinThoma/flake8-simplify) for
+guidance.
 
 ### Prerequisites
 
@@ -38,68 +37,57 @@ After cloning the repository, run Ruff locally with:
 cargo run resources/test/fixtures --no-cache
 ```
 
-Prior to opening a pull request, ensure that your code has been auto-formatted,
-and that it passes both the lint and test validation checks:
+Prior to opening a pull request, ensure that your code has been auto-formatted, and that it passes
+both the lint and test validation checks:
 
 ```shell
-cargo fmt --all     # Auto-formatting...
-cargo clippy --fix --workspace --all-targets --all-features  # Linting...
-cargo test --all    # Testing...
+cargo +nightly fmt --all     # Auto-formatting...
+cargo +nightly clippy --all  # Linting...
+cargo +nightly test --all    # Testing...
 ```
 
 These checks will run on GitHub Actions when you open your Pull Request, but running them locally
 will save you time and expedite the merge process.
 
-If you have `pre-commit` [installed](https://pre-commit.com/#installation) then you can use it to 
-assist with formatting and linting. The following command will run the `pre-commit` hooks:
-
-```shell
-pre-commit run --all-files
-```
-
 Your Pull Request will be reviewed by a maintainer, which may involve a few rounds of iteration
 prior to merging.
 
 ### Example: Adding a new lint rule
 
-At a high level, the steps involved in adding a new lint rule are as follows:
+There are four phases to adding a new lint rule:
 
-1. Create a file for your rule (e.g., `src/rules/flake8_bugbear/rules/abstract_base_class.rs`).
-2. In that file, define a violation struct. You can grep for `define_violation!` to see examples.
-3. Map the violation struct to a rule code in `src/registry.rs` (e.g., `E402`).
-4. Define the logic for triggering the violation in `src/checkers/ast.rs` (for AST-based checks),
-   `src/checkers/tokens.rs` (for token-based checks), `src/checkers/lines.rs` (for text-based
-   checks), or `src/checkers/filesystem.rs` (for filesystem-based checks).
-5. Add a test fixture.
-6. Update the generated files (documentation and generated code).
+1. Define the violation struct in `src/violations.rs` (e.g., `ModuleImportNotAtTopOfFile`).
+2. Map the violation struct to a rule code in `src/registry.rs` (e.g., `E402`).
+3. Define the logic for triggering the violation in `src/checkers/ast.rs` (for AST-based checks),
+   `src/checkers/tokens.rs` (for token-based checks), or `src/checkers/lines.rs` (for text-based checks).
+4. Add a test fixture.
+5. Update the generated files (documentation and generated code).
 
-To define the violation, start by creating a dedicated file for your rule under the appropriate
-rule linter (e.g., `src/rules/flake8_bugbear/rules/abstract_base_class.rs`). That file should
-contain a struct defined via `define_violation!`, along with a function that creates the violation
-based on any required inputs. (Many of the existing examples live in `src/violations.rs`, but we're
-looking to place new rules in their own files.)
+To define the violation, open up `src/violations.rs`, and define a new struct using the
+`define_violation!` macro. There are plenty of examples in that file, so feel free to pattern-match
+against the existing structs.
 
 To trigger the violation, you'll likely want to augment the logic in `src/checkers/ast.rs`, which
 defines the Python AST visitor, responsible for iterating over the abstract syntax tree and
 collecting diagnostics as it goes.
 
-If you need to inspect the AST, you can run `cargo dev print-ast` with a Python file. Grep
+If you need to inspect the AST, you can run `cargo +nightly dev print-ast` with a Python file. Grep
 for the `Check::new` invocations to understand how other, similar rules are implemented.
 
-To add a test fixture, create a file under `resources/test/fixtures/[linter]`, named to match
+To add a test fixture, create a file under `resources/test/fixtures/[origin]`, named to match
 the code you defined earlier (e.g., `resources/test/fixtures/pycodestyle/E402.py`). This file should
 contain a variety of violations and non-violations designed to evaluate and demonstrate the behavior
 of your lint rule.
 
-Run `cargo dev generate-all` to generate the code for your new fixture. Then run Ruff
+Run `cargo +nightly dev generate-all` to generate the code for your new fixture. Then run Ruff
 locally with (e.g.) `cargo run resources/test/fixtures/pycodestyle/E402.py --no-cache --select E402`.
 
 Once you're satisfied with the output, codify the behavior as a snapshot test by adding a new
-`test_case` macro in the relevant `src/[linter]/mod.rs` file. Then, run `cargo test --all`.
+`test_case` macro in the relevant `src/[origin]/mod.rs` file. Then, run `cargo test --all`.
 Your test will fail, but you'll be prompted to follow-up with `cargo insta review`. Accept the
 generated snapshot, then commit the snapshot file alongside the rest of your changes.
 
-Finally, regenerate the documentation and generated code with `cargo dev generate-all`.
+Finally, regenerate the documentation and generated code with `cargo +nightly dev generate-all`.
 
 ### Example: Adding a new configuration option
 
@@ -125,7 +113,7 @@ You may also want to add the new configuration option to the `flake8-to-ruff` to
 responsible for converting `flake8` configuration files to Ruff's TOML format. This logic
 lives in `flake8_to_ruff/src/converter.rs`.
 
-Finally, regenerate the documentation and generated code with `cargo dev generate-all`.
+Finally, regenerate the documentation and generated code with `cargo +nightly dev generate-all`.
 
 ## Release process
 

.github/release.yml

@@ -1,19 +0,0 @@
-# https://docs.github.com/en/repositories/releasing-projects-on-github/automatically-generated-release-notes#configuring-automatically-generated-release-notes
-changelog:
-  categories:
-    - title: Breaking Changes
-      labels:
-        - breaking
-    - title: Rules
-      labels:
-        - rule
-        - autofix
-    - title: Settings
-      labels:
-        - configuration
-    - title: Bug Fixes
-      labels:
-        - bug
-    - title: Other Changes
-      labels:
-        - "*"

.github/workflows/ci.yaml

@@ -4,7 +4,7 @@ on:
   push:
     branches: [main]
   pull_request:
-  workflow_dispatch:
+    branches: [main]
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.ref_name }}-${{ github.event.pull_request.number || github.sha }}
@@ -13,7 +13,6 @@ concurrency:
 env:
   CARGO_INCREMENTAL: 0
   CARGO_NET_RETRY: 10
-  CARGO_TERM_COLOR: always
   RUSTUP_MAX_RETRIES: 10
 
 jobs:
@@ -22,13 +21,12 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3
-      - name: "Install Rust toolchain"
-        run: rustup show
+      - run: rustup show
       - uses: Swatinem/rust-cache@v1
       - run: cargo build --all
       - run: ./target/debug/ruff_dev generate-all
-      - run: git diff --quiet README.md || echo "::error file=README.md::This file is outdated. Run 'cargo dev generate-all'."
-      - run: git diff --quiet ruff.schema.json || echo "::error file=ruff.schema.json::This file is outdated. Run 'cargo dev generate-all'."
+      - run: git diff --quiet README.md || echo "::error file=README.md::This file is outdated. Run 'cargo +nightly dev generate-all'."
+      - run: git diff --quiet ruff.schema.json || echo "::error file=ruff.schema.json::This file is outdated. Run 'cargo +nightly dev generate-all'."
       - run: git diff --exit-code -- README.md ruff.schema.json
 
   cargo-fmt:
@@ -36,8 +34,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3
-      - name: "Install Rust toolchain"
-        run: rustup component add rustfmt
+      - run: rustup show
       - run: cargo fmt --all --check
 
   cargo_clippy:
@@ -45,80 +42,73 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3
-      - name: "Install Rust toolchain"
-        run: |
-          rustup component add clippy
-          rustup target add wasm32-unknown-unknown
+      - run: rustup show
       - uses: Swatinem/rust-cache@v1
       - run: cargo clippy --workspace --all-targets --all-features -- -D warnings -W clippy::pedantic
-      - run: cargo clippy -p ruff --target wasm32-unknown-unknown --all-features -- -D warnings -W clippy::pedantic
+      - run: cargo clippy --workspace --target wasm32-unknown-unknown --all-features -- -D warnings -W clippy::pedantic
 
   cargo-test:
-    strategy:
-      matrix:
-        os: [ ubuntu-latest, windows-latest ]
-    runs-on: ${{ matrix.os }}
-    name: "cargo test | ${{ matrix.os }}"
-    steps:
-      - uses: actions/checkout@v3
-      - name: "Install Rust toolchain"
-        run: rustup show
-      - uses: Swatinem/rust-cache@v1
-      - run: cargo install cargo-insta
-      - run: pip install black[d]==22.12.0
-      - name: "Run tests (Ubuntu)"
-        if: ${{ matrix.os == 'ubuntu-latest' }}
-        run: |
-          cargo insta test --all --delete-unreferenced-snapshots
-          git diff --exit-code
-      - name: "Run tests (Windows)"
-        if: ${{ matrix.os == 'windows-latest' }}
-        shell: bash
-        run: |
-          cargo insta test --all
-          git diff --exit-code
-      - run: cargo test --package ruff_cli --test black_compatibility_test -- --ignored
-      # Check for broken links in the documentation.
-      - run: cargo doc --all --no-deps
-        env:
-          # Setting RUSTDOCFLAGS because `cargo doc --check` isn't yet implemented (https://github.com/rust-lang/cargo/issues/10025).
-          RUSTDOCFLAGS: "-D warnings"
-
-  scripts:
-    name: "test scripts"
+    name: "cargo test"
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3
-      - name: "Install Rust toolchain"
-        run: rustup show
+      - run: rustup show
       - uses: Swatinem/rust-cache@v1
-      - run: ./scripts/add_rule.py --name DoTheThing --code PLC999 --linter pylint
-      - run: cargo check
-      - run: |
-         ./scripts/add_plugin.py test --url https://pypi.org/project/-test/0.1.0/ --prefix TST
-         ./scripts/add_rule.py --name FirstRule --code TST001 --linter test
-      - run: cargo check
+      - run: cargo install cargo-insta
+      - run: pip install black[d]==22.12.0
+      - name: Run tests
+        run: |
+          cargo insta test --all --delete-unreferenced-snapshots
+          git diff --exit-code
+      - run: cargo test --package ruff --test black_compatibility_test -- --ignored
+
+# TODO(charlie): Re-enable the `wasm-pack` tests.
+# See: https://github.com/charliermarsh/ruff/issues/1425
+#  wasm-pack-test:
+#    name: "wasm-pack test"
+#    runs-on: ubuntu-latest
+#    env:
+#      WASM_BINDGEN_TEST_TIMEOUT: 60
+#    steps:
+#      - uses: actions/checkout@v3
+#      - run: rustup show
+#      - uses: actions/cache@v3
+#        env:
+#          cache-name: cache-cargo
+#        with:
+#          path: |
+#            ~/.cargo/registry
+#            ~/.cargo/git
+#          key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ hashFiles('**/Cargo.lock') }}
+#          restore-keys: |
+#            ${{ runner.os }}-build-${{ env.cache-name }}-
+#            ${{ runner.os }}-build-
+#            ${{ runner.os }}-
+#      - uses: jetli/wasm-pack-action@v0.4.0
+#      - uses: jetli/wasm-bindgen-action@v0.2.0
+#      - run: wasm-pack test --node
 
   maturin-build:
     name: "maturin build"
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3
-      - name: "Install Rust toolchain"
-        run: rustup show
+      - run: rustup show
       - uses: Swatinem/rust-cache@v1
       - uses: actions/setup-python@v4
         with:
           python-version: "3.11"
       - run: pip install maturin
       - run: maturin build -b bin
-      - run: python scripts/transform_readme.py --target pypi
 
   typos:
-    name: "spell check"
+    name: Spell Check with Typos
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v3
-    - uses: crate-ci/typos@master
+    - name: Checkout Actions Repository
+      uses: actions/checkout@v2
+
+    - name: Check spelling of file.txt
+      uses: crate-ci/typos@master
       with:
         files: .

.github/workflows/docs.yaml

@@ -1,35 +0,0 @@
-name: mkdocs
-
-on:
-  push:
-    paths:
-      - README.md
-      - mkdocs.template.yml
-      - .github/workflows/docs.yaml
-    branches: [ main ]
-  workflow_dispatch:
-
-
-jobs:
-  mkdocs:
-    runs-on: ubuntu-latest
-    env:
-      CF_API_TOKEN_EXISTS: ${{ secrets.CF_API_TOKEN != '' }}
-    steps:
-      - uses: actions/checkout@v3
-      - uses: actions/setup-python@v4
-      - name: "Install dependencies"
-        run: |
-          pip install "mkdocs~=1.4.2" "mkdocs-material~=9.0.6"
-      - name: "Copy README File"
-        run: |
-          python scripts/transform_readme.py --target mkdocs
-          python scripts/generate_mkdocs.py
-          mkdocs build --strict
-      - name: "Deploy to Cloudflare Pages"
-        if: ${{ env.CF_API_TOKEN_EXISTS == 'true' }}
-        uses: cloudflare/wrangler-action@2.0.0
-        with:
-          apiToken: ${{ secrets.CF_API_TOKEN }}
-          accountId: ${{ secrets.CF_ACCOUNT_ID }}
-          command: pages publish site --project-name=ruff-docs --branch ${GITHUB_HEAD_REF} --commit-hash ${GITHUB_SHA}

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

@@ -12,7 +12,6 @@ env:
   PYTHON_VERSION: "3.7" # to build abi3 wheels
   CARGO_INCREMENTAL: 0
   CARGO_NET_RETRY: 10
-  CARGO_TERM_COLOR: always
   RUSTUP_MAX_RETRIES: 10
 
 jobs:
@@ -24,18 +23,18 @@ jobs:
         with:
           python-version: ${{ env.PYTHON_VERSION }}
           architecture: x64
-      - name: "Install Rust toolchain"
+      - name: Install Rust toolchain
         run: rustup show
-      - name: "Build wheels - x86_64"
+      - name: Build wheels - x86_64
         uses: messense/maturin-action@v1
         with:
           target: x86_64
           args: --release --out dist --sdist -m ./${{ env.CRATE_NAME }}/Cargo.toml
-      - name: "Install built wheel - x86_64"
+      - name: Install built wheel - x86_64
         run: |
           pip install dist/${{ env.CRATE_NAME }}-*.whl --force-reinstall
-      - name: "Upload wheels"
-        uses: actions/upload-artifact@v3
+      - name: Upload wheels
+        uses: actions/upload-artifact@v2
         with:
           name: wheels
           path: dist
@@ -47,17 +46,17 @@ jobs:
         with:
           python-version: ${{ env.PYTHON_VERSION }}
           architecture: x64
-      - name: "Install Rust toolchain"
+      - name: Install Rust toolchain
         run: rustup show
-      - name: "Build wheels - universal2"
+      - name: Build wheels - universal2
         uses: messense/maturin-action@v1
         with:
           args: --release --universal2 --out dist -m ./${{ env.CRATE_NAME }}/Cargo.toml
-      - name: "Install built wheel - universal2"
+      - name: Install built wheel - universal2
         run: |
           pip install dist/${{ env.CRATE_NAME }}-*universal2.whl --force-reinstall
-      - name: "Upload wheels"
-        uses: actions/upload-artifact@v3
+      - name: Upload wheels
+        uses: actions/upload-artifact@v2
         with:
           name: wheels
           path: dist
@@ -73,19 +72,19 @@ jobs:
         with:
           python-version: ${{ env.PYTHON_VERSION }}
           architecture: ${{ matrix.target }}
-      - name: "Install Rust toolchain"
+      - name: Install Rust toolchain
         run: rustup show
-      - name: "Build wheels"
+      - name: Build wheels
         uses: messense/maturin-action@v1
         with:
           target: ${{ matrix.target }}
           args: --release --out dist -m ./${{ env.CRATE_NAME }}/Cargo.toml
-      - name: "Install built wheel"
+      - name: Install built wheel
         shell: bash
         run: |
           python -m pip install dist/${{ env.CRATE_NAME }}-*.whl --force-reinstall
-      - name: "Upload wheels"
-        uses: actions/upload-artifact@v3
+      - name: Upload wheels
+        uses: actions/upload-artifact@v2
         with:
           name: wheels
           path: dist
@@ -101,18 +100,18 @@ jobs:
         with:
           python-version: ${{ env.PYTHON_VERSION }}
           architecture: x64
-      - name: "Build wheels"
+      - name: Build wheels
         uses: messense/maturin-action@v1
         with:
           target: ${{ matrix.target }}
           manylinux: auto
           args: --release --out dist -m ./${{ env.CRATE_NAME }}/Cargo.toml
-      - name: "Install built wheel"
+      - name: Install built wheel
         if: matrix.target == 'x86_64'
         run: |
           pip install dist/${{ env.CRATE_NAME }}-*.whl --force-reinstall
-      - name: "Upload wheels"
-        uses: actions/upload-artifact@v3
+      - name: Upload wheels
+        uses: actions/upload-artifact@v2
         with:
           name: wheels
           path: dist
@@ -127,13 +126,13 @@ jobs:
       - uses: actions/setup-python@v4
         with:
           python-version: ${{ env.PYTHON_VERSION }}
-      - name: "Build wheels"
+      - name: Build wheels
         uses: messense/maturin-action@v1
         with:
           target: ${{ matrix.target }}
           manylinux: auto
           args: --no-default-features --release --out dist -m ./${{ env.CRATE_NAME }}/Cargo.toml
-      - uses: uraimo/run-on-arch-action@v2.5.0
+      - uses: uraimo/run-on-arch-action@v2.0.5
         if: matrix.target != 'ppc64'
         name: Install built wheel
         with:
@@ -146,8 +145,8 @@ jobs:
             pip3 install -U pip
           run: |
             pip3 install ${{ env.PACKAGE_NAME }} --no-index --find-links dist/ --force-reinstall
-      - name: "Upload wheels"
-        uses: actions/upload-artifact@v3
+      - name: Upload wheels
+        uses: actions/upload-artifact@v2
         with:
           name: wheels
           path: dist
@@ -165,13 +164,13 @@ jobs:
         with:
           python-version: ${{ env.PYTHON_VERSION }}
           architecture: x64
-      - name: "Build wheels"
+      - name: Build wheels
         uses: messense/maturin-action@v1
         with:
           target: ${{ matrix.target }}
           manylinux: musllinux_1_2
           args: --release --out dist -m ./${{ env.CRATE_NAME }}/Cargo.toml
-      - name: "Install built wheel"
+      - name: Install built wheel
         if: matrix.target == 'x86_64-unknown-linux-musl'
         uses: addnab/docker-run-action@v3
         with:
@@ -180,8 +179,8 @@ jobs:
           run: |
             apk add py3-pip
             pip3 install ${{ env.PACKAGE_NAME }} --no-index --find-links /io/dist/ --force-reinstall
-      - name: "Upload wheels"
-        uses: actions/upload-artifact@v3
+      - name: Upload wheels
+        uses: actions/upload-artifact@v2
         with:
           name: wheels
           path: dist
@@ -200,7 +199,7 @@ jobs:
       - uses: actions/setup-python@v4
         with:
           python-version: ${{ env.PYTHON_VERSION }}
-      - name: "Build wheels"
+      - name: Build wheels
         uses: messense/maturin-action@v1
         with:
           target: ${{ matrix.platform.target }}
@@ -216,8 +215,8 @@ jobs:
             apk add py3-pip
           run: |
             pip3 install ${{ env.PACKAGE_NAME }} --no-index --find-links dist/ --force-reinstall
-      - name: "Upload wheels"
-        uses: actions/upload-artifact@v3
+      - name: Upload wheels
+        uses: actions/upload-artifact@v2
         with:
           name: wheels
           path: dist
@@ -240,18 +239,18 @@ jobs:
       - uses: actions/setup-python@v4
         with:
           python-version: pypy${{ matrix.python-version }}
-      - name: "Build wheels"
+      - name: Build wheels
         uses: messense/maturin-action@v1
         with:
           target: ${{ matrix.target }}
           manylinux: auto
           args: --release --out dist -i pypy${{ matrix.python-version }} -m ./${{ env.CRATE_NAME }}/Cargo.toml
-      - name: "Install built wheel"
+      - name: Install built wheel
         if: matrix.target == 'x86_64'
         run: |
           pip install dist/${{ env.CRATE_NAME }}-*.whl --force-reinstall
-      - name: "Upload wheels"
-        uses: actions/upload-artifact@v3
+      - name: Upload wheels
+        uses: actions/upload-artifact@v2
         with:
           name: wheels
           path: dist
@@ -269,11 +268,11 @@ jobs:
       - musllinux-cross
       - pypy
     steps:
-      - uses: actions/download-artifact@v3
+      - uses: actions/download-artifact@v2
         with:
           name: wheels
       - uses: actions/setup-python@v4
-      - name: "Publish to PyPi"
+      - name: Publish to PyPi
         env:
           TWINE_USERNAME: __token__
           TWINE_PASSWORD: ${{ secrets.FLAKE8_TO_RUFF_TOKEN }}

.github/workflows/playground.yaml

@@ -8,7 +8,6 @@ on:
 env:
   CARGO_INCREMENTAL: 0
   CARGO_NET_RETRY: 10
-  CARGO_TERM_COLOR: always
   RUSTUP_MAX_RETRIES: 10
 
 jobs:
@@ -18,8 +17,7 @@ jobs:
        CF_API_TOKEN_EXISTS: ${{ secrets.CF_API_TOKEN != '' }}
     steps:
       - uses: actions/checkout@v3
-      - name: "Install Rust toolchain"
-        run: rustup target add wasm32-unknown-unknown
+      - run: rustup show
       - uses: actions/setup-node@v3
         with:
           node-version: 18
@@ -28,7 +26,7 @@ jobs:
       - uses: jetli/wasm-pack-action@v0.4.0
       - uses: jetli/wasm-bindgen-action@v0.2.0
       - name: "Run wasm-pack"
-        run: wasm-pack build --target web --out-dir playground/src/pkg . -- -p ruff
+        run: wasm-pack build --target web --out-dir playground/src/pkg
       - name: "Install Node dependencies"
         run: npm ci
         working-directory: playground

.github/workflows/ruff.yaml

@@ -1,7 +1,6 @@
 name: "[ruff] Release"
 
 on:
-  workflow_dispatch:
   release:
     types: [published]
 
@@ -14,7 +13,6 @@ env:
   PYTHON_VERSION: "3.7" # to build abi3 wheels
   CARGO_INCREMENTAL: 0
   CARGO_NET_RETRY: 10
-  CARGO_TERM_COLOR: always
   RUSTUP_MAX_RETRIES: 10
 
 jobs:
@@ -26,18 +24,18 @@ jobs:
         with:
           python-version: ${{ env.PYTHON_VERSION }}
           architecture: x64
-      - name: "Prep README.md"
-        run: python scripts/transform_readme.py --target pypi
-      - name: "Build wheels - x86_64"
+      - name: Install Rust toolchain
+        run: rustup show
+      - name: Build wheels - x86_64
         uses: messense/maturin-action@v1
         with:
           target: x86_64
           args: --release --out dist --sdist
-      - name: "Install built wheel - x86_64"
+      - name: Install built wheel - x86_64
         run: |
           pip install dist/${{ env.PACKAGE_NAME }}-*.whl --force-reinstall
-      - name: "Upload wheels"
-        uses: actions/upload-artifact@v3
+      - name: Upload wheels
+        uses: actions/upload-artifact@v2
         with:
           name: wheels
           path: dist
@@ -49,17 +47,17 @@ jobs:
         with:
           python-version: ${{ env.PYTHON_VERSION }}
           architecture: x64
-      - name: "Prep README.md"
-        run: python scripts/transform_readme.py --target pypi
-      - name: "Build wheels - universal2"
+      - name: Install Rust toolchain
+        run: rustup show
+      - name: Build wheels - universal2
         uses: messense/maturin-action@v1
         with:
           args: --release --universal2 --out dist
-      - name: "Install built wheel - universal2"
+      - name: Install built wheel - universal2
         run: |
           pip install dist/${{ env.PACKAGE_NAME }}-*universal2.whl --force-reinstall
-      - name: "Upload wheels"
-        uses: actions/upload-artifact@v3
+      - name: Upload wheels
+        uses: actions/upload-artifact@v2
         with:
           name: wheels
           path: dist
@@ -75,19 +73,19 @@ jobs:
         with:
           python-version: ${{ env.PYTHON_VERSION }}
           architecture: ${{ matrix.target }}
-      - name: "Prep README.md"
-        run: python scripts/transform_readme.py --target pypi
-      - name: "Build wheels"
+      - name: Install Rust toolchain
+        run: rustup show
+      - name: Build wheels
         uses: messense/maturin-action@v1
         with:
           target: ${{ matrix.target }}
           args: --release --out dist
-      - name: "Install built wheel"
+      - name: Install built wheel
         shell: bash
         run: |
           python -m pip install dist/${{ env.PACKAGE_NAME }}-*.whl --force-reinstall
-      - name: "Upload wheels"
-        uses: actions/upload-artifact@v3
+      - name: Upload wheels
+        uses: actions/upload-artifact@v2
         with:
           name: wheels
           path: dist
@@ -103,20 +101,18 @@ jobs:
         with:
           python-version: ${{ env.PYTHON_VERSION }}
           architecture: x64
-      - name: "Prep README.md"
-        run: python scripts/transform_readme.py --target pypi
-      - name: "Build wheels"
+      - name: Build wheels
         uses: messense/maturin-action@v1
         with:
           target: ${{ matrix.target }}
           manylinux: auto
           args: --release --out dist
-      - name: "Install built wheel"
+      - name: Install built wheel
         if: matrix.target == 'x86_64'
         run: |
           pip install dist/${{ env.PACKAGE_NAME }}-*.whl --force-reinstall
-      - name: "Upload wheels"
-        uses: actions/upload-artifact@v3
+      - name: Upload wheels
+        uses: actions/upload-artifact@v2
         with:
           name: wheels
           path: dist
@@ -131,15 +127,13 @@ jobs:
       - uses: actions/setup-python@v4
         with:
           python-version: ${{ env.PYTHON_VERSION }}
-      - name: "Prep README.md"
-        run: python scripts/transform_readme.py --target pypi
-      - name: "Build wheels"
+      - name: Build wheels
         uses: messense/maturin-action@v1
         with:
           target: ${{ matrix.target }}
           manylinux: auto
           args: --no-default-features --release --out dist
-      - uses: uraimo/run-on-arch-action@v2.5.0
+      - uses: uraimo/run-on-arch-action@v2.0.5
         if: matrix.target != 'ppc64'
         name: Install built wheel
         with:
@@ -152,8 +146,8 @@ jobs:
             pip3 install -U pip
           run: |
             pip3 install ${{ env.PACKAGE_NAME }} --no-index --find-links dist/ --force-reinstall
-      - name: "Upload wheels"
-        uses: actions/upload-artifact@v3
+      - name: Upload wheels
+        uses: actions/upload-artifact@v2
         with:
           name: wheels
           path: dist
@@ -171,15 +165,13 @@ jobs:
         with:
           python-version: ${{ env.PYTHON_VERSION }}
           architecture: x64
-      - name: "Prep README.md"
-        run: python scripts/transform_readme.py --target pypi
-      - name: "Build wheels"
+      - name: Build wheels
         uses: messense/maturin-action@v1
         with:
           target: ${{ matrix.target }}
           manylinux: musllinux_1_2
           args: --release --out dist
-      - name: "Install built wheel"
+      - name: Install built wheel
         if: matrix.target == 'x86_64-unknown-linux-musl'
         uses: addnab/docker-run-action@v3
         with:
@@ -188,8 +180,8 @@ jobs:
           run: |
             apk add py3-pip
             pip3 install ${{ env.PACKAGE_NAME }} --no-index --find-links /io/dist/ --force-reinstall
-      - name: "Upload wheels"
-        uses: actions/upload-artifact@v3
+      - name: Upload wheels
+        uses: actions/upload-artifact@v2
         with:
           name: wheels
           path: dist
@@ -208,9 +200,7 @@ jobs:
       - uses: actions/setup-python@v4
         with:
           python-version: ${{ env.PYTHON_VERSION }}
-      - name: "Prep README.md"
-        run: python scripts/transform_readme.py --target pypi
-      - name: "Build wheels"
+      - name: Build wheels
         uses: messense/maturin-action@v1
         with:
           target: ${{ matrix.platform.target }}
@@ -226,8 +216,8 @@ jobs:
             apk add py3-pip
           run: |
             pip3 install ${{ env.PACKAGE_NAME }} --no-index --find-links dist/ --force-reinstall
-      - name: "Upload wheels"
-        uses: actions/upload-artifact@v3
+      - name: Upload wheels
+        uses: actions/upload-artifact@v2
         with:
           name: wheels
           path: dist
@@ -250,20 +240,18 @@ jobs:
       - uses: actions/setup-python@v4
         with:
           python-version: pypy${{ matrix.python-version }}
-      - name: "Prep README.md"
-        run: python scripts/transform_readme.py --target pypi
-      - name: "Build wheels"
+      - name: Build wheels
         uses: messense/maturin-action@v1
         with:
           target: ${{ matrix.target }}
           manylinux: auto
           args: --release --out dist -i pypy${{ matrix.python-version }}
-      - name: "Install built wheel"
+      - name: Install built wheel
         if: matrix.target == 'x86_64'
         run: |
           pip install dist/${{ env.PACKAGE_NAME }}-*.whl --force-reinstall
-      - name: "Upload wheels"
-        uses: actions/upload-artifact@v3
+      - name: Upload wheels
+        uses: actions/upload-artifact@v2
         with:
           name: wheels
           path: dist
@@ -282,17 +270,14 @@ jobs:
       - pypy
     if: "startsWith(github.ref, 'refs/tags/')"
     steps:
-      - uses: actions/download-artifact@v3
+      - uses: actions/download-artifact@v2
         with:
           name: wheels
       - uses: actions/setup-python@v4
-      - name: "Publish to PyPi"
+      - name: Publish to PyPi
         env:
           TWINE_USERNAME: __token__
           TWINE_PASSWORD: ${{ secrets.RUFF_TOKEN }}
         run: |
           pip install --upgrade twine
           twine upload --skip-existing *
-      - name: "Update pre-commit mirror"
-        run: |
-          curl -X POST -H "Accept: application/vnd.github+json" -H "Authorization: Bearer ${{ secrets.RUFF_PRE_COMMIT_PAT }}" -H "X-GitHub-Api-Version: 2022-11-28" https://api.github.com/repos/charliermarsh/ruff-pre-commit/dispatches --data '{"event_type": "pypi_release"}'

.gitignore

@@ -1,8 +1,6 @@
 # Local cache
 .ruff_cache
 resources/test/cpython
-docs/
-mkdocs.yml
 
 ###
 # Rust.gitignore
@@ -184,6 +182,3 @@ cython_debug/
 #  option (not recommended) you can uncomment the following to ignore the entire idea folder.
 .idea/
 .vimspector.json
-
-# Visual Studio Code
-.vscode/

.pre-commit-config.yaml

@@ -1,31 +1,10 @@
 repos:
   - repo: https://github.com/charliermarsh/ruff-pre-commit
-    rev: v0.0.239
+    rev: v0.0.217
     hooks:
       - id: ruff
-        args: [--fix]
-        exclude: ^resources
 
   - repo: https://github.com/abravalheri/validate-pyproject
     rev: v0.10.1
     hooks:
       - id: validate-pyproject
-
-  - repo: local
-    hooks:
-      - id: cargo-fmt
-        name: cargo fmt
-        entry: cargo fmt --
-        language: rust
-        types: [rust]
-      - id: clippy
-        name: clippy
-        entry: cargo clippy --workspace --all-targets --all-features
-        language: rust
-        pass_filenames: false
-      - id: dev-generate-all
-        name: dev-generate-all
-        entry: cargo dev generate-all
-        language: rust
-        pass_filenames: false
-        exclude: target

BREAKING_CHANGES.md

@@ -1,112 +1,5 @@
 # Breaking Changes
 
-## 0.0.238
-
-### `select`, `extend-select`, `ignore`, and `extend-ignore` have new semantics ([#2312](https://github.com/charliermarsh/ruff/pull/2312))
-
-Previously, the interplay between `select` and its related options could lead to unexpected
-behavior. For example, `ruff --select E501 --ignore ALL` and `ruff --select E501 --extend-ignore
-ALL` behaved differently. (See [#2312](https://github.com/charliermarsh/ruff/pull/2312) for more
-examples.)
-
-When Ruff determines the enabled rule set, it has to reconcile `select` and `ignore` from a variety
-of sources, including the current `pyproject.toml`, any inherited `pyproject.toml` files, and the
-CLI.
-
-The new semantics are such that Ruff uses the "highest-priority" `select` as the basis for the rule
-set, and then applies any `extend-select`, `ignore`, and `extend-ignore` adjustments. CLI options
-are given higher priority than `pyproject.toml` options, and the current `pyproject.toml` file is
-given higher priority than any inherited `pyproject.toml` files.
-
-`extend-select` and `extend-ignore` are no longer given "top priority"; instead, they merely append
-to the `select` and `ignore` lists, as in Flake8.
-
-This change is largely backwards compatible -- most users should experience no change in behavior.
-However, as an example of a breaking change, consider the following:
-
-```toml
-[tool.ruff]
-ignore = ["F401"]
-```
-
-Running `ruff --select F` would previously have enabled all `F` rules, apart from `F401`. Now, it
-will enable all `F` rules, including `F401`, as the command line's `--select` resets the resolution.
-
-### `remove-six-compat` (`UP016`) has been removed ([#2332](https://github.com/charliermarsh/ruff/pull/2332))
-
-The `remove-six-compat` rule has been removed. This rule was only useful for one-time Python 2-to-3
-upgrades.
-
-## 0.0.238
-
-### `--explain`, `--clean`, and `--generate-shell-completion` are now subcommands ([#2190](https://github.com/charliermarsh/ruff/pull/2190))
-
-`--explain`, `--clean`, and `--generate-shell-completion` are now implemented as subcommands:
-
-    ruff .         # Still works! And will always work.
-    ruff check .   # New! Also works.
-
-    ruff --explain E402   # Still works.
-    ruff rule E402        # New! Also works. (And preferred.)
-
-    # Oops! The command has to come first.
-    ruff --format json --explain E402   # No longer works.
-    ruff --explain E402 --format json   # Still works!
-    ruff rule E402   --format json      # Works! (And preferred.)
-
-This change is largely backwards compatible -- most users should experience
-no change in behavior. However, please note the following exceptions:
-
-* Subcommands will now fail when invoked with unsupported arguments, instead
-  of silently ignoring them. For example, the following will now fail:
-
-      ruff --clean --respect-gitignore
-
-  (the `clean` command doesn't support `--respect-gitignore`.)
-
-* The semantics of `ruff <arg>` have changed slightly when `<arg>` is a valid subcommand.
-  For example, prior to this release, running `ruff rule` would run `ruff` over a file or
-  directory called `rule`. Now, `ruff rule` would invoke the `rule` subcommand. This should
-  only impact projects with files or directories named `rule`, `check`, `explain`, `clean`,
-  or `generate-shell-completion`.
-
-* Scripts that invoke ruff should supply `--` before any positional arguments.
-  (The semantics of `ruff -- <arg>` have not changed.)
-
-* `--explain` previously treated `--format grouped` as a synonym for `--format text`.
-  This is no longer supported; instead, use `--format text`.
-
-## 0.0.226
-
-### `misplaced-comparison-constant` (`PLC2201`) was deprecated in favor of `SIM300` ([#1980](https://github.com/charliermarsh/ruff/pull/1980))
-
-These two rules contain (nearly) identical logic. To deduplicate the rule set, we've upgraded
-`SIM300` to handle a few more cases, and deprecated `PLC2201` in favor of `SIM300`.
-
-## 0.0.225
-
-### `@functools.cache` rewrites have been moved to a standalone rule (`UP033`) ([#1938](https://github.com/charliermarsh/ruff/pull/1938))
-
-Previously, `UP011` handled both `@functools.lru_cache()`-to-`@functools.lru_cache` conversions,
-_and_ `@functools.lru_cache(maxsize=None)`-to-`@functools.cache` conversions. The latter has been
-moved out to its own rule (`UP033`). As such, some `# noqa: UP011` comments may need to be updated
-to reflect the change in rule code.
-
-## 0.0.222
-
-### `--max-complexity` has been removed from the CLI ([#1877](https://github.com/charliermarsh/ruff/pull/1877))
-
-The McCabe plugin's `--max-complexity` setting has been removed from the CLI, for consistency with
-the treatment of other, similar settings.
-
-To set the maximum complexity, use the `max-complexity` property in your `pyproject.toml` file,
-like so:
-
-```toml
-[tool.ruff.mccabe]
-max-complexity = 10
-```
-
 ## 0.0.181
 
 ### Files excluded by `.gitignore` are now ignored ([#1234](https://github.com/charliermarsh/ruff/pull/1234))

Cargo.toml

@@ -2,13 +2,11 @@
 members = [
   "flake8_to_ruff",
   "ruff_dev",
-  "ruff_cli",
 ]
-default-members = [".", "ruff_cli"]
 
 [package]
 name = "ruff"
-version = "0.0.239"
+version = "0.0.217"
 authors = ["Charlie Marsh <charlie.r.marsh@gmail.com>"]
 edition = "2021"
 rust-version = "1.65.0"
@@ -21,47 +19,60 @@ license = "MIT"
 [lib]
 name = "ruff"
 crate-type = ["cdylib", "rlib"]
-doctest = false
 
 [dependencies]
+annotate-snippets = { version = "0.9.1", features = ["color"] }
 anyhow = { version = "1.0.66" }
+atty = { version = "0.2.14" }
+bincode = { version = "1.3.3" }
 bitflags = { version = "1.3.2" }
+cachedir = { version = "0.3.0" }
 cfg-if = { version = "1.0.0" }
 chrono = { version = "0.4.21", default-features = false, features = ["clock"] }
 clap = { version = "4.0.1", features = ["derive", "env"] }
+clap_complete_command = { version = "0.4.0" }
 colored = { version = "2.0.0" }
 dirs = { version = "4.0.0" }
 fern = { version = "0.6.1" }
+filetime = { version = "0.2.17" }
 glob = { version = "0.3.0" }
 globset = { version = "0.4.9" }
 ignore = { version = "0.4.18" }
-imperative = { version = "1.0.3" }
 itertools = { version = "0.10.5" }
 libcst = { git = "https://github.com/charliermarsh/LibCST", rev = "f2f0b7a487a8725d161fe8b3ed73a6758b21e177" }
 log = { version = "0.4.17" }
 natord = { version = "1.0.9" }
 nohash-hasher = { version = "0.2.0" }
+notify = { version = "5.0.0" }
 num-bigint = { version = "0.4.3" }
 num-traits = "0.2.15"
 once_cell = { version = "1.16.0" }
 path-absolutize = { version = "3.0.14", features = ["once_cell_cache", "use_unix_paths_on_wasm"] }
+quick-junit = { version = "0.3.2" }
 regex = { version = "1.6.0" }
-ruff_macros = { version = "0.0.239", path = "ruff_macros" }
+ropey = { version = "1.5.0", features = ["cr_lines", "simd"], default-features = false }
+ruff_macros = { version = "0.0.217", path = "ruff_macros" }
 rustc-hash = { version = "1.1.0" }
-rustpython-ast = { features = ["unparse"], git = "https://github.com/RustPython/RustPython.git", rev = "4f38cb68e4a97aeea9eb19673803a0bd5f655383" }
-rustpython-common = { git = "https://github.com/RustPython/RustPython.git", rev = "4f38cb68e4a97aeea9eb19673803a0bd5f655383" }
-rustpython-parser = { features = ["lalrpop"], git = "https://github.com/RustPython/RustPython.git", rev = "4f38cb68e4a97aeea9eb19673803a0bd5f655383" }
+rustpython-ast = { features = ["unparse"], git = "https://github.com/RustPython/RustPython.git", rev = "d532160333ffeb6dbeca2c2728c2391cd1e53b7f" }
+rustpython-common = { git = "https://github.com/RustPython/RustPython.git", rev = "d532160333ffeb6dbeca2c2728c2391cd1e53b7f" }
+rustpython-parser = { features = ["lalrpop"], git = "https://github.com/RustPython/RustPython.git", rev = "d532160333ffeb6dbeca2c2728c2391cd1e53b7f" }
 schemars = { version = "0.8.11" }
 semver = { version = "1.0.16" }
 serde = { version = "1.0.147", features = ["derive"] }
+serde_json = { version = "1.0.87" }
 shellexpand = { version = "3.0.0" }
-smallvec = { version = "1.10.0" }
+similar = { version = "2.2.1" }
 strum = { version = "0.24.1", features = ["strum_macros"] }
 strum_macros = { version = "0.24.3" }
 textwrap = { version = "0.16.0" }
-thiserror = { version = "1.0" }
 titlecase = { version = "2.2.1" }
-toml = { version = "0.6.0" }
+toml_edit = { version = "0.17.1", features = ["easy"] }
+walkdir = { version = "2.3.2" }
+
+[target.'cfg(not(target_family = "wasm"))'.dependencies]
+clearscreen = { version = "2.0.0" }
+rayon = { version = "1.5.3" }
+update-informer = { version = "0.6.0", default-features = false, features = ["pypi"], optional = true }
 
 # https://docs.rs/getrandom/0.2.7/getrandom/#webassembly-support
 # For (future) wasm-pack support
@@ -73,17 +84,20 @@ serde-wasm-bindgen = { version = "0.4" }
 js-sys = { version = "0.3.60" }
 wasm-bindgen = { version = "0.2.83" }
 
-[target.'cfg(not(target_family = "wasm"))'.dependencies]
-is_executable = "1.0.1"
-
 [dev-dependencies]
-insta = { version = "1.19.1", features = ["yaml", "redactions"] }
+insta = { version = "1.19.1", features = ["yaml"] }
 test-case = { version = "2.2.2" }
+ureq = { version = "2.5.0", features = [] }
 wasm-bindgen-test = { version = "0.3.33" }
 
 [target.'cfg(not(target_family = "wasm"))'.dev-dependencies]
+assert_cmd = { version = "2.0.4" }
 criterion = { version = "0.4.0" }
 
+[features]
+default = ["update-informer"]
+update-informer = ["dep:update-informer"]
+
 [profile.release]
 panic = "abort"
 lto = "thin"
@@ -100,3 +114,7 @@ opt-level = 3
 # https://github.com/bytecodealliance/wasm-tools/blob/b5c3d98e40590512a3b12470ef358d5c7b983b15/crates/wasmparser/src/limits.rs#L29
 [profile.dev.package.rustpython-parser]
 opt-level = 1
+
+[[bench]]
+name = "source_code_locator"
+harness = false

benches/source_code_locator.rs

@@ -0,0 +1,18 @@
+use std::fs;
+use std::path::Path;
+
+use criterion::{black_box, criterion_group, criterion_main, Criterion};
+use ropey::Rope;
+
+fn criterion_benchmark(c: &mut Criterion) {
+    let contents = fs::read_to_string(Path::new("resources/test/fixtures/D.py")).unwrap();
+    c.bench_function("rope", |b| {
+        b.iter(|| {
+            let rope = Rope::from_str(black_box(&contents));
+            rope.line_to_char(black_box(4));
+        });
+    });
+}
+
+criterion_group!(benches, criterion_benchmark);
+criterion_main!(benches);

flake8_to_ruff/Cargo.lock

@@ -771,7 +771,7 @@ checksum = "0ce7134b9999ecaf8bcd65542e436736ef32ddca1b3e06094cb6ec5755203b80"
 
 [[package]]
 name = "flake8_to_ruff"
-version = "0.0.239"
+version = "0.0.217"
 dependencies = [
  "anyhow",
  "clap",
@@ -1975,7 +1975,7 @@ dependencies = [
 
 [[package]]
 name = "ruff"
-version = "0.0.239"
+version = "0.0.217"
 dependencies = [
  "anyhow",
  "bincode",

flake8_to_ruff/Cargo.toml

@@ -1,8 +1,11 @@
 [package]
 name = "flake8-to-ruff"
-version = "0.0.239"
+version = "0.0.217-dev.0"
 edition = "2021"
 
+[lib]
+name = "flake8_to_ruff"
+
 [dependencies]
 anyhow = { version = "1.0.66" }
 clap = { version = "4.0.1", features = ["derive"] }
@@ -16,7 +19,7 @@ serde = { version = "1.0.147", features = ["derive"] }
 serde_json = { version = "1.0.87" }
 strum = { version = "0.24.1", features = ["strum_macros"] }
 strum_macros = { version = "0.24.3" }
-toml = { version = "0.6.0" }
+toml_edit = { version = "0.17.1", features = ["easy"] }
 
 [dev-dependencies]
 

flake8_to_ruff/src/black.rs

@@ -0,0 +1,32 @@
+//! Extract Black configuration settings from a pyproject.toml.
+
+use std::path::Path;
+
+use anyhow::Result;
+use ruff::settings::types::PythonVersion;
+use serde::{Deserialize, Serialize};
+
+#[derive(Debug, PartialEq, Eq, Serialize, Deserialize, Default)]
+pub struct Black {
+    #[serde(alias = "line-length", alias = "line_length")]
+    pub line_length: Option<usize>,
+    #[serde(alias = "target-version", alias = "target_version")]
+    pub target_version: Option<Vec<PythonVersion>>,
+}
+
+#[derive(Debug, PartialEq, Eq, Serialize, Deserialize)]
+struct Tools {
+    black: Option<Black>,
+}
+
+#[derive(Debug, PartialEq, Eq, Serialize, Deserialize)]
+struct Pyproject {
+    tool: Option<Tools>,
+}
+
+pub fn parse_black_options<P: AsRef<Path>>(path: P) -> Result<Option<Black>> {
+    let contents = std::fs::read_to_string(path)?;
+    Ok(toml_edit::easy::from_str::<Pyproject>(&contents)?
+        .tool
+        .and_then(|tool| tool.black))
+}

flake8_to_ruff/src/converter.rs

@@ -1,36 +1,28 @@
-use std::collections::{HashMap, HashSet};
+use std::collections::{BTreeSet, HashMap};
 
 use anyhow::Result;
-use itertools::Itertools;
-
-use super::external_config::ExternalConfig;
-use super::plugin::Plugin;
-use super::{parser, plugin};
-use crate::registry::RuleCodePrefix;
-use crate::rule_selector::{prefix_to_selector, RuleSelector};
-use crate::rules::flake8_pytest_style::types::{
+use colored::Colorize;
+use ruff::flake8_pytest_style::types::{
     ParametrizeNameType, ParametrizeValuesRowType, ParametrizeValuesType,
 };
-use crate::rules::flake8_quotes::settings::Quote;
-use crate::rules::flake8_tidy_imports::relative_imports::Strictness;
-use crate::rules::pydocstyle::settings::Convention;
-use crate::rules::{
-    flake8_annotations, flake8_bugbear, flake8_builtins, flake8_errmsg, flake8_pytest_style,
-    flake8_quotes, flake8_tidy_imports, mccabe, pep8_naming, pydocstyle,
+use ruff::flake8_quotes::settings::Quote;
+use ruff::flake8_tidy_imports::settings::Strictness;
+use ruff::pydocstyle::settings::Convention;
+use ruff::registry::RuleCodePrefix;
+use ruff::settings::options::Options;
+use ruff::settings::pyproject::Pyproject;
+use ruff::{
+    flake8_annotations, flake8_bugbear, flake8_errmsg, flake8_pytest_style, flake8_quotes,
+    flake8_tidy_imports, mccabe, pep8_naming, pydocstyle, warn_user,
 };
-use crate::settings::options::Options;
-use crate::settings::pyproject::Pyproject;
-use crate::warn_user;
 
-const DEFAULT_SELECTORS: &[RuleSelector] = &[
-    prefix_to_selector(RuleCodePrefix::F),
-    prefix_to_selector(RuleCodePrefix::E),
-    prefix_to_selector(RuleCodePrefix::W),
-];
+use crate::black::Black;
+use crate::plugin::Plugin;
+use crate::{parser, plugin};
 
 pub fn convert(
     config: &HashMap<String, HashMap<String, Option<String>>>,
-    external_config: &ExternalConfig,
+    black: Option<&Black>,
     plugins: Option<Vec<Plugin>>,
 ) -> Result<Pyproject> {
     // Extract the Flake8 section.
@@ -39,7 +31,7 @@ pub fn convert(
         .expect("Unable to find flake8 section in INI file");
 
     // Extract all referenced rule code prefixes, to power plugin inference.
-    let mut referenced_codes: HashSet<RuleSelector> = HashSet::default();
+    let mut referenced_codes: BTreeSet<RuleCodePrefix> = BTreeSet::default();
     for (key, value) in flake8 {
         if let Some(value) = value {
             match key.as_str() {
@@ -81,15 +73,15 @@ pub fn convert(
         .and_then(|value| {
             value
                 .as_ref()
-                .map(|value| HashSet::from_iter(parser::parse_prefix_codes(value)))
+                .map(|value| BTreeSet::from_iter(parser::parse_prefix_codes(value)))
         })
-        .unwrap_or_else(|| resolve_select(&plugins));
-    let mut ignore: HashSet<RuleSelector> = flake8
+        .unwrap_or_else(|| plugin::resolve_select(&plugins));
+    let mut ignore = flake8
         .get("ignore")
         .and_then(|value| {
             value
                 .as_ref()
-                .map(|value| HashSet::from_iter(parser::parse_prefix_codes(value)))
+                .map(|value| BTreeSet::from_iter(parser::parse_prefix_codes(value)))
         })
         .unwrap_or_default();
 
@@ -97,11 +89,10 @@ pub fn convert(
     let mut options = Options::default();
     let mut flake8_annotations = flake8_annotations::settings::Options::default();
     let mut flake8_bugbear = flake8_bugbear::settings::Options::default();
-    let mut flake8_builtins = flake8_builtins::settings::Options::default();
     let mut flake8_errmsg = flake8_errmsg::settings::Options::default();
     let mut flake8_pytest_style = flake8_pytest_style::settings::Options::default();
     let mut flake8_quotes = flake8_quotes::settings::Options::default();
-    let mut flake8_tidy_imports = flake8_tidy_imports::options::Options::default();
+    let mut flake8_tidy_imports = flake8_tidy_imports::settings::Options::default();
     let mut mccabe = mccabe::settings::Options::default();
     let mut pep8_naming = pep8_naming::settings::Options::default();
     let mut pydocstyle = pydocstyle::settings::Options::default();
@@ -112,7 +103,7 @@ pub fn convert(
                 "builtins" => {
                     options.builtins = Some(parser::parse_strings(value.as_ref()));
                 }
-                "max-line-length" | "max_line_length" => match value.parse::<usize>() {
+                "max-line-length" | "max_line_length" => match value.clone().parse::<usize>() {
                     Ok(line_length) => options.line_length = Some(line_length),
                     Err(e) => {
                         warn_user!("Unable to parse '{key}' property: {e}");
@@ -155,11 +146,6 @@ pub fn convert(
                     flake8_bugbear.extend_immutable_calls =
                         Some(parser::parse_strings(value.as_ref()));
                 }
-                // flake8-builtins
-                "builtins-ignorelist" | "builtins_ignorelist" => {
-                    flake8_builtins.builtins_ignorelist =
-                        Some(parser::parse_strings(value.as_ref()));
-                }
                 // flake8-annotations
                 "suppress-none-returning" | "suppress_none_returning" => {
                     match parser::parse_bool(value.as_ref()) {
@@ -254,7 +240,7 @@ pub fn convert(
                     }
                 },
                 // mccabe
-                "max-complexity" | "max_complexity" => match value.parse::<usize>() {
+                "max-complexity" | "max_complexity" => match value.clone().parse::<usize>() {
                     Ok(max_complexity) => mccabe.max_complexity = Some(max_complexity),
                     Err(e) => {
                         warn_user!("Unable to parse '{key}' property: {e}");
@@ -262,7 +248,7 @@ pub fn convert(
                 },
                 // flake8-errmsg
                 "errmsg-max-string-length" | "errmsg_max_string_length" => {
-                    match value.parse::<usize>() {
+                    match value.clone().parse::<usize>() {
                         Ok(max_string_length) => {
                             flake8_errmsg.max_string_length = Some(max_string_length);
                         }
@@ -284,7 +270,7 @@ pub fn convert(
                     match value.trim() {
                         "csv" => {
                             flake8_pytest_style.parametrize_names_type =
-                                Some(ParametrizeNameType::Csv);
+                                Some(ParametrizeNameType::CSV);
                         }
                         "tuple" => {
                             flake8_pytest_style.parametrize_names_type =
@@ -350,27 +336,14 @@ pub fn convert(
     }
 
     // Deduplicate and sort.
-    options.select = Some(
-        select
-            .into_iter()
-            .sorted_by_key(RuleSelector::short_code)
-            .collect(),
-    );
-    options.ignore = Some(
-        ignore
-            .into_iter()
-            .sorted_by_key(RuleSelector::short_code)
-            .collect(),
-    );
+    options.select = Some(Vec::from_iter(select));
+    options.ignore = Some(Vec::from_iter(ignore));
     if flake8_annotations != flake8_annotations::settings::Options::default() {
         options.flake8_annotations = Some(flake8_annotations);
     }
     if flake8_bugbear != flake8_bugbear::settings::Options::default() {
         options.flake8_bugbear = Some(flake8_bugbear);
     }
-    if flake8_builtins != flake8_builtins::settings::Options::default() {
-        options.flake8_builtins = Some(flake8_builtins);
-    }
     if flake8_errmsg != flake8_errmsg::settings::Options::default() {
         options.flake8_errmsg = Some(flake8_errmsg);
     }
@@ -380,7 +353,7 @@ pub fn convert(
     if flake8_quotes != flake8_quotes::settings::Options::default() {
         options.flake8_quotes = Some(flake8_quotes);
     }
-    if flake8_tidy_imports != flake8_tidy_imports::options::Options::default() {
+    if flake8_tidy_imports != flake8_tidy_imports::settings::Options::default() {
         options.flake8_tidy_imports = Some(flake8_tidy_imports);
     }
     if mccabe != mccabe::settings::Options::default() {
@@ -394,7 +367,7 @@ pub fn convert(
     }
 
     // Extract any settings from the existing `pyproject.toml`.
-    if let Some(black) = &external_config.black {
+    if let Some(black) = black {
         if let Some(line_length) = &black.line_length {
             options.line_length = Some(*line_length);
         }
@@ -406,72 +379,81 @@ pub fn convert(
         }
     }
 
-    if let Some(isort) = &external_config.isort {
-        if let Some(src_paths) = &isort.src_paths {
-            match options.src.as_mut() {
-                Some(src) => {
-                    src.extend(src_paths.clone());
-                }
-                None => {
-                    options.src = Some(src_paths.clone());
-                }
-            }
-        }
-    }
-
     // Create the pyproject.toml.
     Ok(Pyproject::new(options))
 }
 
-/// Resolve the set of enabled `RuleSelector` values for the given
-/// plugins.
-fn resolve_select(plugins: &[Plugin]) -> HashSet<RuleSelector> {
-    let mut select: HashSet<_> = DEFAULT_SELECTORS.iter().cloned().collect();
-    select.extend(plugins.iter().map(Plugin::selector));
-    select
-}
-
 #[cfg(test)]
 mod tests {
     use std::collections::HashMap;
 
     use anyhow::Result;
-    use itertools::Itertools;
+    use ruff::pydocstyle::settings::Convention;
+    use ruff::registry::RuleCodePrefix;
+    use ruff::settings::options::Options;
+    use ruff::settings::pyproject::Pyproject;
+    use ruff::{flake8_quotes, pydocstyle};
 
-    use super::super::plugin::Plugin;
-    use super::convert;
-    use crate::flake8_to_ruff::converter::DEFAULT_SELECTORS;
-    use crate::flake8_to_ruff::ExternalConfig;
-    use crate::registry::RuleCodePrefix;
-    use crate::rule_selector::RuleSelector;
-    use crate::rules::pydocstyle::settings::Convention;
-    use crate::rules::{flake8_quotes, pydocstyle};
-    use crate::settings::options::Options;
-    use crate::settings::pyproject::Pyproject;
-
-    fn default_options(plugins: impl IntoIterator<Item = RuleSelector>) -> Options {
-        Options {
-            ignore: Some(vec![]),
-            select: Some(
-                DEFAULT_SELECTORS
-                    .iter()
-                    .cloned()
-                    .chain(plugins)
-                    .sorted_by_key(RuleSelector::short_code)
-                    .collect(),
-            ),
-            ..Options::default()
-        }
-    }
+    use crate::converter::convert;
+    use crate::plugin::Plugin;
 
     #[test]
     fn it_converts_empty() -> Result<()> {
         let actual = convert(
             &HashMap::from([("flake8".to_string(), HashMap::default())]),
-            &ExternalConfig::default(),
+            None,
             None,
         )?;
-        let expected = Pyproject::new(default_options([]));
+        let expected = Pyproject::new(Options {
+            allowed_confusables: None,
+            builtins: None,
+            cache_dir: None,
+            dummy_variable_rgx: None,
+            exclude: None,
+            extend: None,
+            extend_exclude: None,
+            extend_ignore: None,
+            extend_select: None,
+            external: None,
+            fix: None,
+            fix_only: None,
+            fixable: None,
+            format: None,
+            force_exclude: None,
+            ignore: Some(vec![]),
+            ignore_init_module_imports: None,
+            line_length: None,
+            per_file_ignores: None,
+            required_version: None,
+            respect_gitignore: None,
+            select: Some(vec![
+                RuleCodePrefix::E,
+                RuleCodePrefix::F,
+                RuleCodePrefix::W,
+            ]),
+            show_source: None,
+            src: None,
+            target_version: None,
+            unfixable: None,
+            typing_modules: None,
+            task_tags: None,
+            update_check: None,
+            flake8_annotations: None,
+            flake8_bandit: None,
+            flake8_bugbear: None,
+            flake8_errmsg: None,
+            flake8_pytest_style: None,
+            flake8_quotes: None,
+            flake8_tidy_imports: None,
+            flake8_import_conventions: None,
+            flake8_unused_arguments: None,
+            isort: None,
+            mccabe: None,
+            pep8_naming: None,
+            pycodestyle: None,
+            pydocstyle: None,
+            pyupgrade: None,
+        });
         assert_eq!(actual, expected);
 
         Ok(())
@@ -484,12 +466,58 @@ mod tests {
                 "flake8".to_string(),
                 HashMap::from([("max-line-length".to_string(), Some("100".to_string()))]),
             )]),
-            &ExternalConfig::default(),
+            None,
             Some(vec![]),
         )?;
         let expected = Pyproject::new(Options {
+            allowed_confusables: None,
+            builtins: None,
+            cache_dir: None,
+            dummy_variable_rgx: None,
+            exclude: None,
+            extend: None,
+            extend_exclude: None,
+            extend_ignore: None,
+            extend_select: None,
+            external: None,
+            fix: None,
+            fix_only: None,
+            fixable: None,
+            format: None,
+            force_exclude: None,
+            ignore: Some(vec![]),
+            ignore_init_module_imports: None,
             line_length: Some(100),
-            ..default_options([])
+            per_file_ignores: None,
+            required_version: None,
+            respect_gitignore: None,
+            select: Some(vec![
+                RuleCodePrefix::E,
+                RuleCodePrefix::F,
+                RuleCodePrefix::W,
+            ]),
+            show_source: None,
+            src: None,
+            target_version: None,
+            unfixable: None,
+            typing_modules: None,
+            task_tags: None,
+            update_check: None,
+            flake8_annotations: None,
+            flake8_bandit: None,
+            flake8_bugbear: None,
+            flake8_errmsg: None,
+            flake8_pytest_style: None,
+            flake8_quotes: None,
+            flake8_tidy_imports: None,
+            flake8_import_conventions: None,
+            flake8_unused_arguments: None,
+            isort: None,
+            mccabe: None,
+            pep8_naming: None,
+            pycodestyle: None,
+            pydocstyle: None,
+            pyupgrade: None,
         });
         assert_eq!(actual, expected);
 
@@ -503,12 +531,58 @@ mod tests {
                 "flake8".to_string(),
                 HashMap::from([("max_line_length".to_string(), Some("100".to_string()))]),
             )]),
-            &ExternalConfig::default(),
+            None,
             Some(vec![]),
         )?;
         let expected = Pyproject::new(Options {
+            allowed_confusables: None,
+            builtins: None,
+            cache_dir: None,
+            dummy_variable_rgx: None,
+            exclude: None,
+            extend: None,
+            extend_exclude: None,
+            extend_ignore: None,
+            extend_select: None,
+            external: None,
+            fix: None,
+            fix_only: None,
+            fixable: None,
+            format: None,
+            force_exclude: None,
+            ignore: Some(vec![]),
+            ignore_init_module_imports: None,
             line_length: Some(100),
-            ..default_options([])
+            per_file_ignores: None,
+            required_version: None,
+            respect_gitignore: None,
+            select: Some(vec![
+                RuleCodePrefix::E,
+                RuleCodePrefix::F,
+                RuleCodePrefix::W,
+            ]),
+            show_source: None,
+            src: None,
+            target_version: None,
+            unfixable: None,
+            typing_modules: None,
+            task_tags: None,
+            update_check: None,
+            flake8_annotations: None,
+            flake8_bandit: None,
+            flake8_bugbear: None,
+            flake8_errmsg: None,
+            flake8_pytest_style: None,
+            flake8_quotes: None,
+            flake8_tidy_imports: None,
+            flake8_import_conventions: None,
+            flake8_unused_arguments: None,
+            isort: None,
+            mccabe: None,
+            pep8_naming: None,
+            pycodestyle: None,
+            pydocstyle: None,
+            pyupgrade: None,
         });
         assert_eq!(actual, expected);
 
@@ -522,10 +596,59 @@ mod tests {
                 "flake8".to_string(),
                 HashMap::from([("max_line_length".to_string(), Some("abc".to_string()))]),
             )]),
-            &ExternalConfig::default(),
+            None,
             Some(vec![]),
         )?;
-        let expected = Pyproject::new(default_options([]));
+        let expected = Pyproject::new(Options {
+            allowed_confusables: None,
+            builtins: None,
+            cache_dir: None,
+            dummy_variable_rgx: None,
+            exclude: None,
+            extend: None,
+            extend_exclude: None,
+            extend_ignore: None,
+            extend_select: None,
+            external: None,
+            fix: None,
+            fix_only: None,
+            fixable: None,
+            format: None,
+            force_exclude: None,
+            ignore: Some(vec![]),
+            ignore_init_module_imports: None,
+            line_length: None,
+            per_file_ignores: None,
+            required_version: None,
+            respect_gitignore: None,
+            select: Some(vec![
+                RuleCodePrefix::E,
+                RuleCodePrefix::F,
+                RuleCodePrefix::W,
+            ]),
+            show_source: None,
+            src: None,
+            target_version: None,
+            unfixable: None,
+            typing_modules: None,
+            task_tags: None,
+            update_check: None,
+            flake8_annotations: None,
+            flake8_bandit: None,
+            flake8_bugbear: None,
+            flake8_errmsg: None,
+            flake8_pytest_style: None,
+            flake8_quotes: None,
+            flake8_tidy_imports: None,
+            flake8_import_conventions: None,
+            flake8_unused_arguments: None,
+            isort: None,
+            mccabe: None,
+            pep8_naming: None,
+            pycodestyle: None,
+            pydocstyle: None,
+            pyupgrade: None,
+        });
         assert_eq!(actual, expected);
 
         Ok(())
@@ -538,17 +661,63 @@ mod tests {
                 "flake8".to_string(),
                 HashMap::from([("inline-quotes".to_string(), Some("single".to_string()))]),
             )]),
-            &ExternalConfig::default(),
+            None,
             Some(vec![]),
         )?;
         let expected = Pyproject::new(Options {
+            allowed_confusables: None,
+            builtins: None,
+            cache_dir: None,
+            dummy_variable_rgx: None,
+            exclude: None,
+            extend: None,
+            extend_exclude: None,
+            extend_ignore: None,
+            extend_select: None,
+            external: None,
+            fix: None,
+            fix_only: None,
+            fixable: None,
+            format: None,
+            force_exclude: None,
+            ignore: Some(vec![]),
+            ignore_init_module_imports: None,
+            line_length: None,
+            per_file_ignores: None,
+            required_version: None,
+            respect_gitignore: None,
+            select: Some(vec![
+                RuleCodePrefix::E,
+                RuleCodePrefix::F,
+                RuleCodePrefix::W,
+            ]),
+            show_source: None,
+            src: None,
+            target_version: None,
+            unfixable: None,
+            typing_modules: None,
+            task_tags: None,
+            update_check: None,
+            flake8_annotations: None,
+            flake8_bandit: None,
+            flake8_bugbear: None,
+            flake8_errmsg: None,
+            flake8_pytest_style: None,
             flake8_quotes: Some(flake8_quotes::settings::Options {
                 inline_quotes: Some(flake8_quotes::settings::Quote::Single),
                 multiline_quotes: None,
                 docstring_quotes: None,
                 avoid_escape: None,
             }),
-            ..default_options([])
+            flake8_tidy_imports: None,
+            flake8_import_conventions: None,
+            flake8_unused_arguments: None,
+            isort: None,
+            mccabe: None,
+            pep8_naming: None,
+            pycodestyle: None,
+            pydocstyle: None,
+            pyupgrade: None,
         });
         assert_eq!(actual, expected);
 
@@ -565,14 +734,61 @@ mod tests {
                     Some("numpy".to_string()),
                 )]),
             )]),
-            &ExternalConfig::default(),
+            None,
             Some(vec![Plugin::Flake8Docstrings]),
         )?;
         let expected = Pyproject::new(Options {
+            allowed_confusables: None,
+            builtins: None,
+            cache_dir: None,
+            dummy_variable_rgx: None,
+            exclude: None,
+            extend: None,
+            extend_exclude: None,
+            extend_ignore: None,
+            extend_select: None,
+            external: None,
+            fix: None,
+            fix_only: None,
+            fixable: None,
+            format: None,
+            force_exclude: None,
+            ignore: Some(vec![]),
+            ignore_init_module_imports: None,
+            line_length: None,
+            per_file_ignores: None,
+            required_version: None,
+            respect_gitignore: None,
+            select: Some(vec![
+                RuleCodePrefix::D,
+                RuleCodePrefix::E,
+                RuleCodePrefix::F,
+                RuleCodePrefix::W,
+            ]),
+            show_source: None,
+            src: None,
+            target_version: None,
+            unfixable: None,
+            typing_modules: None,
+            task_tags: None,
+            update_check: None,
+            flake8_annotations: None,
+            flake8_bandit: None,
+            flake8_bugbear: None,
+            flake8_errmsg: None,
+            flake8_pytest_style: None,
+            flake8_quotes: None,
+            flake8_tidy_imports: None,
+            flake8_import_conventions: None,
+            flake8_unused_arguments: None,
+            isort: None,
+            mccabe: None,
+            pep8_naming: None,
+            pycodestyle: None,
             pydocstyle: Some(pydocstyle::settings::Options {
                 convention: Some(Convention::Numpy),
             }),
-            ..default_options([RuleCodePrefix::D.into()])
+            pyupgrade: None,
         });
         assert_eq!(actual, expected);
 
@@ -586,17 +802,64 @@ mod tests {
                 "flake8".to_string(),
                 HashMap::from([("inline-quotes".to_string(), Some("single".to_string()))]),
             )]),
-            &ExternalConfig::default(),
+            None,
             None,
         )?;
         let expected = Pyproject::new(Options {
+            allowed_confusables: None,
+            builtins: None,
+            cache_dir: None,
+            dummy_variable_rgx: None,
+            exclude: None,
+            extend: None,
+            extend_exclude: None,
+            extend_ignore: None,
+            extend_select: None,
+            external: None,
+            fix: None,
+            fix_only: None,
+            fixable: None,
+            format: None,
+            force_exclude: None,
+            ignore: Some(vec![]),
+            ignore_init_module_imports: None,
+            line_length: None,
+            per_file_ignores: None,
+            required_version: None,
+            respect_gitignore: None,
+            select: Some(vec![
+                RuleCodePrefix::E,
+                RuleCodePrefix::F,
+                RuleCodePrefix::Q,
+                RuleCodePrefix::W,
+            ]),
+            show_source: None,
+            src: None,
+            target_version: None,
+            unfixable: None,
+            typing_modules: None,
+            task_tags: None,
+            update_check: None,
+            flake8_annotations: None,
+            flake8_bandit: None,
+            flake8_bugbear: None,
+            flake8_errmsg: None,
+            flake8_pytest_style: None,
             flake8_quotes: Some(flake8_quotes::settings::Options {
                 inline_quotes: Some(flake8_quotes::settings::Quote::Single),
                 multiline_quotes: None,
                 docstring_quotes: None,
                 avoid_escape: None,
             }),
-            ..default_options([RuleCodePrefix::Q.into()])
+            flake8_tidy_imports: None,
+            flake8_import_conventions: None,
+            flake8_unused_arguments: None,
+            isort: None,
+            mccabe: None,
+            pep8_naming: None,
+            pycodestyle: None,
+            pydocstyle: None,
+            pyupgrade: None,
         });
         assert_eq!(actual, expected);
 

flake8_to_ruff/src/lib.rs

@@ -0,0 +1,18 @@
+#![allow(
+    clippy::collapsible_else_if,
+    clippy::collapsible_if,
+    clippy::implicit_hasher,
+    clippy::match_same_arms,
+    clippy::missing_errors_doc,
+    clippy::missing_panics_doc,
+    clippy::module_name_repetitions,
+    clippy::must_use_candidate,
+    clippy::similar_names,
+    clippy::too_many_lines
+)]
+#![forbid(unsafe_code)]
+
+pub mod black;
+pub mod converter;
+mod parser;
+pub mod plugin;

flake8_to_ruff/src/main.rs

@@ -1,6 +1,4 @@
-//! Utility to generate Ruff's `pyproject.toml` section from a Flake8 INI file.
-#![forbid(unsafe_code)]
-#![warn(clippy::pedantic)]
+//! Utility to generate Ruff's pyproject.toml section from a Flake8 INI file.
 #![allow(
     clippy::collapsible_else_if,
     clippy::collapsible_if,
@@ -13,20 +11,23 @@
     clippy::similar_names,
     clippy::too_many_lines
 )]
+#![forbid(unsafe_code)]
 
 use std::path::PathBuf;
 
 use anyhow::Result;
 use clap::Parser;
 use configparser::ini::Ini;
-use ruff::flake8_to_ruff::{self, ExternalConfig};
+use flake8_to_ruff::black::parse_black_options;
+use flake8_to_ruff::converter;
+use flake8_to_ruff::plugin::Plugin;
 
 #[derive(Parser)]
 #[command(
     about = "Convert existing Flake8 configuration to Ruff.",
     long_about = None
 )]
-struct Args {
+struct Cli {
     /// Path to the Flake8 configuration file (e.g., `setup.cfg`, `tox.ini`, or
     /// `.flake8`).
     #[arg(required = true)]
@@ -37,31 +38,27 @@ struct Args {
     pyproject: Option<PathBuf>,
     /// List of plugins to enable.
     #[arg(long, value_delimiter = ',')]
-    plugin: Option<Vec<flake8_to_ruff::Plugin>>,
+    plugin: Option<Vec<Plugin>>,
 }
 
 fn main() -> Result<()> {
-    let args = Args::parse();
+    let cli = Cli::parse();
 
     // Read the INI file.
     let mut ini = Ini::new_cs();
     ini.set_multiline(true);
-    let config = ini.load(args.file).map_err(|msg| anyhow::anyhow!(msg))?;
+    let config = ini.load(cli.file).map_err(|msg| anyhow::anyhow!(msg))?;
 
     // Read the pyproject.toml file.
-    let pyproject = args.pyproject.map(flake8_to_ruff::parse).transpose()?;
-    let external_config = pyproject
-        .as_ref()
-        .and_then(|pyproject| pyproject.tool.as_ref())
-        .map(|tool| ExternalConfig {
-            black: tool.black.as_ref(),
-            isort: tool.isort.as_ref(),
-        })
-        .unwrap_or_default();
+    let black = cli
+        .pyproject
+        .map(parse_black_options)
+        .transpose()?
+        .flatten();
 
     // Create Ruff's pyproject.toml section.
-    let pyproject = flake8_to_ruff::convert(&config, &external_config, args.plugin)?;
-    println!("{}", toml::to_string_pretty(&pyproject)?);
+    let pyproject = converter::convert(&config, black.as_ref(), cli.plugin)?;
+    println!("{}", toml_edit::easy::to_string_pretty(&pyproject)?);
 
     Ok(())
 }

flake8_to_ruff/src/parser.rs

@@ -1,26 +1,28 @@
 use std::str::FromStr;
 
 use anyhow::{bail, Result};
+use colored::Colorize;
 use once_cell::sync::Lazy;
 use regex::Regex;
+use ruff::registry::{RuleCodePrefix, PREFIX_REDIRECTS};
+use ruff::settings::types::PatternPrefixPair;
+use ruff::warn_user;
 use rustc_hash::FxHashMap;
 
-use crate::rule_selector::RuleSelector;
-use crate::settings::types::PatternPrefixPair;
-use crate::warn_user;
-
 static COMMA_SEPARATED_LIST_RE: Lazy<Regex> = Lazy::new(|| Regex::new(r"[,\s]").unwrap());
 
-/// Parse a comma-separated list of `RuleSelector` values (e.g.,
+/// Parse a comma-separated list of `RuleCodePrefix` values (e.g.,
 /// "F401,E501").
-pub fn parse_prefix_codes(value: &str) -> Vec<RuleSelector> {
-    let mut codes: Vec<RuleSelector> = vec![];
+pub fn parse_prefix_codes(value: &str) -> Vec<RuleCodePrefix> {
+    let mut codes: Vec<RuleCodePrefix> = vec![];
     for code in COMMA_SEPARATED_LIST_RE.split(value) {
         let code = code.trim();
         if code.is_empty() {
             continue;
         }
-        if let Ok(code) = RuleSelector::from_str(code) {
+        if let Some(code) = PREFIX_REDIRECTS.get(code) {
+            codes.push(code.clone());
+        } else if let Ok(code) = RuleCodePrefix::from_str(code) {
             codes.push(code);
         } else {
             warn_user!("Unsupported prefix code: {code}");
@@ -86,7 +88,14 @@ impl State {
     fn parse(&self) -> Vec<PatternPrefixPair> {
         let mut codes: Vec<PatternPrefixPair> = vec![];
         for code in &self.codes {
-            if let Ok(code) = RuleSelector::from_str(code) {
+            if let Some(code) = PREFIX_REDIRECTS.get(code.as_str()) {
+                for filename in &self.filenames {
+                    codes.push(PatternPrefixPair {
+                        pattern: filename.clone(),
+                        prefix: code.clone(),
+                    });
+                }
+            } else if let Ok(code) = RuleCodePrefix::from_str(code) {
                 for filename in &self.filenames {
                     codes.push(PatternPrefixPair {
                         pattern: filename.clone(),
@@ -180,8 +189,8 @@ pub fn parse_files_to_codes_mapping(value: &str) -> Result<Vec<PatternPrefixPair
 /// Collect a list of `PatternPrefixPair` structs as a `BTreeMap`.
 pub fn collect_per_file_ignores(
     pairs: Vec<PatternPrefixPair>,
-) -> FxHashMap<String, Vec<RuleSelector>> {
-    let mut per_file_ignores: FxHashMap<String, Vec<RuleSelector>> = FxHashMap::default();
+) -> FxHashMap<String, Vec<RuleCodePrefix>> {
+    let mut per_file_ignores: FxHashMap<String, Vec<RuleCodePrefix>> = FxHashMap::default();
     for pair in pairs {
         per_file_ignores
             .entry(pair.pattern)
@@ -194,36 +203,35 @@ pub fn collect_per_file_ignores(
 #[cfg(test)]
 mod tests {
     use anyhow::Result;
+    use ruff::registry::RuleCodePrefix;
+    use ruff::settings::types::PatternPrefixPair;
 
-    use super::{parse_files_to_codes_mapping, parse_prefix_codes, parse_strings};
-    use crate::registry::RuleCodePrefix;
-    use crate::rule_selector::RuleSelector;
-    use crate::settings::types::PatternPrefixPair;
+    use crate::parser::{parse_files_to_codes_mapping, parse_prefix_codes, parse_strings};
 
     #[test]
     fn it_parses_prefix_codes() {
         let actual = parse_prefix_codes("");
-        let expected: Vec<RuleSelector> = vec![];
+        let expected: Vec<RuleCodePrefix> = vec![];
         assert_eq!(actual, expected);
 
         let actual = parse_prefix_codes(" ");
-        let expected: Vec<RuleSelector> = vec![];
+        let expected: Vec<RuleCodePrefix> = vec![];
         assert_eq!(actual, expected);
 
         let actual = parse_prefix_codes("F401");
-        let expected = vec![RuleCodePrefix::F401.into()];
+        let expected = vec![RuleCodePrefix::F401];
         assert_eq!(actual, expected);
 
         let actual = parse_prefix_codes("F401,");
-        let expected = vec![RuleCodePrefix::F401.into()];
+        let expected = vec![RuleCodePrefix::F401];
         assert_eq!(actual, expected);
 
         let actual = parse_prefix_codes("F401,E501");
-        let expected = vec![RuleCodePrefix::F401.into(), RuleCodePrefix::E501.into()];
+        let expected = vec![RuleCodePrefix::F401, RuleCodePrefix::E501];
         assert_eq!(actual, expected);
 
         let actual = parse_prefix_codes("F401, E501");
-        let expected = vec![RuleCodePrefix::F401.into(), RuleCodePrefix::E501.into()];
+        let expected = vec![RuleCodePrefix::F401, RuleCodePrefix::E501];
         assert_eq!(actual, expected);
     }
 
@@ -276,11 +284,11 @@ mod tests {
         let expected: Vec<PatternPrefixPair> = vec![
             PatternPrefixPair {
                 pattern: "locust/test/*".to_string(),
-                prefix: RuleCodePrefix::F841.into(),
+                prefix: RuleCodePrefix::F841,
             },
             PatternPrefixPair {
                 pattern: "examples/*".to_string(),
-                prefix: RuleCodePrefix::F841.into(),
+                prefix: RuleCodePrefix::F841,
             },
         ];
         assert_eq!(actual, expected);
@@ -296,23 +304,23 @@ mod tests {
         let expected: Vec<PatternPrefixPair> = vec![
             PatternPrefixPair {
                 pattern: "t/*".to_string(),
-                prefix: RuleCodePrefix::D.into(),
+                prefix: RuleCodePrefix::D,
             },
             PatternPrefixPair {
                 pattern: "setup.py".to_string(),
-                prefix: RuleCodePrefix::D.into(),
+                prefix: RuleCodePrefix::D,
             },
             PatternPrefixPair {
                 pattern: "examples/*".to_string(),
-                prefix: RuleCodePrefix::D.into(),
+                prefix: RuleCodePrefix::D,
             },
             PatternPrefixPair {
                 pattern: "docs/*".to_string(),
-                prefix: RuleCodePrefix::D.into(),
+                prefix: RuleCodePrefix::D,
             },
             PatternPrefixPair {
                 pattern: "extra/*".to_string(),
-                prefix: RuleCodePrefix::D.into(),
+                prefix: RuleCodePrefix::D,
             },
         ];
         assert_eq!(actual, expected);
@@ -334,47 +342,47 @@ mod tests {
         let expected: Vec<PatternPrefixPair> = vec![
             PatternPrefixPair {
                 pattern: "scrapy/__init__.py".to_string(),
-                prefix: RuleCodePrefix::E402.into(),
+                prefix: RuleCodePrefix::E402,
             },
             PatternPrefixPair {
                 pattern: "scrapy/core/downloader/handlers/http.py".to_string(),
-                prefix: RuleCodePrefix::F401.into(),
+                prefix: RuleCodePrefix::F401,
             },
             PatternPrefixPair {
                 pattern: "scrapy/http/__init__.py".to_string(),
-                prefix: RuleCodePrefix::F401.into(),
+                prefix: RuleCodePrefix::F401,
             },
             PatternPrefixPair {
                 pattern: "scrapy/linkextractors/__init__.py".to_string(),
-                prefix: RuleCodePrefix::E402.into(),
+                prefix: RuleCodePrefix::E402,
             },
             PatternPrefixPair {
                 pattern: "scrapy/linkextractors/__init__.py".to_string(),
-                prefix: RuleCodePrefix::F401.into(),
+                prefix: RuleCodePrefix::F401,
             },
             PatternPrefixPair {
                 pattern: "scrapy/selector/__init__.py".to_string(),
-                prefix: RuleCodePrefix::F401.into(),
+                prefix: RuleCodePrefix::F401,
             },
             PatternPrefixPair {
                 pattern: "scrapy/spiders/__init__.py".to_string(),
-                prefix: RuleCodePrefix::E402.into(),
+                prefix: RuleCodePrefix::E402,
             },
             PatternPrefixPair {
                 pattern: "scrapy/spiders/__init__.py".to_string(),
-                prefix: RuleCodePrefix::F401.into(),
+                prefix: RuleCodePrefix::F401,
             },
             PatternPrefixPair {
                 pattern: "scrapy/utils/url.py".to_string(),
-                prefix: RuleCodePrefix::F403.into(),
+                prefix: RuleCodePrefix::F403,
             },
             PatternPrefixPair {
                 pattern: "scrapy/utils/url.py".to_string(),
-                prefix: RuleCodePrefix::F405.into(),
+                prefix: RuleCodePrefix::F405,
             },
             PatternPrefixPair {
                 pattern: "tests/test_loader.py".to_string(),
-                prefix: RuleCodePrefix::E741.into(),
+                prefix: RuleCodePrefix::E741,
             },
         ];
         assert_eq!(actual, expected);

flake8_to_ruff/src/plugin.rs

@@ -1,47 +1,34 @@
-use std::collections::{BTreeSet, HashMap, HashSet};
+use std::collections::{BTreeSet, HashMap};
 use std::fmt;
 use std::str::FromStr;
 
 use anyhow::anyhow;
-
-use crate::registry::RuleCodePrefix;
-use crate::rule_selector::RuleSelector;
+use ruff::registry::RuleCodePrefix;
 
 #[derive(Clone, Ord, PartialOrd, Eq, PartialEq)]
 pub enum Plugin {
-    Flake82020,
     Flake8Annotations,
     Flake8Bandit,
     Flake8BlindExcept,
-    Flake8BooleanTrap,
     Flake8Bugbear,
     Flake8Builtins,
-    Flake8Commas,
     Flake8Comprehensions,
     Flake8Datetimez,
     Flake8Debugger,
     Flake8Docstrings,
     Flake8Eradicate,
     Flake8ErrMsg,
-    Flake8Executable,
     Flake8ImplicitStrConcat,
-    Flake8ImportConventions,
-    Flake8NoPep420,
-    Flake8Pie,
     Flake8Print,
     Flake8PytestStyle,
     Flake8Quotes,
     Flake8Return,
     Flake8Simplify,
     Flake8TidyImports,
-    Flake8TypeChecking,
-    Flake8UnusedArguments,
-    Flake8UsePathlib,
     McCabe,
     PEP8Naming,
     PandasVet,
     Pyupgrade,
-    Tryceratops,
 }
 
 impl FromStr for Plugin {
@@ -49,39 +36,28 @@ impl FromStr for Plugin {
 
     fn from_str(string: &str) -> Result<Self, Self::Err> {
         match string {
-            "flake8-2020" => Ok(Plugin::Flake82020),
             "flake8-annotations" => Ok(Plugin::Flake8Annotations),
             "flake8-bandit" => Ok(Plugin::Flake8Bandit),
             "flake8-blind-except" => Ok(Plugin::Flake8BlindExcept),
-            "flake8-boolean-trap" => Ok(Plugin::Flake8BooleanTrap),
             "flake8-bugbear" => Ok(Plugin::Flake8Bugbear),
             "flake8-builtins" => Ok(Plugin::Flake8Builtins),
-            "flake8-commas" => Ok(Plugin::Flake8Commas),
             "flake8-comprehensions" => Ok(Plugin::Flake8Comprehensions),
             "flake8-datetimez" => Ok(Plugin::Flake8Datetimez),
             "flake8-debugger" => Ok(Plugin::Flake8Debugger),
             "flake8-docstrings" => Ok(Plugin::Flake8Docstrings),
             "flake8-eradicate" => Ok(Plugin::Flake8Eradicate),
             "flake8-errmsg" => Ok(Plugin::Flake8ErrMsg),
-            "flake8-executable" => Ok(Plugin::Flake8Executable),
             "flake8-implicit-str-concat" => Ok(Plugin::Flake8ImplicitStrConcat),
-            "flake8-import-conventions" => Ok(Plugin::Flake8ImportConventions),
-            "flake8-no-pep420" => Ok(Plugin::Flake8NoPep420),
-            "flake8-pie" => Ok(Plugin::Flake8Pie),
             "flake8-print" => Ok(Plugin::Flake8Print),
             "flake8-pytest-style" => Ok(Plugin::Flake8PytestStyle),
             "flake8-quotes" => Ok(Plugin::Flake8Quotes),
             "flake8-return" => Ok(Plugin::Flake8Return),
             "flake8-simplify" => Ok(Plugin::Flake8Simplify),
             "flake8-tidy-imports" => Ok(Plugin::Flake8TidyImports),
-            "flake8-type-checking" => Ok(Plugin::Flake8TypeChecking),
-            "flake8-unused-arguments" => Ok(Plugin::Flake8UnusedArguments),
-            "flake8-use-pathlib" => Ok(Plugin::Flake8UsePathlib),
             "mccabe" => Ok(Plugin::McCabe),
-            "pep8-naming" => Ok(Plugin::PEP8Naming),
             "pandas-vet" => Ok(Plugin::PandasVet),
+            "pep8-naming" => Ok(Plugin::PEP8Naming),
             "pyupgrade" => Ok(Plugin::Pyupgrade),
-            "tryceratops" => Ok(Plugin::Tryceratops),
             _ => Err(anyhow!("Unknown plugin: {string}")),
         }
     }
@@ -93,81 +69,60 @@ impl fmt::Debug for Plugin {
             f,
             "{}",
             match self {
-                Plugin::Flake82020 => "flake8-2020",
                 Plugin::Flake8Annotations => "flake8-annotations",
                 Plugin::Flake8Bandit => "flake8-bandit",
                 Plugin::Flake8BlindExcept => "flake8-blind-except",
-                Plugin::Flake8BooleanTrap => "flake8-boolean-trap",
                 Plugin::Flake8Bugbear => "flake8-bugbear",
                 Plugin::Flake8Builtins => "flake8-builtins",
-                Plugin::Flake8Commas => "flake8-commas",
                 Plugin::Flake8Comprehensions => "flake8-comprehensions",
                 Plugin::Flake8Datetimez => "flake8-datetimez",
                 Plugin::Flake8Debugger => "flake8-debugger",
                 Plugin::Flake8Docstrings => "flake8-docstrings",
                 Plugin::Flake8Eradicate => "flake8-eradicate",
                 Plugin::Flake8ErrMsg => "flake8-errmsg",
-                Plugin::Flake8Executable => "flake8-executable",
                 Plugin::Flake8ImplicitStrConcat => "flake8-implicit-str-concat",
-                Plugin::Flake8ImportConventions => "flake8-import-conventions",
-                Plugin::Flake8NoPep420 => "flake8-no-pep420",
-                Plugin::Flake8Pie => "flake8-pie",
                 Plugin::Flake8Print => "flake8-print",
                 Plugin::Flake8PytestStyle => "flake8-pytest-style",
                 Plugin::Flake8Quotes => "flake8-quotes",
                 Plugin::Flake8Return => "flake8-return",
                 Plugin::Flake8Simplify => "flake8-simplify",
                 Plugin::Flake8TidyImports => "flake8-tidy-imports",
-                Plugin::Flake8TypeChecking => "flake8-type-checking",
-                Plugin::Flake8UnusedArguments => "flake8-unused-arguments",
-                Plugin::Flake8UsePathlib => "flake8-use-pathlib",
                 Plugin::McCabe => "mccabe",
                 Plugin::PEP8Naming => "pep8-naming",
                 Plugin::PandasVet => "pandas-vet",
                 Plugin::Pyupgrade => "pyupgrade",
-                Plugin::Tryceratops => "tryceratops",
             }
         )
     }
 }
 
-// TODO(martin): Convert into `impl From<Plugin> for Linter`
 impl Plugin {
-    pub fn selector(&self) -> RuleSelector {
+    pub fn prefix(&self) -> RuleCodePrefix {
         match self {
-            Plugin::Flake82020 => RuleCodePrefix::YTT.into(),
-            Plugin::Flake8Annotations => RuleCodePrefix::ANN.into(),
-            Plugin::Flake8Bandit => RuleCodePrefix::S.into(),
-            Plugin::Flake8BlindExcept => RuleCodePrefix::BLE.into(),
-            Plugin::Flake8BooleanTrap => RuleCodePrefix::FBT.into(),
-            Plugin::Flake8Bugbear => RuleCodePrefix::B.into(),
-            Plugin::Flake8Builtins => RuleCodePrefix::A.into(),
-            Plugin::Flake8Commas => RuleCodePrefix::COM.into(),
-            Plugin::Flake8Comprehensions => RuleCodePrefix::C4.into(),
-            Plugin::Flake8Datetimez => RuleCodePrefix::DTZ.into(),
-            Plugin::Flake8Debugger => RuleCodePrefix::T1.into(),
-            Plugin::Flake8Docstrings => RuleCodePrefix::D.into(),
-            Plugin::Flake8Eradicate => RuleCodePrefix::ERA.into(),
-            Plugin::Flake8ErrMsg => RuleCodePrefix::EM.into(),
-            Plugin::Flake8Executable => RuleCodePrefix::EXE.into(),
-            Plugin::Flake8ImplicitStrConcat => RuleCodePrefix::ISC.into(),
-            Plugin::Flake8ImportConventions => RuleCodePrefix::ICN.into(),
-            Plugin::Flake8NoPep420 => RuleCodePrefix::INP.into(),
-            Plugin::Flake8Pie => RuleCodePrefix::PIE.into(),
-            Plugin::Flake8Print => RuleCodePrefix::T2.into(),
-            Plugin::Flake8PytestStyle => RuleCodePrefix::PT.into(),
-            Plugin::Flake8Quotes => RuleCodePrefix::Q.into(),
-            Plugin::Flake8Return => RuleCodePrefix::RET.into(),
-            Plugin::Flake8Simplify => RuleCodePrefix::SIM.into(),
-            Plugin::Flake8TidyImports => RuleCodePrefix::TID.into(),
-            Plugin::Flake8TypeChecking => RuleCodePrefix::TCH.into(),
-            Plugin::Flake8UnusedArguments => RuleCodePrefix::ARG.into(),
-            Plugin::Flake8UsePathlib => RuleCodePrefix::PTH.into(),
-            Plugin::McCabe => RuleCodePrefix::C9.into(),
-            Plugin::PEP8Naming => RuleCodePrefix::N.into(),
-            Plugin::PandasVet => RuleCodePrefix::PD.into(),
-            Plugin::Pyupgrade => RuleCodePrefix::UP.into(),
-            Plugin::Tryceratops => RuleCodePrefix::TRY.into(),
+            Plugin::Flake8Annotations => RuleCodePrefix::ANN,
+            Plugin::Flake8Bandit => RuleCodePrefix::S,
+            // TODO(charlie): Handle rename of `B` to `BLE`.
+            Plugin::Flake8BlindExcept => RuleCodePrefix::BLE,
+            Plugin::Flake8Bugbear => RuleCodePrefix::B,
+            Plugin::Flake8Builtins => RuleCodePrefix::A,
+            Plugin::Flake8Comprehensions => RuleCodePrefix::C4,
+            Plugin::Flake8Datetimez => RuleCodePrefix::DTZ,
+            Plugin::Flake8Debugger => RuleCodePrefix::T1,
+            Plugin::Flake8Docstrings => RuleCodePrefix::D,
+            // TODO(charlie): Handle rename of `E` to `ERA`.
+            Plugin::Flake8Eradicate => RuleCodePrefix::ERA,
+            Plugin::Flake8ErrMsg => RuleCodePrefix::EM,
+            Plugin::Flake8ImplicitStrConcat => RuleCodePrefix::ISC,
+            Plugin::Flake8Print => RuleCodePrefix::T2,
+            Plugin::Flake8PytestStyle => RuleCodePrefix::PT,
+            Plugin::Flake8Quotes => RuleCodePrefix::Q,
+            Plugin::Flake8Return => RuleCodePrefix::RET,
+            Plugin::Flake8Simplify => RuleCodePrefix::SIM,
+            Plugin::Flake8TidyImports => RuleCodePrefix::TID25,
+            Plugin::McCabe => RuleCodePrefix::C9,
+            Plugin::PandasVet => RuleCodePrefix::PD,
+            Plugin::PEP8Naming => RuleCodePrefix::N,
+            Plugin::Pyupgrade => RuleCodePrefix::UP,
         }
     }
 }
@@ -293,48 +248,35 @@ pub fn infer_plugins_from_options(flake8: &HashMap<String, Option<String>>) -> V
 ///
 /// For example, if the user ignores `ANN101`, we should infer that
 /// `flake8-annotations` is active.
-pub fn infer_plugins_from_codes(selectors: &HashSet<RuleSelector>) -> Vec<Plugin> {
-    // Ignore cases in which we've knowingly changed rule prefixes.
+pub fn infer_plugins_from_codes(codes: &BTreeSet<RuleCodePrefix>) -> Vec<Plugin> {
     [
-        Plugin::Flake82020,
         Plugin::Flake8Annotations,
         Plugin::Flake8Bandit,
-        // Plugin::Flake8BlindExcept,
-        Plugin::Flake8BooleanTrap,
+        Plugin::Flake8BlindExcept,
         Plugin::Flake8Bugbear,
         Plugin::Flake8Builtins,
-        // Plugin::Flake8Commas,
         Plugin::Flake8Comprehensions,
         Plugin::Flake8Datetimez,
         Plugin::Flake8Debugger,
         Plugin::Flake8Docstrings,
-        // Plugin::Flake8Eradicate,
+        Plugin::Flake8Eradicate,
         Plugin::Flake8ErrMsg,
-        Plugin::Flake8Executable,
         Plugin::Flake8ImplicitStrConcat,
-        // Plugin::Flake8ImportConventions,
-        Plugin::Flake8NoPep420,
-        Plugin::Flake8Pie,
         Plugin::Flake8Print,
-        Plugin::Flake8PytestStyle,
         Plugin::Flake8Quotes,
         Plugin::Flake8Return,
         Plugin::Flake8Simplify,
-        // Plugin::Flake8TidyImports,
-        // Plugin::Flake8TypeChecking,
-        Plugin::Flake8UnusedArguments,
-        // Plugin::Flake8UsePathlib,
-        Plugin::McCabe,
-        Plugin::PEP8Naming,
+        Plugin::Flake8TidyImports,
         Plugin::PandasVet,
-        Plugin::Tryceratops,
+        Plugin::PEP8Naming,
     ]
     .into_iter()
     .filter(|plugin| {
-        for selector in selectors {
-            if selector
-                .into_iter()
-                .any(|rule| plugin.selector().into_iter().any(|r| r == rule))
+        for prefix in codes {
+            if prefix
+                .codes()
+                .iter()
+                .any(|code| plugin.prefix().codes().contains(code))
             {
                 return true;
             }
@@ -344,11 +286,19 @@ pub fn infer_plugins_from_codes(selectors: &HashSet<RuleSelector>) -> Vec<Plugin
     .collect()
 }
 
+/// Resolve the set of enabled `RuleCodePrefix` values for the given
+/// plugins.
+pub fn resolve_select(plugins: &[Plugin]) -> BTreeSet<RuleCodePrefix> {
+    let mut select = BTreeSet::from([RuleCodePrefix::F, RuleCodePrefix::E, RuleCodePrefix::W]);
+    select.extend(plugins.iter().map(Plugin::prefix));
+    select
+}
+
 #[cfg(test)]
 mod tests {
     use std::collections::HashMap;
 
-    use super::{infer_plugins_from_options, Plugin};
+    use crate::plugin::{infer_plugins_from_options, Plugin};
 
     #[test]
     fn it_infers_plugins() {

licenses/LICENSE_JBKahn_flake8-debugger

@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2016 Joseph Kahn
+
+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.

licenses/LICENSE_MartinThoma_flake8-simplify

@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2020 Martin Thoma
+
+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.

licenses/LICENSE_PyCQA_autoflake

@@ -0,0 +1,19 @@
+Copyright (C) 2012-2018 Steven Myint
+
+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.

licenses/LICENSE_PyCQA_flake8

@@ -0,0 +1,22 @@
+== Flake8 License (MIT) ==
+
+Copyright (C) 2011-2013 Tarek Ziade <tarek@ziade.org>
+Copyright (C) 2012-2016 Ian Cordasco <graffatcolmingov@gmail.com>
+
+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.

licenses/LICENSE_PyCQA_flake8-bugbear

@@ -0,0 +1,21 @@
+The MIT License (MIT)
+
+Copyright (c) 2016 Łukasz Langa
+
+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.

licenses/LICENSE_PyCQA_isort

@@ -0,0 +1,21 @@
+The MIT License (MIT)
+
+Copyright (c) 2013 Timothy Edmund Crosley
+
+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.

licenses/LICENSE_PyCQA_pep8-naming

@@ -0,0 +1,23 @@
+Copyright © 2013 Florent Xicluna <florent.xicluna@gmail.com>
+
+Licensed under the terms of the Expat License
+
+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.

licenses/LICENSE_PyCQA_pycodestyle

@@ -0,0 +1,25 @@
+Copyright © 2006-2009 Johann C. Rocholl <johann@rocholl.net>
+Copyright © 2009-2014 Florent Xicluna <florent.xicluna@gmail.com>
+Copyright © 2014-2020 Ian Lee <IanLee1521@gmail.com>
+
+Licensed under the terms of the Expat License
+
+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.

licenses/LICENSE_PyCQA_pydocstyle

@@ -0,0 +1,23 @@
+Copyright (c) 2012 GreenSteam, <http://greensteam.dk/>
+
+Copyright (c) 2014-2020 Amir Rachum, <http://amir.rachum.com/>
+
+Copyright (c) 2020 Sambhav Kothari, <https://github.com/samj1912>
+
+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.

licenses/LICENSE_PyCQA_pyflakes

@@ -0,0 +1,21 @@
+Copyright 2005-2011 Divmod, Inc.
+Copyright 2013-2014 Florent Xicluna
+
+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.

licenses/LICENSE_RustPython_RustPython

@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2020 RustPython Team
+
+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.

licenses/LICENSE_adamchainz_flake8-comprehensions

@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2017 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.

licenses/LICENSE_adamchainz_flake8-tidy-imports

@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2017 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.

licenses/LICENSE_afonasev_flake8-return

@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2019 Afonasev Evgeniy
+
+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.

licenses/LICENSE_asottile_flake8-2020

@@ -0,0 +1,19 @@
+Copyright (c) 2019 Anthony Sottile
+
+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.

licenses/LICENSE_asottile_pyupgrade

@@ -0,0 +1,19 @@
+Copyright (c) 2017 Anthony Sottile
+
+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.

licenses/LICENSE_elijahandrews_flake8-blind-except

@@ -0,0 +1,20 @@
+The MIT License (MIT)
+
+Copyright (c) 2014 Elijah Andrews
+
+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.

licenses/LICENSE_flake8-implicit-str-concat_flake8-implicit-str-concat

@@ -0,0 +1,21 @@
+The MIT License (MIT)
+
+Copyright (c) 2019 Dylan Turner
+
+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.

licenses/LICENSE_jbkahn_flake8-print

@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2016 Joseph Kahn
+
+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.

licenses/LICENSE_joaopalmeiro_flake8-import-conventions

@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2021 João Palmeiro
+
+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.

licenses/LICENSE_nhoad_flake8-unused-arguments

@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2019 Nathan Hoad
+
+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.

licenses/LICENSE_pre-commit_pygrep-hooks

@@ -0,0 +1,19 @@
+Copyright (c) 2018 Anthony Sottile
+
+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.

licenses/LICENSE_sco1_flake8-annotations

@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2019 - Present S. Co1
+
+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.

licenses/LICENSE_tylerwince_flake8-bandit

@@ -0,0 +1,19 @@
+Copyright (c) 2017 Tyler Wince
+
+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.

licenses/LICENSE_wemake-services_flake8-eradicate

@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2018 Nikita Sobolev
+
+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.

licenses/LICENSE_zheller_flake8-quotes

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

mkdocs.template.yml

@@ -1,49 +0,0 @@
-site_name: Ruff
-theme:
-  name: material
-  features:
-    - navigation.instant
-    - navigation.tracking
-    - content.code.annotate
-    - toc.integrate
-    - toc.follow
-    - navigation.path
-    - navigation.top
-    - content.code.copy
-  palette:
-    - media: "(prefers-color-scheme: light)"
-      scheme: default
-      primary: red
-      toggle:
-        icon: material/weather-sunny
-        name: Switch to dark mode
-    - media: "(prefers-color-scheme: dark)"
-      scheme: slate
-      primary: red
-      toggle:
-        icon: material/weather-night
-        name: Switch to light mode
-repo_url: https://github.com/charliermarsh/ruff
-repo_name: ruff
-site_author: charliermarsh
-site_url: https://beta.ruff.rs/docs/
-site_dir: site/docs
-markdown_extensions:
-  - toc:
-      permalink: "#"
-  - pymdownx.snippets:
-  - pymdownx.magiclink:
-  - attr_list:
-  - md_in_html:
-  - pymdownx.highlight:
-      anchor_linenums: true
-  - pymdownx.inlinehilite:
-  - pymdownx.superfences:
-  - markdown.extensions.attr_list:
-  - pymdownx.keys:
-  - pymdownx.tasklist:
-      custom_checkbox: true
-  - pymdownx.highlight:
-      anchor_linenums: true
-plugins:
-  - search

pyproject.toml

@@ -1,13 +1,10 @@
 [build-system]
-requires = ["maturin>=0.14.10,<0.15"]
-# We depend on >=0.14.10 because we specify name in
-# [package.metadata.maturin] in ruff_cli/Cargo.toml.
-
+requires = ["maturin>=0.14,<0.15"]
 build-backend = "maturin"
 
 [project]
 name = "ruff"
-version = "0.0.239"
+version = "0.0.217"
 description = "An extremely fast Python linter, written in Rust."
 authors = [
   { name = "Charlie Marsh", email = "charlie.r.marsh@gmail.com" },
@@ -15,7 +12,6 @@ authors = [
 maintainers = [
   { name = "Charlie Marsh", email = "charlie.r.marsh@gmail.com" },
 ]
-readme = "README.md"
 requires-python = ">=3.7"
 license = { file = "LICENSE" }
 keywords = ["automation", "flake8", "pycodestyle", "pyflakes", "pylint", "clippy"]
@@ -39,6 +35,10 @@ urls = { repository = "https://github.com/charliermarsh/ruff" }
 
 [tool.maturin]
 bindings = "bin"
-manifest-path = "ruff_cli/Cargo.toml"
-python-source = "python"
 strip = true
+
+[tool.setuptools]
+license-files = [
+  "LICENSE",
+  "licenses/*",
+]

resources/test/fixtures/flake8_annotations/allow_nested_overload.py

@@ -1,9 +0,0 @@
-class C:
-    from typing import overload
-
-    @overload
-    def f(self, x: int, y: int) -> None:
-        ...
-
-    def f(self, x, y):
-        pass

resources/test/fixtures/flake8_annotations/mypy_init_return.py

@@ -39,10 +39,3 @@ class Foo:
 # Error
 def __init__(self, foo: int):
     ...
-
-
-# Error – used to be ok for a moment since the mere presence
-# of a vararg falsely indicated that the function has a typed argument.
-class Foo:
-    def __init__(self, *arg):
-        ...

resources/test/fixtures/flake8_bandit/S105.py

@@ -4,7 +4,6 @@ d = {}
 safe = "s3cr3t"
 password = True
 password = safe
-password = ""
 password is True
 password == 1
 d["safe"] = "s3cr3t"

resources/test/fixtures/flake8_bandit/S106.py

@@ -7,7 +7,6 @@ string = "Hello World"
 # OK
 func("s3cr3t")
 func(1, password=string)
-func(1, password="")
 func(pos="s3cr3t", password=string)
 
 # Error

resources/test/fixtures/flake8_bandit/S107.py

@@ -28,7 +28,3 @@ def ok_all(first, /, pos, default="posonly", *, kwonly="kwonly"):
 
 def default_all(first, /, pos, secret="posonly", *, password="kwonly"):
     pass
-
-
-def ok_empty(first, password=""):
-    pass

resources/test/fixtures/flake8_bandit/S110.py

@@ -1,14 +0,0 @@
-try:
-    pass
-except Exception:
-    pass
-
-try:
-    pass
-except:
-    pass
-
-try:
-    pass
-except ValueError:
-    pass

resources/test/fixtures/flake8_bandit/S508.py

@@ -1,6 +0,0 @@
-from pysnmp.hlapi import CommunityData
-
-CommunityData("public", mpModel=0)  # S508
-CommunityData("public", mpModel=1)  # S508
-
-CommunityData("public", mpModel=2)  # OK

resources/test/fixtures/flake8_bandit/S509.py

@@ -1,7 +0,0 @@
-from pysnmp.hlapi import UsmUserData
-
-
-insecure = UsmUserData("securityName")  # S509
-auth_no_priv = UsmUserData("securityName", "authName")  # S509
-
-less_insecure = UsmUserData("securityName", "authName", "privName")  # OK

resources/test/fixtures/flake8_bandit/S612.py

@@ -1,8 +0,0 @@
-import logging.config
-
-t = logging.config.listen(9999)
-
-def verify_func():
-    pass
-
-l = logging.config.listen(9999, verify=verify_func)

resources/test/fixtures/flake8_bandit/S701.py

@@ -1,29 +0,0 @@
-import jinja2
-from jinja2 import Environment, select_autoescape
-templateLoader = jinja2.FileSystemLoader( searchpath="/" )
-something = ''
-
-Environment(loader=templateLoader, load=templateLoader, autoescape=True)
-templateEnv = jinja2.Environment(autoescape=True,
-        loader=templateLoader )
-Environment(loader=templateLoader, load=templateLoader, autoescape=something)  # S701
-templateEnv = jinja2.Environment(autoescape=False, loader=templateLoader )  # S701
-Environment(loader=templateLoader,
-            load=templateLoader,
-            autoescape=False)  # S701
-
-Environment(loader=templateLoader,  # S701
-            load=templateLoader)
-
-Environment(loader=templateLoader, autoescape=select_autoescape())
-
-Environment(loader=templateLoader,
-            autoescape=select_autoescape(['html', 'htm', 'xml']))
-
-Environment(loader=templateLoader,
-            autoescape=jinja2.select_autoescape(['html', 'htm', 'xml']))
-
-
-def fake_func():
-    return 'foobar'
-Environment(loader=templateLoader, autoescape=fake_func())  # S701

resources/test/fixtures/flake8_blind_except/BLE.py

@@ -61,34 +61,3 @@ except Exception as e:
     raise bad
 except BaseException:
     pass
-
-import logging
-
-try:
-    pass
-except Exception:
-    logging.error("...")
-
-
-try:
-    pass
-except Exception:
-    logging.error("...", exc_info=False)
-
-
-try:
-    pass
-except Exception:
-    logging.error("...", exc_info=None)
-
-
-try:
-    pass
-except Exception:
-    logging.exception("...")
-
-
-try:
-    pass
-except Exception:
-    logging.error("...", exc_info=True)

resources/test/fixtures/flake8_bugbear/B007.py

@@ -29,19 +29,3 @@ def strange_generator():
 
 for i, (j, (k, l)) in strange_generator():  # i, k not used
     print(j, l)
-
-FMT = "{foo} {bar}"
-for foo, bar in [(1, 2)]:
-    if foo:
-        print(FMT.format(**locals()))
-
-for foo, bar in [(1, 2)]:
-    if foo:
-        print(FMT.format(**globals()))
-
-for foo, bar in [(1, 2)]:
-    if foo:
-        print(FMT.format(**vars()))
-
-for foo, bar in [(1, 2)]:
-    print(FMT.format(foo=foo, bar=eval('bar')))

resources/test/fixtures/flake8_bugbear/B009_B010.py

@@ -1,7 +1,7 @@
 """
 Should emit:
-B009 - Line 19, 20, 21, 22, 23, 24
-B010 - Line 40, 41, 42, 43, 44, 45
+B009 - Line 18, 19, 20, 21, 22
+B010 - Line 33, 34, 35, 36
 """
 
 # Valid getattr usage
@@ -13,12 +13,10 @@ getattr(foo, bar, None)
 getattr(foo, "123abc")
 getattr(foo, r"123\abc")
 getattr(foo, "except")
-getattr(foo, "__123abc")
 
 # Invalid usage
 getattr(foo, "bar")
 getattr(foo, "_123abc")
-getattr(foo, "__123abc__")
 getattr(foo, "abc123")
 getattr(foo, r"abc123")
 _ = lambda x: getattr(x, "bar")
@@ -29,7 +27,6 @@ if getattr(x, "bar"):
 setattr(foo, bar, None)
 setattr(foo, "bar{foo}".format(foo="a"), None)
 setattr(foo, "123abc", None)
-setattr(foo, "__123abc", None)
 setattr(foo, r"123\abc", None)
 setattr(foo, "except", None)
 _ = lambda x: setattr(x, "bar", 1)
@@ -39,7 +36,6 @@ if setattr(x, "bar", 1):
 # Invalid usage
 setattr(foo, "bar", None)
 setattr(foo, "_123abc", None)
-setattr(foo, "__123abc__", None)
 setattr(foo, "abc123", None)
 setattr(foo, r"abc123", None)
 setattr(foo.bar, r"baz", None)

resources/test/fixtures/flake8_bugbear/B023.py

@@ -25,10 +25,10 @@ for x in range(3):
 
 
 def check_inside_functions_too():
-    ls = [lambda: x for x in range(2)]  # error
-    st = {lambda: x for x in range(2)}  # error
-    gn = (lambda: x for x in range(2))  # error
-    dt = {x: lambda: x for x in range(2)}  # error
+    ls = [lambda: x for x in range(2)]
+    st = {lambda: x for x in range(2)}
+    gn = (lambda: x for x in range(2))
+    dt = {x: lambda: x for x in range(2)}
 
 
 async def pointless_async_iterable():
@@ -37,9 +37,9 @@ async def pointless_async_iterable():
 
 async def container_for_problems():
     async for x in pointless_async_iterable():
-        functions.append(lambda: x)  # error
+        functions.append(lambda: x)
 
-    [lambda: x async for x in pointless_async_iterable()]  # error
+    [lambda: x async for x in pointless_async_iterable()]
 
 
 a = 10
@@ -47,10 +47,10 @@ b = 0
 while True:
     a = a_ = a - 1
     b += 1
-    functions.append(lambda: a)  # error
-    functions.append(lambda: a_)  # error
-    functions.append(lambda: b)  # error
-    functions.append(lambda: c)  # error, but not a name error due to late binding
+    functions.append(lambda: a)
+    functions.append(lambda: a_)
+    functions.append(lambda: b)
+    functions.append(lambda: c)  # not a name error because of late binding!
     c: bool = a > 3
     if not c:
         break
@@ -58,7 +58,7 @@ while True:
 # Nested loops should not duplicate reports
 for j in range(2):
     for k in range(3):
-        lambda: j * k  # error
+        lambda: j * k
 
 
 for j, k, l in [(1, 2, 3)]:
@@ -80,95 +80,3 @@ for var in range(2):
 
 for i in range(3):
     lambda: f"{i}"
-
-
-# `query` is defined in the function, so also defining it in the loop should be OK.
-for name in ["a", "b"]:
-    query = name
-
-    def myfunc(x):
-        query = x
-        query_post = x
-        _ = query
-        _ = query_post
-
-    query_post = name  # in case iteration order matters
-
-
-# Bug here because two dict comprehensions reference `name`, one of which is inside
-# the lambda.  This should be totally fine, of course.
-_ = {
-    k: v
-    for k, v in reduce(
-        lambda data, event: merge_mappings(
-            [data, {name: f(caches, data, event) for name, f in xx}]
-        ),
-        events,
-        {name: getattr(group, name) for name in yy},
-    ).items()
-    if k in backfill_fields
-}
-
-
-# OK to define lambdas if they're immediately consumed, typically as the `key=`
-# argument or in a consumed `filter()` (even if a comprehension is better style)
-for x in range(2):
-    # It's not a complete get-out-of-linting-free construct - these should fail:
-    min([None, lambda: x], key=repr)
-    sorted([None, lambda: x], key=repr)
-    any(filter(bool, [None, lambda: x]))
-    list(filter(bool, [None, lambda: x]))
-    all(reduce(bool, [None, lambda: x]))
-
-    # But all these should be OK:
-    min(range(3), key=lambda y: x * y)
-    max(range(3), key=lambda y: x * y)
-    sorted(range(3), key=lambda y: x * y)
-
-    any(map(lambda y: x < y, range(3)))
-    all(map(lambda y: x < y, range(3)))
-    set(map(lambda y: x < y, range(3)))
-    list(map(lambda y: x < y, range(3)))
-    tuple(map(lambda y: x < y, range(3)))
-    sorted(map(lambda y: x < y, range(3)))
-    frozenset(map(lambda y: x < y, range(3)))
-
-    any(filter(lambda y: x < y, range(3)))
-    all(filter(lambda y: x < y, range(3)))
-    set(filter(lambda y: x < y, range(3)))
-    list(filter(lambda y: x < y, range(3)))
-    tuple(filter(lambda y: x < y, range(3)))
-    sorted(filter(lambda y: x < y, range(3)))
-    frozenset(filter(lambda y: x < y, range(3)))
-
-    any(reduce(lambda y: x | y, range(3)))
-    all(reduce(lambda y: x | y, range(3)))
-    set(reduce(lambda y: x | y, range(3)))
-    list(reduce(lambda y: x | y, range(3)))
-    tuple(reduce(lambda y: x | y, range(3)))
-    sorted(reduce(lambda y: x | y, range(3)))
-    frozenset(reduce(lambda y: x | y, range(3)))
-
-    import functools
-
-    any(functools.reduce(lambda y: x | y, range(3)))
-    all(functools.reduce(lambda y: x | y, range(3)))
-    set(functools.reduce(lambda y: x | y, range(3)))
-    list(functools.reduce(lambda y: x | y, range(3)))
-    tuple(functools.reduce(lambda y: x | y, range(3)))
-    sorted(functools.reduce(lambda y: x | y, range(3)))
-    frozenset(functools.reduce(lambda y: x | y, range(3)))
-
-# OK because the lambda which references a loop variable is defined in a `return`
-# statement, and after we return the loop variable can't be redefined.
-# In principle we could do something fancy with `break`, but it's not worth it.
-def iter_f(names):
-    for name in names:
-        if exists(name):
-            return lambda: name if exists(name) else None
-
-        if foo(name):
-            return [lambda: name]  # known false alarm
-
-        if False:
-            return [lambda: i for i in range(3)]  # error

resources/test/fixtures/flake8_bugbear/B024.py

@@ -1,16 +1,15 @@
 """
 Should emit:
-B024 - on lines 18, 71, 82, 87, 92, 141
+B024 - on lines 17, 34, 52, 58, 69, 74, 79, 84, 89
 """
 
 import abc
 import abc as notabc
 from abc import ABC, ABCMeta
-from abc import abstractmethod, abstractproperty
+from abc import abstractmethod
 from abc import abstractmethod as abstract
 from abc import abstractmethod as abstractaoeuaoeuaoeu
 from abc import abstractmethod as notabstract
-from abc import abstractproperty as notabstract_property
 
 import foo
 
@@ -50,24 +49,12 @@ class Base_6(ABC):
         foo()
 
 
-class Base_7(ABC):
+class Base_7(ABC):  # error
     @notabstract
     def method(self):
         foo()
 
 
-class Base_8(ABC):
-    @notabstract_property
-    def method(self):
-        foo()
-
-
-class Base_9(ABC):
-    @abstractproperty
-    def method(self):
-        foo()
-
-
 class MetaBase_1(metaclass=ABCMeta):  # error
     def method(self):
         foo()

resources/test/fixtures/flake8_bugbear/B027.py

@@ -1,12 +1,11 @@
 """
 Should emit:
-B027 - on lines 13, 16, 19, 23
+B027 - on lines 12, 15, 18, 22, 30
 """
 import abc
 from abc import ABC
-from abc import abstractmethod, abstractproperty
+from abc import abstractmethod
 from abc import abstractmethod as notabstract
-from abc import abstractproperty as notabstract_property
 
 
 class AbstractClass(ABC):
@@ -43,18 +42,6 @@ class AbstractClass(ABC):
     def abstract_3(self):
         ...
 
-    @abc.abstractproperty
-    def abstract_4(self):
-        ...
-
-    @abstractproperty
-    def abstract_5(self):
-        ...
-
-    @notabstract_property
-    def abstract_6(self):
-        ...
-
     def body_1(self):
         print("foo")
         ...

resources/test/fixtures/flake8_builtins/A001.py

@@ -1,6 +1,5 @@
 import some as sum
 from some import other as int
-from directory import new as dir
 
 print = 1
 copyright: 'annotation' = 2
@@ -8,8 +7,6 @@ copyright: 'annotation' = 2
 float = object = 4
 min, max = 5, 6
 
-id = 4
-
 def bytes():
     pass
 

resources/test/fixtures/flake8_builtins/A002.py

@@ -5,7 +5,5 @@ def func1(str, /, type, *complex, Exception, **getattr):
 async def func2(bytes):
     pass
 
-async def func3(id, dir):
-    pass
 
 map([], lambda float: ...)

resources/test/fixtures/flake8_builtins/A003.py

@@ -1,12 +1,8 @@
 class MyClass:
     ImportError = 4
-    id = 5
-    dir = "/"
 
     def __init__(self):
         self.float = 5  # is fine
-        self.id = 10
-        self.dir = "."
 
     def str(self):
         pass

resources/test/fixtures/flake8_commas/COM81.py

@@ -1,628 +0,0 @@
-# ==> bad_function_call.py <==
-bad_function_call(
-    param1='test',
-    param2='test'
-)
-# ==> bad_list.py <==
-bad_list = [
-    1,
-    2,
-    3
-]
-
-bad_list_with_comment = [
-    1,
-    2,
-    3
-    # still needs a comma!
-]
-
-bad_list_with_extra_empty = [
-    1,
-    2,
-    3
-
-
-
-]
-
-# ==> bare.py <==
-bar = 1, 2
-
-foo = 1
-
-foo = (1,)
-
-foo = 1,
-
-bar = 1; foo = bar,
-
-foo = (
-3,
-4,
-)
-
-foo = 3, 
-
-class A(object):
- foo = 3
- bar = 10,
- foo_bar = 2
-
-a = ('a',)
-
-from foo import bar, baz
-
-group_by = function_call('arg'),
-
-group_by = ('foobar' * 3),
-
-def foo():
-    return False,
-
-==> callable_before_parenth_form.py <==
-def foo(
-    bar,
-):
-    pass
-
-{'foo': foo}['foo'](
-    bar
-)
-
-{'foo': foo}['foo'](
-    bar,
-)
-
-(foo)(
-    bar
-)
-
-(foo)[0](
-    bar,
-)
-
-[foo][0](
-    bar
-)
-
-[foo][0](
-    bar,
-)
-
-# ==> comment_good_dict.py <==
-multiline_good_dict = {
-    "good": 123,  # this is a good number
-}
-
-# ==> dict_comprehension.py <==
-not_a_dict = {
-    x: y
-    for x, y in ((1, 2), (3, 4))
-}
-
-# ==> good_empty_comma_context.py <==
-def func2(
-):
-    pass
-
-
-func2(
-
-)
-
-func2(
-)
-
-[
-]
-
-[
-
-]
-
-(
-)
-
-(
-
-)
-
-{
-
-}
-
-# ==> good_list.py <==
-stuff = [
-   'a',
-   'b',
-   # more stuff will go here
-]
-
-more_stuff = [
-    'a',
-    'b',
-
-
-
-]
-
-# ==> keyword_before_parenth_form/base_bad.py <==
-from x import (
-    y
-)
-
-assert(
-    SyntaxWarning,
-    ThrownHere,
-    Anyway
-)
-
-# async await is fine outside an async def
-# ruff: RustPython tokenizer treats async/await as keywords, not applicable.
-
-# def await(
-#     foo
-# ):
-#     async(
-#         foo
-#     )
-
-# def async(
-#     foo
-# ):
-#     await(
-#         foo
-#     )
-
-# ==> keyword_before_parenth_form/base.py <==
-from x import (
-    y,
-)
-
-assert(
-    SyntaxWarning,
-    ThrownHere,
-    Anyway,
-)
-
-assert (
-    foo
-)
-
-assert (
-    foo and
-    bar
-)
-
-if(
-    foo and
-    bar
-):
-    pass
-elif(
-    foo and
-    bar
-):
-    pass
-
-for x in(
-    [1,2,3]
-):
-    print(x)
-
-
-(x for x in (
-    [1, 2, 3]
-))
-
-(
-    'foo'
-) is (
-    'foo'
-)
-
-if (
-    foo and
-    bar
-) or not (
-    foo
-) or (
-    spam
-):
-    pass
-
-def xyz():
-    raise(
-        Exception()
-    )
-
-def abc():
-    return(
-        3
-    )
-
-while(
-    False
-):
-    pass
-
-with(
-    loop
-):
-    pass
-
-def foo():
-    yield (
-        "foo"
-    )
-
-# async await is fine outside an async def
-# ruff: RustPython tokenizer treats async/await as keywords, not applicable.
-
-# def await(
-#     foo,
-# ):
-#     async(
-#         foo,
-#     )
-
-# def async(
-#     foo,
-# ):
-#     await(
-#         foo,
-#     )
-
-# ==> keyword_before_parenth_form/py3.py <==
-# Syntax error in Py2
-
-def foo():
-    yield from (
-        foo
-    )
-
-# ==> list_comprehension.py <==
-not_a_list = [
-    s.strip()
-    for s in 'foo, bar, baz'.split(',')
-]
-
-# ==> multiline_bad_dict.py <==
-multiline_bad_dict = {
-    "bad": 123
-}
-# ==> multiline_bad_function_def.py <==
-def func_good(
-        a = 3,
-        b = 2):
-    pass
-
-
-def func_bad(
-        a = 3,
-        b = 2
-    ):
-    pass
-
-# ==> multiline_bad_function_one_param.py <==
-def func(
-        a = 3
-    ):
-    pass
-
-
-func(
-    a = 3
-)
-
-# ==> multiline_bad_or_dict.py <==
-multiline_bad_or_dict = {
-    "good": True or False,
-    "bad": 123
-}
-
-# ==> multiline_good_dict.py <==
-multiline_good_dict = {
-    "good": 123,
-}
-# ==> multiline_good_single_keyed_for_dict.py <==
-good_dict = {
-    "good": x for x in y
-}
-
-# ==> multiline_if.py <==
-if (
-    foo
-    and bar
-):
-    print("Baz")
-
-# ==> multiline_index_access.py <==
-multiline_index_access[
-    "good"
-]
-
-multiline_index_access_after_function()[
-    "good"
-]
-
-multiline_index_access_after_inline_index_access['first'][
-    "good"
-]
-
-multiline_index_access[
-    "probably fine",
-]
-
-[0, 1, 2][
-    "good"
-]
-
-[0, 1, 2][
-    "probably fine",
-]
-
-multiline_index_access[
-    "probably fine",
-    "not good"
-]
-
-multiline_index_access[
-    "fine",
-    "fine",
-    :
-    "not good"
-]
-
-# ==> multiline_string.py <==
-s = (
-    'this' +
-    'is a string'
-)
-
-s2 = (
-    'this'
-    'is also a string'
-)
-
-t = (
-    'this' +
-    'is a tuple',
-)
-
-t2 = (
-    'this'
-    'is also a tuple',
-)
-
-# ==> multiline_subscript_slice.py <==
-multiline_index_access[
-    "fine",
-    "fine"
-    :
-    "not fine"
-]
-
-multiline_index_access[
-    "fine"
-    "fine"
-    :
-    "fine"
-    :
-    "fine"
-]
-
-multiline_index_access[
-    "fine"
-    "fine",
-    :
-    "fine",
-    :
-    "fine",
-]
-
-multiline_index_access[
-    "fine"
-    "fine",
-    :
-    "fine"
-    :
-    "fine",
-    "not fine"
-]
-
-multiline_index_access[
-    "fine"
-    "fine",
-    :
-    "fine",
-    "fine"
-    :
-    "fine",
-]
-
-multiline_index_access[
-    lambda fine,
-    fine,
-    fine: (0,)
-    :
-    lambda fine,
-    fine,
-    fine: (0,),
-    "fine"
-    :
-    "fine",
-]
-
-# ==> one_line_dict.py <==
-one_line_dict = {"good": 123}
-# ==> parenth_form.py <==
-parenth_form = (
-    a +
-    b +
-    c
-)
-
-parenth_form_with_lambda = (
-    lambda x, y: 0
-)
-
-parenth_form_with_default_lambda = (
-    lambda x=(
-        lambda
-        x,
-        y,
-        :
-        0
-    ),
-    y = {a: b},
-    :
-    0
-)
-
-# ==> prohibited.py <==
-foo = ['a', 'b', 'c',]
-
-bar = { a: b,}
-
-def bah(ham, spam,):
-    pass
-
-(0,)
-
-(0, 1,)
-
-foo = ['a', 'b', 'c', ]
-
-bar = { a: b, }
-
-def bah(ham, spam, ):
-    pass
-
-(0, )
-
-(0, 1, )
-
-image[:, :, 0]
-
-image[:,]
-
-image[:,:,]
-
-lambda x, :
-
-# ==> unpack.py <==
-def function(
-    foo,
-    bar,
-    **kwargs
-):
-    pass
-
-def function(
-    foo,
-    bar,
-    *args
-):
-    pass
-
-def function(
-    foo,
-    bar,
-    *args,
-    extra_kwarg
-    ):
-    pass
-
-result = function(
-    foo,
-    bar,
-    **kwargs
-)
-
-result = function(
-    foo,
-    bar,
-    **not_called_kwargs
-)
-
-def foo(
-    ham,
-    spam,
-    *args,
-    kwarg_only
-    ):
-    pass
-
-# In python 3.5 if it's not a function def, commas are mandatory.
-
-foo(
-    **kwargs
-)
-
-{
-    **kwargs
-}
-
-(
-    *args
-)
-
-{
-    *args
-}
-
-[
-    *args
-]
-
-def foo(
-    ham,
-    spam,
-    *args
-    ):
-    pass
-
-def foo(
-    ham,
-    spam,
-    **kwargs
-    ):
-    pass
-
-def foo(
-    ham,
-    spam,
-    *args,
-    kwarg_only
-    ):
-    pass
-
-# In python 3.5 if it's not a function def, commas are mandatory.
-
-foo(
-    **kwargs,
-)
-
-{
-    **kwargs,
-}
-
-(
-    *args,
-)
-
-{
-    *args,
-}
-
-[
-    *args,
-]
-
-result = function(
-    foo,
-    bar,
-    **{'ham': spam}
-)

resources/test/fixtures/flake8_comprehensions/C400.py

@@ -2,10 +2,3 @@ x = list(x for x in range(3))
 x = list(
     x for x in range(3)
 )
-
-
-def list(*args, **kwargs):
-    return None
-
-
-list(x for x in range(3))

resources/test/fixtures/flake8_comprehensions/C401.py

@@ -2,10 +2,3 @@ x = set(x for x in range(3))
 x = set(
     x for x in range(3)
 )
-
-
-def set(*args, **kwargs):
-    return None
-
-
-set(x for x in range(3))

resources/test/fixtures/flake8_comprehensions/C405.py

@@ -1,18 +1,5 @@
-set([1, 2])
-set((1, 2))
-set([])
-set(())
-set()
-set((1,))
-set((
-    1,
-))
-set([
-    1,
-])
-set(
-    (1,)
-)
-set(
-    [1,]
-)
+s1 = set([1, 2])
+s2 = set((1, 2))
+s3 = set([])
+s4 = set(())
+s5 = set()

resources/test/fixtures/flake8_comprehensions/C408.py

@@ -3,10 +3,3 @@ l = list()
 d1 = dict()
 d2 = dict(a=1)
 d3 = dict(**d2)
-
-
-def list():
-    return [1, 2, 3]
-
-
-a = list()

resources/test/fixtures/flake8_comprehensions/C413.py

@@ -4,10 +4,3 @@ list(sorted(x))
 reversed(sorted(x))
 reversed(sorted(x, key=lambda e: e))
 reversed(sorted(x, reverse=True))
-
-
-def reversed(*args, **kwargs):
-    return None
-
-
-reversed(sorted(x, reverse=True))

resources/test/fixtures/flake8_executable/EXE001_1.py

@@ -1,4 +0,0 @@
-#!/usr/bin/python
-
-if __name__ == '__main__':
-    print('I should be executable.')

resources/test/fixtures/flake8_executable/EXE001_2.py

@@ -1,2 +0,0 @@
-if __name__ == '__main__':
-    print('I should be executable.')

resources/test/fixtures/flake8_executable/EXE001_3.py

@@ -1,4 +0,0 @@
-#!/usr/bin/python
-
-if __name__ == '__main__':
-    print('I should be executable.')

resources/test/fixtures/flake8_executable/EXE002_1.py

@@ -1,2 +0,0 @@
-if __name__ == '__main__':
-    print('I should be executable.')

resources/test/fixtures/flake8_executable/EXE002_2.py

@@ -1,2 +0,0 @@
-if __name__ == '__main__':
-    print('I should be executable.')

resources/test/fixtures/flake8_executable/EXE002_3.py

@@ -1,4 +0,0 @@
-#!/usr/bin/python
-
-if __name__ == '__main__':
-    print('I should be executable.')

resources/test/fixtures/flake8_executable/EXE003.py

@@ -1,2 +0,0 @@
-#!/usr/bin/bash
-print("hello world")

resources/test/fixtures/flake8_executable/EXE004_1.py

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

resources/test/fixtures/flake8_executable/EXE004_2.py

@@ -1,2 +0,0 @@
-print("  #!/usr/bin/python")
-# shebang outside of comments should be ignored

resources/test/fixtures/flake8_executable/EXE004_3.py

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

resources/test/fixtures/flake8_executable/EXE005_1.py

@@ -1,3 +0,0 @@
-
-# A python comment
-#!/usr/bin/python

resources/test/fixtures/flake8_executable/EXE005_2.py

@@ -1,4 +0,0 @@
-print("code prior to shebang")
-
-# A python comment
-#!/usr/bin/python

resources/test/fixtures/flake8_executable/EXE005_3.py

@@ -1,6 +0,0 @@
-"""
-With a docstring
-print("commented out code")
-"""
-# A python comment
-#!/usr/bin/python

resources/test/fixtures/flake8_import_conventions/custom.py

@@ -7,13 +7,6 @@ import matplotlib.pyplot  # unconventional
 import numpy  # unconventional
 import pandas  # unconventional
 import seaborn  # unconventional
-import tensorflow  # unconventional
-import holoviews  # unconventional
-import panel  # unconventional
-import plotly.express  # unconventional
-import matplotlib  # unconventional
-import polars  # unconventional
-import pyarrow  # unconventional
 
 import altair as altr  # unconventional
 import matplotlib.pyplot as plot  # unconventional
@@ -22,13 +15,6 @@ import dask.dataframe as ddf  # unconventional
 import numpy as nmp  # unconventional
 import pandas as pdas  # unconventional
 import seaborn as sbrn  # unconventional
-import tensorflow as tfz  # unconventional
-import holoviews as hsv  # unconventional
-import panel as pns  # unconventional
-import plotly.express as pltx  # unconventional
-import matplotlib as ml  # unconventional
-import polars as ps # unconventional
-import pyarrow as arr  # unconventional
 
 import altair as alt  # conventional
 import dask.array as da  # conventional
@@ -37,12 +23,3 @@ import matplotlib.pyplot as plt  # conventional
 import numpy as np  # conventional
 import pandas as pd  # conventional
 import seaborn as sns  # conventional
-import tensorflow as tf # conventional
-import holoviews as hv  # conventional
-import panel as pn  # conventional
-import plotly.express as px  # conventional
-import matplotlib as mpl  # conventional
-import polars as pl # conventional
-import pyarrow as pa  # conventional
-
-from tensorflow.keras import Model  # conventional

resources/test/fixtures/flake8_import_conventions/from_imports.py

@@ -1,21 +0,0 @@
-# Test absolute imports
-# Violation cases
-import xml.dom.minidom
-import xml.dom.minidom as wrong
-from xml.dom import minidom as wrong
-from xml.dom import minidom
-from xml.dom.minidom import parseString as wrong  # Ensure ICN001 throws on function import.
-from xml.dom.minidom import parseString
-from xml.dom.minidom import parse, parseString
-from xml.dom.minidom import parse as ps, parseString as wrong
-
-# No ICN001 violations
-import xml.dom.minidom as md
-from xml.dom import minidom as md
-from xml.dom.minidom import parseString as pstr
-from xml.dom.minidom import parse, parseString as pstr
-from xml.dom.minidom import parse as ps, parseString as pstr
-
-
-# Test relative imports
-from ..xml.dom import minidom as okay  # Ensure config "xml.dom.minidom" doesn't catch relative imports

resources/test/fixtures/flake8_logging_format/G001.py

@@ -1,3 +0,0 @@
-import logging
-
-logging.info("Hello {}".format("World!"))

resources/test/fixtures/flake8_logging_format/G002.py

@@ -1,3 +0,0 @@
-import logging
-
-logging.info("Hello %s" % "World!")

resources/test/fixtures/flake8_logging_format/G003.py

@@ -1,3 +0,0 @@
-import logging
-
-logging.info("Hello" + " " + "World!")

resources/test/fixtures/flake8_logging_format/G004.py

@@ -1,4 +0,0 @@
-import logging
-
-name = "world"
-logging.info(f"Hello {name}")

resources/test/fixtures/flake8_logging_format/G010.py

@@ -1,3 +0,0 @@
-import logging
-
-logging.warn("Hello World!")

resources/test/fixtures/flake8_logging_format/G101_1.py

@@ -1,8 +0,0 @@
-import logging
-
-logging.info(
-    "Hello world!",
-    extra={
-        "name": "foobar",
-    },
-)

resources/test/fixtures/flake8_logging_format/G101_2.py

@@ -1,8 +0,0 @@
-import logging
-
-logging.info(
-    "Hello world!",
-    extra=dict(
-        name="foobar",
-    ),
-)

resources/test/fixtures/flake8_logging_format/G201.py

@@ -1,21 +0,0 @@
-import logging
-import sys
-
-# G201
-try:
-    pass
-except:
-    logging.error("Hello World", exc_info=True)
-
-try:
-    pass
-except:
-    logging.error("Hello World", exc_info=sys.exc_info())
-
-# OK
-try:
-    pass
-except:
-    logging.error("Hello World", exc_info=False)
-
-logging.error("Hello World", exc_info=sys.exc_info())