Revert "Bump version to 0.0.222"

This reverts commit 852aab5758.

.github/ISSUE_TEMPLATE.md

@@ -0,0 +1,10 @@
+<!--
+Thank you for taking the time to report an issue! We're glad to have you involved with Ruff.
+
+If you're filing a bug report, please consider including the following information:
+
+- A minimal code snippet that reproduces the bug.
+- The command you invoked (e.g., `ruff /path/to/file.py --fix`), ideally including the `--isolated` flag.
+- The current Ruff settings (any relevant sections from your `pyproject.toml`).
+- The current Ruff version (`ruff --version`).
+-->

.github/workflows/ci.yaml

@@ -6,6 +6,10 @@ on:
   pull_request:
     branches: [main]
 
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref_name }}-${{ github.event.pull_request.number || github.sha }}
+  cancel-in-progress: true
+
 env:
   CARGO_INCREMENTAL: 0
   CARGO_NET_RETRY: 10
@@ -22,25 +26,12 @@ jobs:
           profile: minimal
           toolchain: nightly-2022-11-01
           override: true
-          components: rustfmt
-      - 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 }}-
-      - run: cargo build --all --release
-      - run: ./target/release/ruff_dev generate-all
+      - 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 +nightly dev generate-all'."
-      - run: git diff --quiet src/checks_gen.rs || echo "::error file=src/checks_gen.rs::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 src/checks_gen.rs ruff.schema.json
+      - run: git diff --exit-code -- README.md ruff.schema.json
 
   cargo-fmt:
     name: "cargo fmt"
@@ -53,18 +44,6 @@ jobs:
           toolchain: nightly-2022-11-01
           override: true
           components: rustfmt
-      - 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 }}-
       - run: cargo fmt --all --check
 
   cargo_clippy:
@@ -79,20 +58,9 @@ jobs:
           override: true
           components: clippy
           target: wasm32-unknown-unknown
-      - 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: Swatinem/rust-cache@v1
       - run: cargo clippy --workspace --all-targets --all-features -- -D warnings -W clippy::pedantic
-      - run: cargo clippy --workspace --target wasm32-unknown-unknown --all-features -- -D warnings -W clippy::pedantic
+      - run: cargo clippy -p ruff --target wasm32-unknown-unknown --all-features -- -D warnings -W clippy::pedantic
 
   cargo-test:
     name: "cargo test"
@@ -104,25 +72,14 @@ jobs:
           profile: minimal
           toolchain: nightly-2022-11-01
           override: true
-      - 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: Swatinem/rust-cache@v1
       - 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
+      - run: cargo test --package ruff_cli --test black_compatibility_test -- --ignored
 
 # TODO(charlie): Re-enable the `wasm-pack` tests.
 # See: https://github.com/charliermarsh/ruff/issues/1425
@@ -164,20 +121,21 @@ jobs:
           profile: minimal
           toolchain: nightly-2022-11-01
           override: true
+      - uses: Swatinem/rust-cache@v1
       - uses: actions/setup-python@v4
         with:
           python-version: "3.11"
       - run: pip install maturin
-      - 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 }}-
       - run: maturin build -b bin
+
+  typos:
+    name: Spell Check with Typos
+    runs-on: ubuntu-latest
+    steps:
+    - name: Checkout Actions Repository
+      uses: actions/checkout@v2
+
+    - name: Check spelling of file.txt
+      uses: crate-ci/typos@master
+      with:
+        files: .

.github/workflows/playground.yaml

@@ -31,7 +31,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
+        run: wasm-pack build --target web --out-dir playground/src/pkg . -- -p ruff
       - name: "Install Node dependencies"
         run: npm ci
         working-directory: playground

.pre-commit-config.yaml

@@ -1,6 +1,6 @@
 repos:
   - repo: https://github.com/charliermarsh/ruff-pre-commit
-    rev: v0.0.207
+    rev: v0.0.221
     hooks:
       - id: ruff
 

CONTRIBUTING.md

@@ -56,53 +56,58 @@ prior to merging.
 
 There are four phases to adding a new lint rule:
 
-1. Define the rule in `src/checks.rs`.
-2. Define the _logic_ for triggering the rule in `src/checkers/ast.rs` (for AST-based checks),
+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).
-3. Add a test fixture.
-4. Update the generated files (documentation and generated code).
+4. Add a test fixture.
+5. Update the generated files (documentation and generated code).
 
-To define the rule, open up `src/checks.rs`. You'll need to define both a `CheckCode` and
-`CheckKind`. As an example, you can grep for `E402` and `ModuleImportNotAtTopOfFile`, and follow the
-pattern implemented therein.
+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 rule, you'll likely want to augment the logic in `src/check_ast.rs`, which defines
-the Python AST visitor, responsible for iterating over the abstract syntax tree and collecting
-lint-rule violations as it goes. 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 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.
 
-To add a test fixture, create a file under `resources/test/fixtures`, named to match the `CheckCode`
-you defined earlier (e.g., `E402.py`). This file should contain a variety of violations and
-non-violations designed to evaluate and demonstrate the behavior of your lint rule.
+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/[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 +nightly dev generate-all` to generate the code for your new fixture. Then run Ruff
-locally with (e.g.) `cargo run resources/test/fixtures/E402.py --no-cache --select E402`.
+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/[test-suite-name]/mod.rs` file. Then, run `cargo test`. 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.
+`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 +nightly dev generate-all`.
 
 ### Example: Adding a new configuration option
 
-Ruff's user-facing settings live in two places: first, the command-line options defined with
-[clap](https://docs.rs/clap/latest/clap/) via the `Cli` struct in `src/main.rs`; and second, the
-`Config` struct defined `src/pyproject.rs`, which is responsible for extracting user-defined
-settings from a `pyproject.toml` file.
+Ruff's user-facing settings live in a few different places.
 
-Ultimately, these two sources of configuration are merged into the `Settings` struct defined
-in `src/settings.rs`, which is then threaded through the codebase.
+First, the command-line options are defined via the `Cli` struct in `src/cli.rs`.
 
-To add a new configuration option, you'll likely want to _both_ add a CLI option to `src/main.rs`
-_and_ a `pyproject.toml` parameter to `src/pyproject.rs`. If you want to pattern-match against an
-existing example, grep for `dummy_variable_rgx`, which defines a regular expression to match against
-acceptable unused variables (e.g., `_`).
+Second, the `pyproject.toml` options are defined in `src/settings/options.rs` (via the `Options`
+struct), `src/settings/configuration.rs` (via the `Configuration` struct), and `src/settings/mod.rs`
+(via the `Settings` struct). These represent, respectively: the schema used to parse the
+`pyproject.toml` file; an internal, intermediate representation; and the final, internal
+representation used to power Ruff.
 
-If the new plugin's configuration should be cached between runs, you'll need to add it to the
-`Hash` implementation for `Settings` in `src/settings/mod.rs`.
+To add a new configuration option, you'll likely want to modify these latter few files (along with
+`cli.rs`, if appropriate). If you want to pattern-match against an existing example, grep for
+`dummy_variable_rgx`, which defines a regular expression to match against acceptable unused
+variables (e.g., `_`).
+
+Note that plugin-specific configuration options are defined in their own modules (e.g.,
+`src/flake8_unused_arguments/settings.rs`).
 
 You may also want to add the new configuration option to the `flake8-to-ruff` tool, which is
 responsible for converting `flake8` configuration files to Ruff's TOML format. This logic

Cargo.lock

@@ -356,9 +356,9 @@ dependencies = [
 
 [[package]]
 name = "clearscreen"
-version = "1.0.10"
+version = "2.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c969a6b6dadff9f3349b1f783f553e2411104763ca4789e1c6ca6a41f46a57b0"
+checksum = "41aa24cc5e1d6b3fc49ad4cd540b522fedcbe88bc6f259ff16e20e7010b6f8c7"
 dependencies = [
  "nix",
  "terminfo",
@@ -367,15 +367,6 @@ dependencies = [
  "winapi",
 ]
 
-[[package]]
-name = "codegen"
-version = "0.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ff61280aed771c3070e7dcc9e050c66f1eb1e3b96431ba66f9f74641d02fc41d"
-dependencies = [
- "indexmap",
-]
-
 [[package]]
 name = "codespan-reporting"
 version = "0.11.1"
@@ -397,12 +388,6 @@ dependencies = [
  "winapi",
 ]
 
-[[package]]
-name = "common-path"
-version = "1.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2382f75942f4b3be3690fe4f86365e9c853c1587d6ee58212cebf6e2a9ccd101"
-
 [[package]]
 name = "configparser"
 version = "3.0.2"
@@ -750,10 +735,11 @@ checksum = "0ce7134b9999ecaf8bcd65542e436736ef32ddca1b3e06094cb6ec5755203b80"
 
 [[package]]
 name = "flake8-to-ruff"
-version = "0.0.207-dev.0"
+version = "0.0.221-dev.0"
 dependencies = [
  "anyhow",
  "clap 4.0.32",
+ "colored",
  "configparser",
  "once_cell",
  "regex",
@@ -763,7 +749,7 @@ dependencies = [
  "serde_json",
  "strum",
  "strum_macros",
- "toml",
+ "toml_edit",
 ]
 
 [[package]]
@@ -1274,13 +1260,14 @@ checksum = "d906846a98739ed9d73d66e62c2641eef8321f1734b7a1156ab045a0248fb2b3"
 
 [[package]]
 name = "nix"
-version = "0.24.3"
+version = "0.26.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fa52e972a9a719cecb6864fb88568781eb706bac2cd1d4f04a648542dbf78069"
+checksum = "46a58d1d356c6597d08cde02c2f09d785b09e28711837b1ed667dc652c08a694"
 dependencies = [
  "bitflags",
  "cfg-if 1.0.0",
  "libc",
+ "static_assertions",
 ]
 
 [[package]]
@@ -1299,6 +1286,15 @@ dependencies = [
  "version_check",
 ]
 
+[[package]]
+name = "nom8"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ae01545c9c7fc4486ab7debaf2aad7003ac19431791868fb2e8066df97fad2f8"
+dependencies = [
+ "memchr",
+]
+
 [[package]]
 name = "notify"
 version = "5.0.0"
@@ -1370,9 +1366,9 @@ dependencies = [
 
 [[package]]
 name = "once_cell"
-version = "1.16.0"
+version = "1.17.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "86f0b0d4bf799edbc74508c1e8bf170ff5f41238e5f8225603ca7caaae2b7860"
+checksum = "6f61fba1741ea2b3d6a1e3178721804bb716a68a6aeba1149b5d52e3d464ea66"
 
 [[package]]
 name = "oorandom"
@@ -1878,28 +1874,19 @@ dependencies = [
 
 [[package]]
 name = "ruff"
-version = "0.0.207"
+version = "0.0.221"
 dependencies = [
- "annotate-snippets 0.9.1",
  "anyhow",
- "assert_cmd",
- "atty",
- "bincode",
  "bitflags",
- "cachedir",
  "cfg-if 1.0.0",
  "chrono",
  "clap 4.0.32",
- "clap_complete_command",
- "clearscreen",
  "colored",
- "common-path",
  "console_error_panic_hook",
  "console_log",
  "criterion",
  "dirs 4.0.0",
  "fern",
- "filetime",
  "getrandom 0.2.8",
  "glob",
  "globset",
@@ -1911,12 +1898,10 @@ dependencies = [
  "log",
  "natord",
  "nohash-hasher",
- "notify",
  "num-bigint",
+ "num-traits",
  "once_cell",
  "path-absolutize",
- "quick-junit",
- "rayon",
  "regex",
  "ropey",
  "ruff_macros",
@@ -1928,33 +1913,65 @@ dependencies = [
  "semver",
  "serde",
  "serde-wasm-bindgen",
- "serde_json",
  "shellexpand",
- "similar",
  "strum",
  "strum_macros",
  "test-case",
  "textwrap",
  "titlecase",
- "toml",
- "update-informer",
- "ureq",
- "walkdir",
+ "toml_edit",
  "wasm-bindgen",
  "wasm-bindgen-test",
 ]
 
+[[package]]
+name = "ruff_cli"
+version = "0.0.221"
+dependencies = [
+ "annotate-snippets 0.9.1",
+ "anyhow",
+ "assert_cmd",
+ "atty",
+ "bincode",
+ "cachedir",
+ "chrono",
+ "clap 4.0.32",
+ "clap_complete_command",
+ "clearscreen",
+ "colored",
+ "filetime",
+ "glob",
+ "ignore",
+ "itertools",
+ "log",
+ "notify",
+ "path-absolutize",
+ "quick-junit",
+ "rayon",
+ "regex",
+ "ruff",
+ "rustc-hash",
+ "serde",
+ "serde_json",
+ "similar",
+ "strum",
+ "textwrap",
+ "update-informer",
+ "ureq",
+ "walkdir",
+]
+
 [[package]]
 name = "ruff_dev"
-version = "0.0.207"
+version = "0.0.221"
 dependencies = [
  "anyhow",
  "clap 4.0.32",
- "codegen",
  "itertools",
  "libcst",
  "once_cell",
  "ruff",
+ "ruff_cli",
  "rustpython-ast",
  "rustpython-common",
  "rustpython-parser",
@@ -1967,8 +1984,9 @@ dependencies = [
 
 [[package]]
 name = "ruff_macros"
-version = "0.0.207"
+version = "0.0.221"
 dependencies = [
+ "once_cell",
  "proc-macro2",
  "quote",
  "syn",
@@ -2010,7 +2028,7 @@ dependencies = [
 [[package]]
 name = "rustpython-ast"
 version = "0.1.0"
-source = "git+https://github.com/RustPython/RustPython.git?rev=71becd4059fdce4bce7010f1208ed3b1c883abba#71becd4059fdce4bce7010f1208ed3b1c883abba"
+source = "git+https://github.com/RustPython/RustPython.git?rev=d532160333ffeb6dbeca2c2728c2391cd1e53b7f#d532160333ffeb6dbeca2c2728c2391cd1e53b7f"
 dependencies = [
  "num-bigint",
  "rustpython-common",
@@ -2020,11 +2038,13 @@ dependencies = [
 [[package]]
 name = "rustpython-common"
 version = "0.0.0"
-source = "git+https://github.com/RustPython/RustPython.git?rev=71becd4059fdce4bce7010f1208ed3b1c883abba#71becd4059fdce4bce7010f1208ed3b1c883abba"
+source = "git+https://github.com/RustPython/RustPython.git?rev=d532160333ffeb6dbeca2c2728c2391cd1e53b7f#d532160333ffeb6dbeca2c2728c2391cd1e53b7f"
 dependencies = [
  "ascii",
+ "bitflags",
  "cfg-if 1.0.0",
  "hexf-parse",
+ "itertools",
  "lexical-parse-float",
  "libc",
  "lock_api",
@@ -2043,7 +2063,7 @@ dependencies = [
 [[package]]
 name = "rustpython-compiler-core"
 version = "0.1.2"
-source = "git+https://github.com/RustPython/RustPython.git?rev=71becd4059fdce4bce7010f1208ed3b1c883abba#71becd4059fdce4bce7010f1208ed3b1c883abba"
+source = "git+https://github.com/RustPython/RustPython.git?rev=d532160333ffeb6dbeca2c2728c2391cd1e53b7f#d532160333ffeb6dbeca2c2728c2391cd1e53b7f"
 dependencies = [
  "bincode",
  "bitflags",
@@ -2060,7 +2080,7 @@ dependencies = [
 [[package]]
 name = "rustpython-parser"
 version = "0.1.2"
-source = "git+https://github.com/RustPython/RustPython.git?rev=71becd4059fdce4bce7010f1208ed3b1c883abba#71becd4059fdce4bce7010f1208ed3b1c883abba"
+source = "git+https://github.com/RustPython/RustPython.git?rev=d532160333ffeb6dbeca2c2728c2391cd1e53b7f#d532160333ffeb6dbeca2c2728c2391cd1e53b7f"
 dependencies = [
  "ahash",
  "anyhow",
@@ -2499,14 +2519,27 @@ dependencies = [
 ]
 
 [[package]]
-name = "toml"
-version = "0.5.10"
+name = "toml_datetime"
+version = "0.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1333c76748e868a4d9d1017b5ab53171dfd095f70c712fdb4653a406547f598f"
+checksum = "808b51e57d0ef8f71115d8f3a01e7d3750d01c79cac4b3eda910f4389fdf92fd"
 dependencies = [
  "serde",
 ]
 
+[[package]]
+name = "toml_edit"
+version = "0.17.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a34cc558345efd7e88b9eda9626df2138b80bb46a7606f695e751c892bc7dac6"
+dependencies = [
+ "indexmap",
+ "itertools",
+ "nom8",
+ "serde",
+ "toml_datetime",
+]
+
 [[package]]
 name = "twox-hash"
 version = "1.6.3"
@@ -2638,9 +2671,9 @@ checksum = "a156c684c91ea7d62626509bce3cb4e1d9ed5c4d978f7b4352658f96a4c26b4a"
 
 [[package]]
 name = "update-informer"
-version = "0.5.0"
+version = "0.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f154aee470c0882ea0f3b1cc2a46c5f4d24f282655f7b0cec065614fe24c447f"
+checksum = "152ff185ca29f7f487c51ca785b0f1d85970c4581f4cdd12ed499227890200f5"
 dependencies = [
  "directories",
  "semver",

Cargo.toml

@@ -2,11 +2,13 @@
 members = [
   "flake8_to_ruff",
   "ruff_dev",
+  "ruff_cli",
 ]
+default-members = [".", "ruff_cli"]
 
 [package]
 name = "ruff"
-version = "0.0.207"
+version = "0.0.221"
 authors = ["Charlie Marsh <charlie.r.marsh@gmail.com>"]
 edition = "2021"
 rust-version = "1.65.0"
@@ -19,23 +21,17 @@ 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"] }
-clap_complete_command = { version = "0.4.0" }
+clap = { version = "4.0.1", features = ["derive", "env"] }
 colored = { version = "2.0.0" }
-common-path = { version = "1.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" }
@@ -44,35 +40,26 @@ libcst = { git = "https://github.com/charliermarsh/LibCST", rev = "f2f0b7a487a87
 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" }
 ropey = { version = "1.5.0", features = ["cr_lines", "simd"], default-features = false }
-ruff_macros = { version = "0.0.207", path = "ruff_macros" }
+ruff_macros = { version = "0.0.221", path = "ruff_macros" }
 rustc-hash = { version = "1.1.0" }
-rustpython-ast = { features = ["unparse"], git = "https://github.com/RustPython/RustPython.git", rev = "71becd4059fdce4bce7010f1208ed3b1c883abba" }
-rustpython-common = { git = "https://github.com/RustPython/RustPython.git", rev = "71becd4059fdce4bce7010f1208ed3b1c883abba" }
-rustpython-parser = { features = ["lalrpop"], git = "https://github.com/RustPython/RustPython.git", rev = "71becd4059fdce4bce7010f1208ed3b1c883abba" }
+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" }
-similar = { version = "2.2.1" }
 strum = { version = "0.24.1", features = ["strum_macros"] }
 strum_macros = { version = "0.24.3" }
 textwrap = { version = "0.16.0" }
 titlecase = { version = "2.2.1" }
-toml = { version = "0.5.9" }
-walkdir = { version = "2.3.2" }
-
-[target.'cfg(not(target_family = "wasm"))'.dependencies]
-clearscreen = { version = "1.0.10" }
-rayon = { version = "1.5.3" }
-update-informer = { version = "0.5.0", default-features = false, features = ["pypi"], optional = true }
+toml_edit = { version = "0.17.1", features = ["easy"] }
 
 # https://docs.rs/getrandom/0.2.7/getrandom/#webassembly-support
 # For (future) wasm-pack support
@@ -87,17 +74,11 @@ wasm-bindgen = { version = "0.2.83" }
 [dev-dependencies]
 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"

LICENSE

@@ -19,650 +19,3 @@ 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.
-
-The externally maintained libraries from which parts of the Software is derived
-are:
-
-- Pyflakes, licensed as follows:
-  """
-    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.
-  """
-
-- autoflake, licensed as follows:
-  """
-    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.
-  """
-
-- Flake8, licensed as follows:
-  """
-    == 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.
-  """
-
-- flake8-2020, licensed as follows:
-  """
-    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.
-  """
-
-- flake8-annotations, licensed as follows:
-  """
-    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.
-  """
-
-- flake8-bandit, licensed as follows:
-  """
-    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.
-  """
-
-- flake8-blind-except, licensed as follows:
-  """
-    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.
-  """
-
-- flake8-bugbear, licensed as follows:
-  """
-    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.
-  """
-
-- flake8-comprehensions, licensed as follows:
-  """
-    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.
-  """
-
-- flake8-debugger, licensed as follows:
-  """
-    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.
-  """
-
-- flake8-eradicate, licensed as follows:
-  """
-    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.
-  """
-
-- flake8-tidy-imports, licensed as follows:
-  """
-    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.
-  """
-
-- flake8-print, licensed as follows:
-  """
-    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.
-  """
-
-- flake8-quotes, licensed as follows:
-  """
-    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.
-  """
-
-- flake8-return, licensed as follows:
-  """
-    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.
-  """
-
-- flake8-implicit-str-concat, licensed as follows:
-  """
-    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.
-  """
-
-- flake8-import-conventions, licensed as follows:
-  """
-    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.
-  """
-
-- flake8-unused-arguments, licensed as follows:
-  """
-    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.
-  """
-
-- flake8-simplify, licensed as follows:
-  """
-    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.
-  """
-
-- isort, licensed as follows:
-  """
-    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.
-  """
-
-- pep8-naming, licensed as follows:
-  """
-    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.
-  """
-
-- pycodestyle, licensed as follows:
-  """
-    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.
-  """
-
-- pydocstyle, licensed as follows:
-  """
-    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.
-  """
-
-- pygrep-hooks, licensed as follows:
-  """
-    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.
-  """
-
-- pyupgrade, licensed as follows:
-  """
-    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.
-  """
-
-- RustPython, licensed as follows:
-  """
-    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.
-  """

assets/badge/v0.json

@@ -0,0 +1,8 @@
+{
+  "label": "",
+  "message": "Ruff",
+  "logoSvg": "<svg xmlns=\"http://www.w3.org/2000/svg\" width=\"128\" height=\"128\"><path d=\"M115.36 61.84 70.22 50.49 114.45 2.4a1.222 1.222 0 0 0-1.54-1.87L12.3 61.98c-.41.25-.64.72-.57 1.2.06.48.4.87.87 1.01l45.07 13.25-44.29 48.16c-.42.46-.44 1.15-.04 1.61.24.29.58.44.94.44.22 0 .45-.06.65-.19l100.78-63.41c.42-.26.64-.75.56-1.22-.08-.49-.43-.88-.91-.99z\" style=\"fill:#fcc21b\"/></svg>",
+  "logoWidth": 10,
+  "labelColor": "grey",
+  "color": "#E15759"
+}

assets/badge/v1.json

@@ -0,0 +1,8 @@
+{
+  "label": "",
+  "message": "Ruff",
+  "logoSvg": "<svg xmlns=\"http://www.w3.org/2000/svg\" width=\"109\" height=\"132\" fill=\"none\"><g filter=\"url(#a)\"><path fill=\"#FCC21B\" d=\"m103.642 61.492-45.14-11.35 44.23-48.09a1.222 1.222 0 0 0-1.54-1.87L.582 61.632c-.41.25-.64.72-.57 1.2.06.48.4.87.87 1.01l45.07 13.25-44.29 48.16c-.42.46-.44 1.15-.04 1.61.24.29.58.44.94.44.22 0 .45-.06.65-.19l100.78-63.41c.42-.26.64-.75.56-1.22-.08-.49-.43-.88-.91-.99Z\"/></g><defs><filter id=\"a\" width=\"108.569\" height=\"131.302\" x=\"0\" y=\"0\" color-interpolation-filters=\"sRGB\" filterUnits=\"userSpaceOnUse\"><feFlood flood-opacity=\"0\" result=\"BackgroundImageFix\"/><feColorMatrix in=\"SourceAlpha\" result=\"hardAlpha\" values=\"0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0\"/><feOffset dx=\"4\" dy=\"4\"/><feComposite in2=\"hardAlpha\" operator=\"out\"/><feColorMatrix values=\"0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 0\"/><feBlend in2=\"BackgroundImageFix\" result=\"effect1_dropShadow_7_4\"/><feBlend in=\"SourceGraphic\" in2=\"effect1_dropShadow_7_4\" result=\"shape\"/></filter></defs></svg>",
+  "logoWidth": 10,
+  "labelColor": "grey",
+  "color": "#E15759"
+}

flake8_to_ruff/Cargo.lock

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

flake8_to_ruff/Cargo.toml

@@ -1,14 +1,16 @@
 [package]
 name = "flake8-to-ruff"
-version = "0.0.207-dev.0"
+version = "0.0.221-dev.0"
 edition = "2021"
 
 [lib]
 name = "flake8_to_ruff"
+doctest = false
 
 [dependencies]
 anyhow = { version = "1.0.66" }
 clap = { version = "4.0.1", features = ["derive"] }
+colored = { version = "2.0.0" }
 configparser = { version = "3.0.2" }
 once_cell = { version = "1.16.0" }
 regex = { version = "1.6.0" }
@@ -18,7 +20,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.5.9" }
+toml_edit = { version = "0.17.1", features = ["easy"] }
 
 [dev-dependencies]
 

flake8_to_ruff/README.md

@@ -84,7 +84,7 @@ flake8-to-ruff path/to/.flake8 --plugin flake8-builtins --plugin flake8-quotes
 1. Ruff only supports a subset of the Flake configuration options. `flake8-to-ruff` will warn on and
    ignore unsupported options in the `.flake8` file (or equivalent). (Similarly, Ruff has a few
    configuration options that don't exist in Flake8.)
-2. Ruff will omit any error codes that are unimplemented or unsupported by Ruff, including error
+2. Ruff will omit any rule codes that are unimplemented or unsupported by Ruff, including rule
    codes from unsupported plugins. (See the [Ruff README](https://github.com/charliermarsh/ruff#user-content-how-does-ruff-compare-to-flake8)
    for the complete list of supported plugins.)
 

flake8_to_ruff/examples/jupyterhub.ini

@@ -0,0 +1,19 @@
+[flake8]
+# Ignore style and complexity
+# E: style errors
+# W: style warnings
+# C: complexity
+# D: docstring warnings (unused pydocstyle extension)
+# F841: local variable assigned but never used
+ignore = E, C, W, D, F841
+builtins = c, get_config
+exclude =
+    .cache,
+    .github,
+    docs,
+    jupyterhub/alembic*,
+    onbuild,
+    scripts,
+    share,
+    tools,
+    setup.py

flake8_to_ruff/examples/manim.ini

@@ -0,0 +1,43 @@
+[flake8]
+# Exclude the grpc generated code
+exclude = ./manim/grpc/gen/*
+max-complexity = 15
+max-line-length = 88
+statistics = True
+# Prevents some flake8-rst-docstrings errors
+rst-roles = attr,class,func,meth,mod,obj,ref,doc,exc
+rst-directives = manim, SEEALSO, seealso
+docstring-convention=numpy
+
+select = A,A00,B,B9,C4,C90,D,E,F,F,PT,RST,SIM,W
+
+                # General Compatibility
+extend-ignore = E203, W503, D202, D212, D213, D404
+
+                # Misc
+                F401, F403, F405, F841, E501, E731, E402, F811, F821,
+
+                # Plug-in: flake8-builtins
+                A001, A002, A003,
+
+                # Plug-in: flake8-bugbear
+                B006, B007, B008, B009, B010, B903, B950,
+
+                # Plug-in: flake8-simplify
+                SIM105, SIM106, SIM119,
+
+                # Plug-in: flake8-comprehensions
+                C901
+
+                # Plug-in: flake8-pytest-style
+                PT001, PT004, PT006, PT011, PT018, PT022, PT023,
+
+                # Plug-in: flake8-docstrings
+                D100, D101, D102, D103, D104, D105, D106, D107,
+                D200, D202, D204, D205, D209,
+                D301,
+                D400, D401, D402, D403, D405, D406, D407, D409, D411, D412, D414,
+
+                # Plug-in: flake8-rst-docstrings
+                RST201, RST203, RST210, RST212, RST213, RST215,
+                RST301, RST303,

flake8_to_ruff/src/black.rs

@@ -26,7 +26,7 @@ struct Pyproject {
 
 pub fn parse_black_options<P: AsRef<Path>>(path: P) -> Result<Option<Black>> {
     let contents = std::fs::read_to_string(path)?;
-    Ok(toml::from_str::<Pyproject>(&contents)?
+    Ok(toml_edit::easy::from_str::<Pyproject>(&contents)?
         .tool
         .and_then(|tool| tool.black))
 }

flake8_to_ruff/src/converter.rs

@@ -1,15 +1,19 @@
 use std::collections::{BTreeSet, HashMap};
 
 use anyhow::Result;
-use ruff::checks_gen::CheckCodePrefix;
+use colored::Colorize;
+use ruff::flake8_pytest_style::types::{
+    ParametrizeNameType, ParametrizeValuesRowType, ParametrizeValuesType,
+};
 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_quotes, flake8_tidy_imports, mccabe,
-    pep8_naming, pydocstyle,
+    flake8_annotations, flake8_bugbear, flake8_errmsg, flake8_pytest_style, flake8_quotes,
+    flake8_tidy_imports, mccabe, pep8_naming, pydocstyle, warn_user,
 };
 
 use crate::black::Black;
@@ -26,8 +30,8 @@ pub fn convert(
         .get("flake8")
         .expect("Unable to find flake8 section in INI file");
 
-    // Extract all referenced check code prefixes, to power plugin inference.
-    let mut referenced_codes: BTreeSet<CheckCodePrefix> = BTreeSet::default();
+    // Extract all referenced rule code prefixes, to power plugin inference.
+    let mut referenced_codes: BTreeSet<RuleCodePrefix> = BTreeSet::default();
     for (key, value) in flake8 {
         if let Some(value) = value {
             match key.as_str() {
@@ -49,6 +53,19 @@ pub fn convert(
         }
     }
 
+    // Infer plugins, if not provided.
+    let plugins = plugins.unwrap_or_else(|| {
+        let from_options = plugin::infer_plugins_from_options(flake8);
+        if !from_options.is_empty() {
+            eprintln!("Inferred plugins from settings: {from_options:#?}");
+        }
+        let from_codes = plugin::infer_plugins_from_codes(&referenced_codes);
+        if !from_codes.is_empty() {
+            eprintln!("Inferred plugins from referenced codes: {from_codes:#?}");
+        }
+        from_options.into_iter().chain(from_codes).collect()
+    });
+
     // Check if the user has specified a `select`. If not, we'll add our own
     // default `select`, and populate it based on user plugins.
     let mut select = flake8
@@ -58,22 +75,7 @@ pub fn convert(
                 .as_ref()
                 .map(|value| BTreeSet::from_iter(parser::parse_prefix_codes(value)))
         })
-        .unwrap_or_else(|| {
-            plugin::resolve_select(
-                flake8,
-                &plugins.unwrap_or_else(|| {
-                    let from_options = plugin::infer_plugins_from_options(flake8);
-                    if !from_options.is_empty() {
-                        eprintln!("Inferred plugins from settings: {from_options:#?}");
-                    }
-                    let from_codes = plugin::infer_plugins_from_codes(&referenced_codes);
-                    if !from_codes.is_empty() {
-                        eprintln!("Inferred plugins from referenced check codes: {from_codes:#?}");
-                    }
-                    from_options.into_iter().chain(from_codes).collect()
-                }),
-            )
-        });
+        .unwrap_or_else(|| plugin::resolve_select(&plugins));
     let mut ignore = flake8
         .get("ignore")
         .and_then(|value| {
@@ -88,6 +90,7 @@ pub fn convert(
     let mut flake8_annotations = flake8_annotations::settings::Options::default();
     let mut flake8_bugbear = flake8_bugbear::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::settings::Options::default();
     let mut mccabe = mccabe::settings::Options::default();
@@ -97,9 +100,14 @@ pub fn convert(
         if let Some(value) = value {
             match key.as_str() {
                 // flake8
+                "builtins" => {
+                    options.builtins = Some(parser::parse_strings(value.as_ref()));
+                }
                 "max-line-length" | "max_line_length" => match value.clone().parse::<usize>() {
                     Ok(line_length) => options.line_length = Some(line_length),
-                    Err(e) => eprintln!("Unable to parse '{key}' property: {e}"),
+                    Err(e) => {
+                        warn_user!("Unable to parse '{key}' property: {e}");
+                    }
                 },
                 "select" => {
                     // No-op (handled above).
@@ -128,7 +136,9 @@ pub fn convert(
                             options.per_file_ignores =
                                 Some(parser::collect_per_file_ignores(per_file_ignores));
                         }
-                        Err(e) => eprintln!("Unable to parse '{key}' property: {e}"),
+                        Err(e) => {
+                            warn_user!("Unable to parse '{key}' property: {e}");
+                        }
                     }
                 }
                 // flake8-bugbear
@@ -140,46 +150,62 @@ pub fn convert(
                 "suppress-none-returning" | "suppress_none_returning" => {
                     match parser::parse_bool(value.as_ref()) {
                         Ok(bool) => flake8_annotations.suppress_none_returning = Some(bool),
-                        Err(e) => eprintln!("Unable to parse '{key}' property: {e}"),
+                        Err(e) => {
+                            warn_user!("Unable to parse '{key}' property: {e}");
+                        }
                     }
                 }
                 "suppress-dummy-args" | "suppress_dummy_args" => {
                     match parser::parse_bool(value.as_ref()) {
                         Ok(bool) => flake8_annotations.suppress_dummy_args = Some(bool),
-                        Err(e) => eprintln!("Unable to parse '{key}' property: {e}"),
+                        Err(e) => {
+                            warn_user!("Unable to parse '{key}' property: {e}");
+                        }
                     }
                 }
                 "mypy-init-return" | "mypy_init_return" => {
                     match parser::parse_bool(value.as_ref()) {
                         Ok(bool) => flake8_annotations.mypy_init_return = Some(bool),
-                        Err(e) => eprintln!("Unable to parse '{key}' property: {e}"),
+                        Err(e) => {
+                            warn_user!("Unable to parse '{key}' property: {e}");
+                        }
                     }
                 }
                 "allow-star-arg-any" | "allow_star_arg_any" => {
                     match parser::parse_bool(value.as_ref()) {
                         Ok(bool) => flake8_annotations.allow_star_arg_any = Some(bool),
-                        Err(e) => eprintln!("Unable to parse '{key}' property: {e}"),
+                        Err(e) => {
+                            warn_user!("Unable to parse '{key}' property: {e}");
+                        }
                     }
                 }
                 // flake8-quotes
                 "quotes" | "inline-quotes" | "inline_quotes" => match value.trim() {
                     "'" | "single" => flake8_quotes.inline_quotes = Some(Quote::Single),
                     "\"" | "double" => flake8_quotes.inline_quotes = Some(Quote::Double),
-                    _ => eprintln!("Unexpected '{key}' value: {value}"),
+                    _ => {
+                        warn_user!("Unexpected '{key}' value: {value}");
+                    }
                 },
                 "multiline-quotes" | "multiline_quotes" => match value.trim() {
                     "'" | "single" => flake8_quotes.multiline_quotes = Some(Quote::Single),
                     "\"" | "double" => flake8_quotes.multiline_quotes = Some(Quote::Double),
-                    _ => eprintln!("Unexpected '{key}' value: {value}"),
+                    _ => {
+                        warn_user!("Unexpected '{key}' value: {value}");
+                    }
                 },
                 "docstring-quotes" | "docstring_quotes" => match value.trim() {
                     "'" | "single" => flake8_quotes.docstring_quotes = Some(Quote::Single),
                     "\"" | "double" => flake8_quotes.docstring_quotes = Some(Quote::Double),
-                    _ => eprintln!("Unexpected '{key}' value: {value}"),
+                    _ => {
+                        warn_user!("Unexpected '{key}' value: {value}");
+                    }
                 },
                 "avoid-escape" | "avoid_escape" => match parser::parse_bool(value.as_ref()) {
                     Ok(bool) => flake8_quotes.avoid_escape = Some(bool),
-                    Err(e) => eprintln!("Unable to parse '{key}' property: {e}"),
+                    Err(e) => {
+                        warn_user!("Unable to parse '{key}' property: {e}");
+                    }
                 },
                 // pep8-naming
                 "ignore-names" | "ignore_names" => {
@@ -199,19 +225,26 @@ pub fn convert(
                     "parents" => {
                         flake8_tidy_imports.ban_relative_imports = Some(Strictness::Parents);
                     }
-                    _ => eprintln!("Unexpected '{key}' value: {value}"),
+                    _ => {
+                        warn_user!("Unexpected '{key}' value: {value}");
+                    }
                 },
                 // flake8-docstrings
                 "docstring-convention" => match value.trim() {
                     "google" => pydocstyle.convention = Some(Convention::Google),
                     "numpy" => pydocstyle.convention = Some(Convention::Numpy),
-                    "pep257" | "all" => pydocstyle.convention = None,
-                    _ => eprintln!("Unexpected '{key}' value: {value}"),
+                    "pep257" => pydocstyle.convention = Some(Convention::Pep257),
+                    "all" => pydocstyle.convention = None,
+                    _ => {
+                        warn_user!("Unexpected '{key}' value: {value}");
+                    }
                 },
                 // mccabe
                 "max-complexity" | "max_complexity" => match value.clone().parse::<usize>() {
                     Ok(max_complexity) => mccabe.max_complexity = Some(max_complexity),
-                    Err(e) => eprintln!("Unable to parse '{key}' property: {e}"),
+                    Err(e) => {
+                        warn_user!("Unable to parse '{key}' property: {e}");
+                    }
                 },
                 // flake8-errmsg
                 "errmsg-max-string-length" | "errmsg_max_string_length" => {
@@ -219,11 +252,85 @@ pub fn convert(
                         Ok(max_string_length) => {
                             flake8_errmsg.max_string_length = Some(max_string_length);
                         }
-                        Err(e) => eprintln!("Unable to parse '{key}' property: {e}"),
+                        Err(e) => {
+                            warn_user!("Unable to parse '{key}' property: {e}");
+                        }
+                    }
+                }
+                // flake8-pytest-style
+                "pytest-fixture-no-parentheses" | "pytest_fixture_no_parentheses " => {
+                    match parser::parse_bool(value.as_ref()) {
+                        Ok(bool) => flake8_pytest_style.fixture_parentheses = Some(!bool),
+                        Err(e) => {
+                            warn_user!("Unable to parse '{key}' property: {e}");
+                        }
+                    }
+                }
+                "pytest-parametrize-names-type" | "pytest_parametrize_names_type" => {
+                    match value.trim() {
+                        "csv" => {
+                            flake8_pytest_style.parametrize_names_type =
+                                Some(ParametrizeNameType::CSV);
+                        }
+                        "tuple" => {
+                            flake8_pytest_style.parametrize_names_type =
+                                Some(ParametrizeNameType::Tuple);
+                        }
+                        "list" => {
+                            flake8_pytest_style.parametrize_names_type =
+                                Some(ParametrizeNameType::List);
+                        }
+                        _ => {
+                            warn_user!("Unexpected '{key}' value: {value}");
+                        }
+                    }
+                }
+                "pytest-parametrize-values-type" | "pytest_parametrize_values_type" => {
+                    match value.trim() {
+                        "tuple" => {
+                            flake8_pytest_style.parametrize_values_type =
+                                Some(ParametrizeValuesType::Tuple);
+                        }
+                        "list" => {
+                            flake8_pytest_style.parametrize_values_type =
+                                Some(ParametrizeValuesType::List);
+                        }
+                        _ => {
+                            warn_user!("Unexpected '{key}' value: {value}");
+                        }
+                    }
+                }
+                "pytest-parametrize-values-row-type" | "pytest_parametrize_values_row_type" => {
+                    match value.trim() {
+                        "tuple" => {
+                            flake8_pytest_style.parametrize_values_row_type =
+                                Some(ParametrizeValuesRowType::Tuple);
+                        }
+                        "list" => {
+                            flake8_pytest_style.parametrize_values_row_type =
+                                Some(ParametrizeValuesRowType::List);
+                        }
+                        _ => {
+                            warn_user!("Unexpected '{key}' value: {value}");
+                        }
+                    }
+                }
+                "pytest-raises-require-match-for" | "pytest_raises_require_match_for" => {
+                    flake8_pytest_style.raises_require_match_for =
+                        Some(parser::parse_strings(value.as_ref()));
+                }
+                "pytest-mark-no-parentheses" | "pytest_mark_no_parentheses" => {
+                    match parser::parse_bool(value.as_ref()) {
+                        Ok(bool) => flake8_pytest_style.mark_parentheses = Some(!bool),
+                        Err(e) => {
+                            warn_user!("Unable to parse '{key}' property: {e}");
+                        }
                     }
                 }
                 // Unknown
-                _ => eprintln!("Skipping unsupported property: {key}"),
+                _ => {
+                    warn_user!("Skipping unsupported property: {}", key);
+                }
             }
         }
     }
@@ -240,6 +347,9 @@ pub fn convert(
     if flake8_errmsg != flake8_errmsg::settings::Options::default() {
         options.flake8_errmsg = Some(flake8_errmsg);
     }
+    if flake8_pytest_style != flake8_pytest_style::settings::Options::default() {
+        options.flake8_pytest_style = Some(flake8_pytest_style);
+    }
     if flake8_quotes != flake8_quotes::settings::Options::default() {
         options.flake8_quotes = Some(flake8_quotes);
     }
@@ -278,8 +388,8 @@ mod tests {
     use std::collections::HashMap;
 
     use anyhow::Result;
-    use ruff::checks_gen::CheckCodePrefix;
     use ruff::pydocstyle::settings::Convention;
+    use ruff::registry::RuleCodePrefix;
     use ruff::settings::options::Options;
     use ruff::settings::pyproject::Pyproject;
     use ruff::{flake8_quotes, pydocstyle};
@@ -296,6 +406,7 @@ mod tests {
         )?;
         let expected = Pyproject::new(Options {
             allowed_confusables: None,
+            builtins: None,
             cache_dir: None,
             dummy_variable_rgx: None,
             exclude: None,
@@ -316,18 +427,22 @@ mod tests {
             required_version: None,
             respect_gitignore: None,
             select: Some(vec![
-                CheckCodePrefix::E,
-                CheckCodePrefix::F,
-                CheckCodePrefix::W,
+                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,
@@ -335,6 +450,7 @@ mod tests {
             isort: None,
             mccabe: None,
             pep8_naming: None,
+            pycodestyle: None,
             pydocstyle: None,
             pyupgrade: None,
         });
@@ -355,6 +471,7 @@ mod tests {
         )?;
         let expected = Pyproject::new(Options {
             allowed_confusables: None,
+            builtins: None,
             cache_dir: None,
             dummy_variable_rgx: None,
             exclude: None,
@@ -375,18 +492,22 @@ mod tests {
             required_version: None,
             respect_gitignore: None,
             select: Some(vec![
-                CheckCodePrefix::E,
-                CheckCodePrefix::F,
-                CheckCodePrefix::W,
+                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,
@@ -394,6 +515,7 @@ mod tests {
             isort: None,
             mccabe: None,
             pep8_naming: None,
+            pycodestyle: None,
             pydocstyle: None,
             pyupgrade: None,
         });
@@ -414,6 +536,7 @@ mod tests {
         )?;
         let expected = Pyproject::new(Options {
             allowed_confusables: None,
+            builtins: None,
             cache_dir: None,
             dummy_variable_rgx: None,
             exclude: None,
@@ -434,18 +557,22 @@ mod tests {
             required_version: None,
             respect_gitignore: None,
             select: Some(vec![
-                CheckCodePrefix::E,
-                CheckCodePrefix::F,
-                CheckCodePrefix::W,
+                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,
@@ -453,6 +580,7 @@ mod tests {
             isort: None,
             mccabe: None,
             pep8_naming: None,
+            pycodestyle: None,
             pydocstyle: None,
             pyupgrade: None,
         });
@@ -473,6 +601,7 @@ mod tests {
         )?;
         let expected = Pyproject::new(Options {
             allowed_confusables: None,
+            builtins: None,
             cache_dir: None,
             dummy_variable_rgx: None,
             exclude: None,
@@ -493,18 +622,22 @@ mod tests {
             required_version: None,
             respect_gitignore: None,
             select: Some(vec![
-                CheckCodePrefix::E,
-                CheckCodePrefix::F,
-                CheckCodePrefix::W,
+                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,
@@ -512,6 +645,7 @@ mod tests {
             isort: None,
             mccabe: None,
             pep8_naming: None,
+            pycodestyle: None,
             pydocstyle: None,
             pyupgrade: None,
         });
@@ -532,6 +666,7 @@ mod tests {
         )?;
         let expected = Pyproject::new(Options {
             allowed_confusables: None,
+            builtins: None,
             cache_dir: None,
             dummy_variable_rgx: None,
             exclude: None,
@@ -552,18 +687,22 @@ mod tests {
             required_version: None,
             respect_gitignore: None,
             select: Some(vec![
-                CheckCodePrefix::E,
-                CheckCodePrefix::F,
-                CheckCodePrefix::W,
+                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,
@@ -576,6 +715,7 @@ mod tests {
             isort: None,
             mccabe: None,
             pep8_naming: None,
+            pycodestyle: None,
             pydocstyle: None,
             pyupgrade: None,
         });
@@ -599,6 +739,7 @@ mod tests {
         )?;
         let expected = Pyproject::new(Options {
             allowed_confusables: None,
+            builtins: None,
             cache_dir: None,
             dummy_variable_rgx: None,
             exclude: None,
@@ -619,54 +760,23 @@ mod tests {
             required_version: None,
             respect_gitignore: None,
             select: Some(vec![
-                CheckCodePrefix::D100,
-                CheckCodePrefix::D101,
-                CheckCodePrefix::D102,
-                CheckCodePrefix::D103,
-                CheckCodePrefix::D104,
-                CheckCodePrefix::D105,
-                CheckCodePrefix::D106,
-                CheckCodePrefix::D200,
-                CheckCodePrefix::D201,
-                CheckCodePrefix::D202,
-                CheckCodePrefix::D204,
-                CheckCodePrefix::D205,
-                CheckCodePrefix::D206,
-                CheckCodePrefix::D207,
-                CheckCodePrefix::D208,
-                CheckCodePrefix::D209,
-                CheckCodePrefix::D210,
-                CheckCodePrefix::D211,
-                CheckCodePrefix::D214,
-                CheckCodePrefix::D215,
-                CheckCodePrefix::D300,
-                CheckCodePrefix::D301,
-                CheckCodePrefix::D400,
-                CheckCodePrefix::D403,
-                CheckCodePrefix::D404,
-                CheckCodePrefix::D405,
-                CheckCodePrefix::D406,
-                CheckCodePrefix::D407,
-                CheckCodePrefix::D408,
-                CheckCodePrefix::D409,
-                CheckCodePrefix::D410,
-                CheckCodePrefix::D411,
-                CheckCodePrefix::D412,
-                CheckCodePrefix::D414,
-                CheckCodePrefix::D418,
-                CheckCodePrefix::D419,
-                CheckCodePrefix::E,
-                CheckCodePrefix::F,
-                CheckCodePrefix::W,
+                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,
@@ -674,6 +784,7 @@ mod tests {
             isort: None,
             mccabe: None,
             pep8_naming: None,
+            pycodestyle: None,
             pydocstyle: Some(pydocstyle::settings::Options {
                 convention: Some(Convention::Numpy),
             }),
@@ -696,6 +807,7 @@ mod tests {
         )?;
         let expected = Pyproject::new(Options {
             allowed_confusables: None,
+            builtins: None,
             cache_dir: None,
             dummy_variable_rgx: None,
             exclude: None,
@@ -716,19 +828,23 @@ mod tests {
             required_version: None,
             respect_gitignore: None,
             select: Some(vec![
-                CheckCodePrefix::E,
-                CheckCodePrefix::F,
-                CheckCodePrefix::Q,
-                CheckCodePrefix::W,
+                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,
@@ -741,6 +857,7 @@ mod tests {
             isort: None,
             mccabe: None,
             pep8_naming: None,
+            pycodestyle: None,
             pydocstyle: None,
             pyupgrade: None,
         });

flake8_to_ruff/src/lib.rs

@@ -10,6 +10,7 @@
     clippy::similar_names,
     clippy::too_many_lines
 )]
+#![forbid(unsafe_code)]
 
 pub mod black;
 pub mod converter;

flake8_to_ruff/src/main.rs

@@ -11,6 +11,7 @@
     clippy::similar_names,
     clippy::too_many_lines
 )]
+#![forbid(unsafe_code)]
 
 use std::path::PathBuf;
 
@@ -57,7 +58,7 @@ fn main() -> Result<()> {
 
     // Create Ruff's pyproject.toml section.
     let pyproject = converter::convert(&config, black.as_ref(), cli.plugin)?;
-    println!("{}", toml::to_string_pretty(&pyproject)?);
+    println!("{}", toml_edit::easy::to_string_pretty(&pyproject)?);
 
     Ok(())
 }

flake8_to_ruff/src/parser.rs

@@ -1,19 +1,20 @@
 use std::str::FromStr;
 
 use anyhow::{bail, Result};
+use colored::Colorize;
 use once_cell::sync::Lazy;
 use regex::Regex;
-use ruff::checks::PREFIX_REDIRECTS;
-use ruff::checks_gen::CheckCodePrefix;
+use ruff::registry::{RuleCodePrefix, PREFIX_REDIRECTS};
 use ruff::settings::types::PatternPrefixPair;
+use ruff::warn_user;
 use rustc_hash::FxHashMap;
 
 static COMMA_SEPARATED_LIST_RE: Lazy<Regex> = Lazy::new(|| Regex::new(r"[,\s]").unwrap());
 
-/// Parse a comma-separated list of `CheckCodePrefix` values (e.g.,
+/// Parse a comma-separated list of `RuleCodePrefix` values (e.g.,
 /// "F401,E501").
-pub fn parse_prefix_codes(value: &str) -> Vec<CheckCodePrefix> {
-    let mut codes: Vec<CheckCodePrefix> = 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() {
@@ -21,10 +22,10 @@ pub fn parse_prefix_codes(value: &str) -> Vec<CheckCodePrefix> {
         }
         if let Some(code) = PREFIX_REDIRECTS.get(code) {
             codes.push(code.clone());
-        } else if let Ok(code) = CheckCodePrefix::from_str(code) {
+        } else if let Ok(code) = RuleCodePrefix::from_str(code) {
             codes.push(code);
         } else {
-            eprintln!("Unsupported prefix code: {code}");
+            warn_user!("Unsupported prefix code: {code}");
         }
     }
     codes
@@ -82,7 +83,8 @@ impl State {
         }
     }
 
-    /// Generate the list of `StrCheckCodePair` pairs for the current state.
+    /// Generate the list of `StrRuleCodePair` pairs for the current
+    /// state.
     fn parse(&self) -> Vec<PatternPrefixPair> {
         let mut codes: Vec<PatternPrefixPair> = vec![];
         for code in &self.codes {
@@ -93,7 +95,7 @@ impl State {
                         prefix: code.clone(),
                     });
                 }
-            } else if let Ok(code) = CheckCodePrefix::from_str(code) {
+            } else if let Ok(code) = RuleCodePrefix::from_str(code) {
                 for filename in &self.filenames {
                     codes.push(PatternPrefixPair {
                         pattern: filename.clone(),
@@ -101,7 +103,7 @@ impl State {
                     });
                 }
             } else {
-                eprintln!("Unsupported prefix code: {code}");
+                warn_user!("Unsupported prefix code: {code}");
             }
         }
         codes
@@ -128,7 +130,7 @@ fn tokenize_files_to_codes_mapping(value: &str) -> Vec<Token> {
                 if mat.start() == 0 {
                     tokens.push(Token {
                         token_name,
-                        src: mat.as_str().to_string().trim().to_string(),
+                        src: mat.as_str().trim().to_string(),
                     });
                     i += mat.end();
                     break;
@@ -187,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<CheckCodePrefix>> {
-    let mut per_file_ignores: FxHashMap<String, Vec<CheckCodePrefix>> = 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)
@@ -201,7 +203,7 @@ pub fn collect_per_file_ignores(
 #[cfg(test)]
 mod tests {
     use anyhow::Result;
-    use ruff::checks_gen::CheckCodePrefix;
+    use ruff::registry::RuleCodePrefix;
     use ruff::settings::types::PatternPrefixPair;
 
     use crate::parser::{parse_files_to_codes_mapping, parse_prefix_codes, parse_strings};
@@ -209,27 +211,27 @@ mod tests {
     #[test]
     fn it_parses_prefix_codes() {
         let actual = parse_prefix_codes("");
-        let expected: Vec<CheckCodePrefix> = vec![];
+        let expected: Vec<RuleCodePrefix> = vec![];
         assert_eq!(actual, expected);
 
         let actual = parse_prefix_codes(" ");
-        let expected: Vec<CheckCodePrefix> = vec![];
+        let expected: Vec<RuleCodePrefix> = vec![];
         assert_eq!(actual, expected);
 
         let actual = parse_prefix_codes("F401");
-        let expected = vec![CheckCodePrefix::F401];
+        let expected = vec![RuleCodePrefix::F401];
         assert_eq!(actual, expected);
 
         let actual = parse_prefix_codes("F401,");
-        let expected = vec![CheckCodePrefix::F401];
+        let expected = vec![RuleCodePrefix::F401];
         assert_eq!(actual, expected);
 
         let actual = parse_prefix_codes("F401,E501");
-        let expected = vec![CheckCodePrefix::F401, CheckCodePrefix::E501];
+        let expected = vec![RuleCodePrefix::F401, RuleCodePrefix::E501];
         assert_eq!(actual, expected);
 
         let actual = parse_prefix_codes("F401, E501");
-        let expected = vec![CheckCodePrefix::F401, CheckCodePrefix::E501];
+        let expected = vec![RuleCodePrefix::F401, RuleCodePrefix::E501];
         assert_eq!(actual, expected);
     }
 
@@ -282,11 +284,11 @@ mod tests {
         let expected: Vec<PatternPrefixPair> = vec![
             PatternPrefixPair {
                 pattern: "locust/test/*".to_string(),
-                prefix: CheckCodePrefix::F841,
+                prefix: RuleCodePrefix::F841,
             },
             PatternPrefixPair {
                 pattern: "examples/*".to_string(),
-                prefix: CheckCodePrefix::F841,
+                prefix: RuleCodePrefix::F841,
             },
         ];
         assert_eq!(actual, expected);
@@ -302,23 +304,23 @@ mod tests {
         let expected: Vec<PatternPrefixPair> = vec![
             PatternPrefixPair {
                 pattern: "t/*".to_string(),
-                prefix: CheckCodePrefix::D,
+                prefix: RuleCodePrefix::D,
             },
             PatternPrefixPair {
                 pattern: "setup.py".to_string(),
-                prefix: CheckCodePrefix::D,
+                prefix: RuleCodePrefix::D,
             },
             PatternPrefixPair {
                 pattern: "examples/*".to_string(),
-                prefix: CheckCodePrefix::D,
+                prefix: RuleCodePrefix::D,
             },
             PatternPrefixPair {
                 pattern: "docs/*".to_string(),
-                prefix: CheckCodePrefix::D,
+                prefix: RuleCodePrefix::D,
             },
             PatternPrefixPair {
                 pattern: "extra/*".to_string(),
-                prefix: CheckCodePrefix::D,
+                prefix: RuleCodePrefix::D,
             },
         ];
         assert_eq!(actual, expected);
@@ -340,47 +342,47 @@ mod tests {
         let expected: Vec<PatternPrefixPair> = vec![
             PatternPrefixPair {
                 pattern: "scrapy/__init__.py".to_string(),
-                prefix: CheckCodePrefix::E402,
+                prefix: RuleCodePrefix::E402,
             },
             PatternPrefixPair {
                 pattern: "scrapy/core/downloader/handlers/http.py".to_string(),
-                prefix: CheckCodePrefix::F401,
+                prefix: RuleCodePrefix::F401,
             },
             PatternPrefixPair {
                 pattern: "scrapy/http/__init__.py".to_string(),
-                prefix: CheckCodePrefix::F401,
+                prefix: RuleCodePrefix::F401,
             },
             PatternPrefixPair {
                 pattern: "scrapy/linkextractors/__init__.py".to_string(),
-                prefix: CheckCodePrefix::E402,
+                prefix: RuleCodePrefix::E402,
             },
             PatternPrefixPair {
                 pattern: "scrapy/linkextractors/__init__.py".to_string(),
-                prefix: CheckCodePrefix::F401,
+                prefix: RuleCodePrefix::F401,
             },
             PatternPrefixPair {
                 pattern: "scrapy/selector/__init__.py".to_string(),
-                prefix: CheckCodePrefix::F401,
+                prefix: RuleCodePrefix::F401,
             },
             PatternPrefixPair {
                 pattern: "scrapy/spiders/__init__.py".to_string(),
-                prefix: CheckCodePrefix::E402,
+                prefix: RuleCodePrefix::E402,
             },
             PatternPrefixPair {
                 pattern: "scrapy/spiders/__init__.py".to_string(),
-                prefix: CheckCodePrefix::F401,
+                prefix: RuleCodePrefix::F401,
             },
             PatternPrefixPair {
                 pattern: "scrapy/utils/url.py".to_string(),
-                prefix: CheckCodePrefix::F403,
+                prefix: RuleCodePrefix::F403,
             },
             PatternPrefixPair {
                 pattern: "scrapy/utils/url.py".to_string(),
-                prefix: CheckCodePrefix::F405,
+                prefix: RuleCodePrefix::F405,
             },
             PatternPrefixPair {
                 pattern: "tests/test_loader.py".to_string(),
-                prefix: CheckCodePrefix::E741,
+                prefix: RuleCodePrefix::E741,
             },
         ];
         assert_eq!(actual, expected);

flake8_to_ruff/src/plugin.rs

@@ -3,7 +3,7 @@ use std::fmt;
 use std::str::FromStr;
 
 use anyhow::anyhow;
-use ruff::checks_gen::CheckCodePrefix;
+use ruff::registry::RuleCodePrefix;
 
 #[derive(Clone, Ord, PartialOrd, Eq, PartialEq)]
 pub enum Plugin {
@@ -20,6 +20,7 @@ pub enum Plugin {
     Flake8ErrMsg,
     Flake8ImplicitStrConcat,
     Flake8Print,
+    Flake8PytestStyle,
     Flake8Quotes,
     Flake8Return,
     Flake8Simplify,
@@ -48,6 +49,7 @@ impl FromStr for Plugin {
             "flake8-errmsg" => Ok(Plugin::Flake8ErrMsg),
             "flake8-implicit-str-concat" => Ok(Plugin::Flake8ImplicitStrConcat),
             "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),
@@ -80,6 +82,7 @@ impl fmt::Debug for Plugin {
                 Plugin::Flake8ErrMsg => "flake8-errmsg",
                 Plugin::Flake8ImplicitStrConcat => "flake8-implicit-str-concat",
                 Plugin::Flake8Print => "flake8-print",
+                Plugin::Flake8PytestStyle => "flake8-pytest-style",
                 Plugin::Flake8Quotes => "flake8-quotes",
                 Plugin::Flake8Return => "flake8-return",
                 Plugin::Flake8Simplify => "flake8-simplify",
@@ -94,247 +97,32 @@ impl fmt::Debug for Plugin {
 }
 
 impl Plugin {
-    pub fn default(&self) -> CheckCodePrefix {
+    pub fn prefix(&self) -> RuleCodePrefix {
         match self {
-            Plugin::Flake8Annotations => CheckCodePrefix::ANN,
-            Plugin::Flake8Bandit => CheckCodePrefix::S,
+            Plugin::Flake8Annotations => RuleCodePrefix::ANN,
+            Plugin::Flake8Bandit => RuleCodePrefix::S,
             // TODO(charlie): Handle rename of `B` to `BLE`.
-            Plugin::Flake8BlindExcept => CheckCodePrefix::BLE,
-            Plugin::Flake8Bugbear => CheckCodePrefix::B,
-            Plugin::Flake8Builtins => CheckCodePrefix::A,
-            Plugin::Flake8Comprehensions => CheckCodePrefix::C4,
-            Plugin::Flake8Datetimez => CheckCodePrefix::DTZ,
-            Plugin::Flake8Debugger => CheckCodePrefix::T1,
-            Plugin::Flake8Docstrings => CheckCodePrefix::D,
+            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 => CheckCodePrefix::ERA,
-            Plugin::Flake8ErrMsg => CheckCodePrefix::EM,
-            Plugin::Flake8ImplicitStrConcat => CheckCodePrefix::ISC,
-            Plugin::Flake8Print => CheckCodePrefix::T2,
-            Plugin::Flake8Quotes => CheckCodePrefix::Q,
-            Plugin::Flake8Return => CheckCodePrefix::RET,
-            Plugin::Flake8Simplify => CheckCodePrefix::SIM,
-            Plugin::Flake8TidyImports => CheckCodePrefix::TID25,
-            Plugin::McCabe => CheckCodePrefix::C9,
-            Plugin::PandasVet => CheckCodePrefix::PD,
-            Plugin::PEP8Naming => CheckCodePrefix::N,
-            Plugin::Pyupgrade => CheckCodePrefix::UP,
-        }
-    }
-
-    pub fn select(&self, flake8: &HashMap<String, Option<String>>) -> Vec<CheckCodePrefix> {
-        match self {
-            Plugin::Flake8Annotations => vec![CheckCodePrefix::ANN],
-            Plugin::Flake8Bandit => vec![CheckCodePrefix::S],
-            Plugin::Flake8BlindExcept => vec![CheckCodePrefix::BLE],
-            Plugin::Flake8Bugbear => vec![CheckCodePrefix::B],
-            Plugin::Flake8Builtins => vec![CheckCodePrefix::A],
-            Plugin::Flake8Comprehensions => vec![CheckCodePrefix::C4],
-            Plugin::Flake8Datetimez => vec![CheckCodePrefix::DTZ],
-            Plugin::Flake8Debugger => vec![CheckCodePrefix::T1],
-            Plugin::Flake8Docstrings => {
-                // Use the user-provided docstring.
-                for key in ["docstring-convention", "docstring_convention"] {
-                    if let Some(Some(value)) = flake8.get(key) {
-                        match DocstringConvention::from_str(value) {
-                            Ok(convention) => return convention.select(),
-                            Err(e) => {
-                                eprintln!("Unexpected '{key}' value: {value} ({e}");
-                                return vec![];
-                            }
-                        }
-                    }
-                }
-                // Default to PEP8.
-                DocstringConvention::PEP8.select()
-            }
-            Plugin::Flake8Eradicate => vec![CheckCodePrefix::ERA],
-            Plugin::Flake8ErrMsg => vec![CheckCodePrefix::EM],
-            Plugin::Flake8ImplicitStrConcat => vec![CheckCodePrefix::ISC],
-            Plugin::Flake8Print => vec![CheckCodePrefix::T2],
-            Plugin::Flake8Quotes => vec![CheckCodePrefix::Q],
-            Plugin::Flake8Return => vec![CheckCodePrefix::RET],
-            Plugin::Flake8Simplify => vec![CheckCodePrefix::SIM],
-            Plugin::Flake8TidyImports => vec![CheckCodePrefix::TID],
-            Plugin::McCabe => vec![CheckCodePrefix::C9],
-            Plugin::PandasVet => vec![CheckCodePrefix::PD],
-            Plugin::PEP8Naming => vec![CheckCodePrefix::N],
-            Plugin::Pyupgrade => vec![CheckCodePrefix::UP],
-        }
-    }
-}
-
-pub enum DocstringConvention {
-    All,
-    PEP8,
-    NumPy,
-    Google,
-}
-
-impl FromStr for DocstringConvention {
-    type Err = anyhow::Error;
-
-    fn from_str(string: &str) -> Result<Self, Self::Err> {
-        match string {
-            "all" => Ok(DocstringConvention::All),
-            "pep8" => Ok(DocstringConvention::PEP8),
-            "numpy" => Ok(DocstringConvention::NumPy),
-            "google" => Ok(DocstringConvention::Google),
-            _ => Err(anyhow!("Unknown docstring convention: {string}")),
-        }
-    }
-}
-
-impl DocstringConvention {
-    fn select(&self) -> Vec<CheckCodePrefix> {
-        match self {
-            DocstringConvention::All => vec![CheckCodePrefix::D],
-            DocstringConvention::PEP8 => vec![
-                // All errors except D203, D212, D213, D214, D215, D404, D405, D406, D407, D408,
-                // D409, D410, D411, D413, D415, D416 and D417.
-                CheckCodePrefix::D100,
-                CheckCodePrefix::D101,
-                CheckCodePrefix::D102,
-                CheckCodePrefix::D103,
-                CheckCodePrefix::D104,
-                CheckCodePrefix::D105,
-                CheckCodePrefix::D106,
-                CheckCodePrefix::D107,
-                CheckCodePrefix::D200,
-                CheckCodePrefix::D201,
-                CheckCodePrefix::D202,
-                // CheckCodePrefix::D203,
-                CheckCodePrefix::D204,
-                CheckCodePrefix::D205,
-                CheckCodePrefix::D206,
-                CheckCodePrefix::D207,
-                CheckCodePrefix::D208,
-                CheckCodePrefix::D209,
-                CheckCodePrefix::D210,
-                CheckCodePrefix::D211,
-                // CheckCodePrefix::D212,
-                // CheckCodePrefix::D213,
-                // CheckCodePrefix::D214,
-                // CheckCodePrefix::D215,
-                CheckCodePrefix::D300,
-                CheckCodePrefix::D301,
-                CheckCodePrefix::D400,
-                CheckCodePrefix::D402,
-                CheckCodePrefix::D403,
-                // CheckCodePrefix::D404,
-                // CheckCodePrefix::D405,
-                // CheckCodePrefix::D406,
-                // CheckCodePrefix::D407,
-                // CheckCodePrefix::D408,
-                // CheckCodePrefix::D409,
-                // CheckCodePrefix::D410,
-                // CheckCodePrefix::D411,
-                CheckCodePrefix::D412,
-                // CheckCodePrefix::D413,
-                CheckCodePrefix::D414,
-                // CheckCodePrefix::D415,
-                // CheckCodePrefix::D416,
-                // CheckCodePrefix::D417,
-                CheckCodePrefix::D418,
-                CheckCodePrefix::D419,
-            ],
-            DocstringConvention::NumPy => vec![
-                // All errors except D107, D203, D212, D213, D402, D413, D415, D416, and D417.
-                CheckCodePrefix::D100,
-                CheckCodePrefix::D101,
-                CheckCodePrefix::D102,
-                CheckCodePrefix::D103,
-                CheckCodePrefix::D104,
-                CheckCodePrefix::D105,
-                CheckCodePrefix::D106,
-                // CheckCodePrefix::D107,
-                CheckCodePrefix::D200,
-                CheckCodePrefix::D201,
-                CheckCodePrefix::D202,
-                // CheckCodePrefix::D203,
-                CheckCodePrefix::D204,
-                CheckCodePrefix::D205,
-                CheckCodePrefix::D206,
-                CheckCodePrefix::D207,
-                CheckCodePrefix::D208,
-                CheckCodePrefix::D209,
-                CheckCodePrefix::D210,
-                CheckCodePrefix::D211,
-                // CheckCodePrefix::D212,
-                // CheckCodePrefix::D213,
-                CheckCodePrefix::D214,
-                CheckCodePrefix::D215,
-                CheckCodePrefix::D300,
-                CheckCodePrefix::D301,
-                CheckCodePrefix::D400,
-                // CheckCodePrefix::D402,
-                CheckCodePrefix::D403,
-                CheckCodePrefix::D404,
-                CheckCodePrefix::D405,
-                CheckCodePrefix::D406,
-                CheckCodePrefix::D407,
-                CheckCodePrefix::D408,
-                CheckCodePrefix::D409,
-                CheckCodePrefix::D410,
-                CheckCodePrefix::D411,
-                CheckCodePrefix::D412,
-                // CheckCodePrefix::D413,
-                CheckCodePrefix::D414,
-                // CheckCodePrefix::D415,
-                // CheckCodePrefix::D416,
-                // CheckCodePrefix::D417,
-                CheckCodePrefix::D418,
-                CheckCodePrefix::D419,
-            ],
-            DocstringConvention::Google => vec![
-                // All errors except D203, D204, D213, D215, D400, D401, D404, D406, D407, D408,
-                // D409 and D413.
-                CheckCodePrefix::D100,
-                CheckCodePrefix::D101,
-                CheckCodePrefix::D102,
-                CheckCodePrefix::D103,
-                CheckCodePrefix::D104,
-                CheckCodePrefix::D105,
-                CheckCodePrefix::D106,
-                CheckCodePrefix::D107,
-                CheckCodePrefix::D200,
-                CheckCodePrefix::D201,
-                CheckCodePrefix::D202,
-                // CheckCodePrefix::D203,
-                // CheckCodePrefix::D204,
-                CheckCodePrefix::D205,
-                CheckCodePrefix::D206,
-                CheckCodePrefix::D207,
-                CheckCodePrefix::D208,
-                CheckCodePrefix::D209,
-                CheckCodePrefix::D210,
-                CheckCodePrefix::D211,
-                CheckCodePrefix::D212,
-                // CheckCodePrefix::D213,
-                CheckCodePrefix::D214,
-                // CheckCodePrefix::D215,
-                CheckCodePrefix::D300,
-                CheckCodePrefix::D301,
-                // CheckCodePrefix::D400,
-                CheckCodePrefix::D402,
-                CheckCodePrefix::D403,
-                // CheckCodePrefix::D404,
-                CheckCodePrefix::D405,
-                // CheckCodePrefix::D406,
-                // CheckCodePrefix::D407,
-                // CheckCodePrefix::D408,
-                // CheckCodePrefix::D409,
-                CheckCodePrefix::D410,
-                CheckCodePrefix::D411,
-                CheckCodePrefix::D412,
-                // CheckCodePrefix::D413,
-                CheckCodePrefix::D414,
-                CheckCodePrefix::D415,
-                CheckCodePrefix::D416,
-                CheckCodePrefix::D417,
-                CheckCodePrefix::D418,
-                CheckCodePrefix::D419,
-            ],
+            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,
         }
     }
 }
@@ -394,6 +182,25 @@ pub fn infer_plugins_from_options(flake8: &HashMap<String, Option<String>>) -> V
             "eradicate-whitelist-extend" | "eradicate_whitelist_extend" => {
                 plugins.insert(Plugin::Flake8Eradicate);
             }
+            // flake8-pytest-style
+            "pytest-fixture-no-parentheses" | "pytest_fixture_no_parentheses " => {
+                plugins.insert(Plugin::Flake8PytestStyle);
+            }
+            "pytest-parametrize-names-type" | "pytest_parametrize_names_type" => {
+                plugins.insert(Plugin::Flake8PytestStyle);
+            }
+            "pytest-parametrize-values-type" | "pytest_parametrize_values_type" => {
+                plugins.insert(Plugin::Flake8PytestStyle);
+            }
+            "pytest-parametrize-values-row-type" | "pytest_parametrize_values_row_type" => {
+                plugins.insert(Plugin::Flake8PytestStyle);
+            }
+            "pytest-raises-require-match-for" | "pytest_raises_require_match_for" => {
+                plugins.insert(Plugin::Flake8PytestStyle);
+            }
+            "pytest-mark-no-parentheses" | "pytest_mark_no_parentheses" => {
+                plugins.insert(Plugin::Flake8PytestStyle);
+            }
             // flake8-quotes
             "quotes" | "inline-quotes" | "inline_quotes" => {
                 plugins.insert(Plugin::Flake8Quotes);
@@ -441,7 +248,7 @@ 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(codes: &BTreeSet<CheckCodePrefix>) -> Vec<Plugin> {
+pub fn infer_plugins_from_codes(codes: &BTreeSet<RuleCodePrefix>) -> Vec<Plugin> {
     [
         Plugin::Flake8Annotations,
         Plugin::Flake8Bandit,
@@ -469,7 +276,7 @@ pub fn infer_plugins_from_codes(codes: &BTreeSet<CheckCodePrefix>) -> Vec<Plugin
             if prefix
                 .codes()
                 .iter()
-                .any(|code| plugin.default().codes().contains(code))
+                .any(|code| plugin.prefix().codes().contains(code))
             {
                 return true;
             }
@@ -479,19 +286,11 @@ pub fn infer_plugins_from_codes(codes: &BTreeSet<CheckCodePrefix>) -> Vec<Plugin
     .collect()
 }
 
-/// Resolve the set of enabled `CheckCodePrefix` values for the given plugins.
-pub fn resolve_select(
-    flake8: &HashMap<String, Option<String>>,
-    plugins: &[Plugin],
-) -> BTreeSet<CheckCodePrefix> {
-    // Include default Pyflakes and pycodestyle checks.
-    let mut select = BTreeSet::from([CheckCodePrefix::E, CheckCodePrefix::F, CheckCodePrefix::W]);
-
-    // Add prefix codes for every plugin.
-    for plugin in plugins {
-        select.extend(plugin.select(flake8));
-    }
-
+/// 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
 }
 

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.

playground/index.html

@@ -11,20 +11,12 @@
     <title>Ruff Playground</title>
     <link
       rel="icon"
-      href="data:image/svg+xml,<svg xmlns=%22http://www.w3.org/2000/svg%22 viewBox=%220 0 100 100%22><text y=%22.9em%22 font-size=%2290%22>🛠️</text></svg>"
+      href="data:image/svg+xml,<svg xmlns=%22http://www.w3.org/2000/svg%22 viewBox=%220 0 100 100%22><text y=%22.9em%22 font-size=%2290%22>⚡</text></svg>"
     />
     <link rel="stylesheet" href="https://rsms.me/inter/inter.css" />
   </head>
   <body>
     <div id="root"></div>
-    <div style="display: flex; position: fixed; right: 16px; bottom: 16px">
-      <a href="https://GitHub.com/charliermarsh/ruff"
-        ><img
-          src="https://img.shields.io/github/stars/charliermarsh/ruff.svg?style=social&label=GitHub&maxAge=2592000&?logoWidth=100"
-          alt="GitHub stars"
-          style="width: 120px"
-      /></a>
-    </div>
     <script type="module" src="/src/main.tsx"></script>
   </body>
 </html>

playground/src/Editor/Editor.tsx

@@ -1,6 +1,11 @@
 import { useCallback, useEffect, useState } from "react";
 import { DEFAULT_PYTHON_SOURCE } from "../constants";
-import init, { check, Check, currentVersion, defaultSettings } from "../pkg";
+import init, {
+  check,
+  Diagnostic,
+  currentVersion,
+  defaultSettings,
+} from "../pkg";
 import { ErrorMessage } from "./ErrorMessage";
 import Header from "./Header";
 import { useTheme } from "./theme";
@@ -18,7 +23,7 @@ export default function Editor() {
   const [edit, setEdit] = useState<number>(0);
   const [settingsSource, setSettingsSource] = useState<string | null>(null);
   const [pythonSource, setPythonSource] = useState<string | null>(null);
-  const [checks, setChecks] = useState<Check[]>([]);
+  const [diagnostics, setDiagnostics] = useState<Diagnostic[]>([]);
   const [error, setError] = useState<string | null>(null);
   const [theme, setTheme] = useTheme();
 
@@ -32,25 +37,25 @@ export default function Editor() {
     }
 
     let config: any;
-    let checks: Check[];
+    let diagnostics: Diagnostic[];
 
     try {
       config = JSON.parse(settingsSource);
     } catch (e) {
-      setChecks([]);
+      setDiagnostics([]);
       setError((e as Error).message);
       return;
     }
 
     try {
-      checks = check(pythonSource, config);
+      diagnostics = check(pythonSource, config);
     } catch (e) {
       setError(e as string);
       return;
     }
 
     setError(null);
-    setChecks(checks);
+    setDiagnostics(diagnostics);
   }, [initialized, settingsSource, pythonSource]);
 
   useEffect(() => {
@@ -122,7 +127,7 @@ export default function Editor() {
               visible={tab === "Source"}
               source={pythonSource}
               theme={theme}
-              checks={checks}
+              diagnostics={diagnostics}
               onChange={handlePythonSourceChange}
             />
             <SettingsEditor

playground/src/Editor/Header.tsx

@@ -1,4 +1,5 @@
 import classNames from "classnames";
+import RepoButton from "./RepoButton";
 import ThemeButton from "./ThemeButton";
 import ShareButton from "./ShareButton";
 import { Theme } from "./theme";
@@ -83,14 +84,19 @@ export default function Header({
           />
           Settings
         </button>
+      </div>
+      <div className={"flex items-center min-w-0"}>
         {version ? (
-          <div className={"flex items-center"}>
+          <div className={"hidden sm:flex items-center"}>
             <VersionTag>v{version}</VersionTag>
           </div>
         ) : null}
-      </div>
-      <div className={"hidden sm:flex items-center min-w-0"}>
-        <ShareButton key={edit} onShare={onShare} />
+        <div className="hidden sm:block mx-6 lg:mx-4 w-px h-6 bg-gray-200 dark:bg-gray-700" />
+        <RepoButton />
+        <div className="hidden sm:block mx-6 lg:mx-4 w-px h-6 bg-gray-200 dark:bg-gray-700" />
+        <div className="hidden sm:block">
+          <ShareButton key={edit} onShare={onShare} />
+        </div>
         <div className="hidden sm:block mx-6 lg:mx-4 w-px h-6 bg-gray-200 dark:bg-gray-700" />
         <ThemeButton theme={theme} onChange={onChangeTheme} />
       </div>

playground/src/Editor/RepoButton.tsx

@@ -0,0 +1,27 @@
+export default function RepoButton() {
+  return (
+    <a
+      className={"hover:text-ayu-accent/70 text-ayu-accent"}
+      href={"https://github.com/charliermarsh/ruff"}
+      target={"_blank"}
+      rel={"noreferrer"}
+    >
+      <svg
+        xmlns={"http://www.w3.org/2000/svg"}
+        width={"24"}
+        height={"24"}
+        viewBox={"0 0 16 16"}
+        fill={"none"}
+      >
+        <path
+          fillRule={"evenodd"}
+          clipRule={"evenodd"}
+          d={
+            "M8 0C3.58 0 0 3.58 0 8C0 11.54 2.29 14.53 5.47 15.59C5.87 15.66 6.02 15.42 6.02 15.21C6.02 15.02 6.01 14.39 6.01 13.72C4 14.09 3.48 13.23 3.32 12.78C3.23 12.55 2.84 11.84 2.5 11.65C2.22 11.5 1.82 11.13 2.49 11.12C3.12 11.11 3.57 11.7 3.72 11.94C4.44 13.15 5.59 12.81 6.05 12.6C6.12 12.08 6.33 11.73 6.56 11.53C4.78 11.33 2.92 10.64 2.92 7.58C2.92 6.71 3.23 5.99 3.74 5.43C3.66 5.23 3.38 4.41 3.82 3.31C3.82 3.31 4.49 3.1 6.02 4.13C6.66 3.95 7.34 3.86 8.02 3.86C8.7 3.86 9.38 3.95 10.02 4.13C11.55 3.09 12.22 3.31 12.22 3.31C12.66 4.41 12.38 5.23 12.3 5.43C12.81 5.99 13.12 6.7 13.12 7.58C13.12 10.65 11.25 11.33 9.47 11.53C9.76 11.78 10.01 12.26 10.01 13.01C10.01 14.08 10 14.94 10 15.21C10 15.42 10.15 15.67 10.55 15.59C13.71 14.53 16 11.53 16 8C16 3.58 12.42 0 8 0Z"
+          }
+          fill={"currentColor"}
+        />
+      </svg>
+    </a>
+  );
+}

playground/src/Editor/ShareButton.tsx

@@ -28,7 +28,7 @@ export default function ShareButton({ onShare }: { onShare?: () => void }) {
   ) : (
     <button
       type="button"
-      className="relative flex-none rounded-md text-sm font-semibold leading-6 py-1.5 px-3 enabled:hover:bg-ayu-accent/80 bg-ayu-accent text-white shadow-sm dark:shadow-highlight/20 disabled:opacity-50"
+      className="relative flex-none rounded-md text-sm font-semibold leading-6 py-1.5 px-3 enabled:hover:bg-ayu-accent/70 bg-ayu-accent text-white shadow-sm dark:shadow-highlight/20 disabled:opacity-50"
       disabled={!onShare || copied}
       onClick={
         onShare

playground/src/Editor/SourceEditor.tsx

@@ -5,19 +5,19 @@
 import Editor, { useMonaco } from "@monaco-editor/react";
 import { MarkerSeverity, MarkerTag } from "monaco-editor";
 import { useCallback, useEffect } from "react";
-import { Check } from "../pkg";
+import { Diagnostic } from "../pkg";
 import { Theme } from "./theme";
 
 export default function SourceEditor({
   visible,
   source,
   theme,
-  checks,
+  diagnostics,
   onChange,
 }: {
   visible: boolean;
   source: string;
-  checks: Check[];
+  diagnostics: Diagnostic[];
   theme: Theme;
   onChange: (pythonSource: string) => void;
 }) {
@@ -33,15 +33,15 @@ export default function SourceEditor({
     editor.setModelMarkers(
       model,
       "owner",
-      checks.map((check) => ({
-        startLineNumber: check.location.row,
-        startColumn: check.location.column + 1,
-        endLineNumber: check.end_location.row,
-        endColumn: check.end_location.column + 1,
-        message: `${check.code}: ${check.message}`,
+      diagnostics.map((diagnostic) => ({
+        startLineNumber: diagnostic.location.row,
+        startColumn: diagnostic.location.column + 1,
+        endLineNumber: diagnostic.end_location.row,
+        endColumn: diagnostic.end_location.column + 1,
+        message: `${diagnostic.code}: ${diagnostic.message}`,
         severity: MarkerSeverity.Error,
         tags:
-          check.code === "F401" || check.code === "F841"
+          diagnostic.code === "F401" || diagnostic.code === "F841"
             ? [MarkerTag.Unnecessary]
             : [],
       })),
@@ -52,7 +52,7 @@ export default function SourceEditor({
       {
         // @ts-expect-error: The type definition is wrong.
         provideCodeActions: function (model, position) {
-          const actions = checks
+          const actions = diagnostics
             .filter((check) => position.startLineNumber === check.location.row)
             .filter((check) => check.fix)
             .map((check) => ({
@@ -89,7 +89,7 @@ export default function SourceEditor({
     return () => {
       codeActionProvider?.dispose();
     };
-  }, [checks, monaco]);
+  }, [diagnostics, monaco]);
 
   const handleChange = useCallback(
     (value: string | undefined) => {

playground/tailwind.config.cjs

@@ -7,7 +7,7 @@ module.exports = {
   theme: {
     extend: {
       colors: {
-        "ayu-accent": "#f07171",
+        "ayu-accent": "#fa8d3e",
         "ayu-background": {
           DEFAULT: "#f8f9fa",
           dark: "#0b0e14",

pyproject.toml

@@ -1,10 +1,13 @@
 [build-system]
-requires = ["maturin>=0.14,<0.15"]
+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.
+
 build-backend = "maturin"
 
 [project]
 name = "ruff"
-version = "0.0.207"
+version = "0.0.221"
 description = "An extremely fast Python linter, written in Rust."
 authors = [
   { name = "Charlie Marsh", email = "charlie.r.marsh@gmail.com" },
@@ -31,20 +34,16 @@ classifiers = [
     "Topic :: Software Development :: Libraries :: Python Modules",
     "Topic :: Software Development :: Quality Assurance",
 ]
-urls = { repository = "https://github.com/charliermarsh/ruff-lsp" }
+urls = { repository = "https://github.com/charliermarsh/ruff" }
 
 [tool.maturin]
 bindings = "bin"
+manifest-path = "ruff_cli/Cargo.toml"
+python-source = "python"
 strip = true
 
-[tool.ruff]
-line-length = 88
-
-[tool.ruff.isort]
-force-wrap-aliases = true
-combine-as-imports = true
-force-single-line = true
-single-line-exclusions = ["os", "logging.handlers"]
-
-[tool.ruff.pydocstyle]
-convention = "google"
+[tool.setuptools]
+license-files = [
+  "LICENSE",
+  "licenses/*",
+]

resources/test/fixtures/flake8_annotations/allow_nested_overload.py

@@ -0,0 +1,9 @@
+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_bandit/S103.py

@@ -0,0 +1,22 @@
+import os
+import stat
+
+keyfile = "foo"
+
+os.chmod("/etc/passwd", 0o227)  # Error
+os.chmod("/etc/passwd", 0o7)  # Error
+os.chmod("/etc/passwd", 0o664)  # OK
+os.chmod("/etc/passwd", 0o777)  # Error
+os.chmod("/etc/passwd", 0o770)  # Error
+os.chmod("/etc/passwd", 0o776)  # Error
+os.chmod("/etc/passwd", 0o760)  # OK
+os.chmod("~/.bashrc", 511)  # Error
+os.chmod("/etc/hosts", 0o777)  # Error
+os.chmod("/tmp/oh_hai", 0x1FF)  # Error
+os.chmod("/etc/passwd", stat.S_IRWXU)  # OK
+os.chmod(keyfile, 0o777)  # Error
+os.chmod(keyfile, 0o7 | 0o70 | 0o700)  # Error
+os.chmod(keyfile, stat.S_IRWXO | stat.S_IRWXG | stat.S_IRWXU)  # Error
+os.chmod("~/hidden_exec", stat.S_IXGRP)  # Error
+os.chmod("~/hidden_exec", stat.S_IXOTH)  # OK
+os.chmod("/etc/passwd", stat.S_IWOTH)  # Error

resources/test/fixtures/flake8_bandit/S108.py

@@ -0,0 +1,16 @@
+# ok
+with open("/abc/tmp", "w") as f:
+    f.write("def")
+
+with open("/tmp/abc", "w") as f:
+    f.write("def")
+
+with open("/var/tmp/123", "w") as f:
+    f.write("def")
+
+with open("/dev/shm/unit/test", "w") as f:
+    f.write("def")
+
+# not ok by config
+with open("/foo/bar", "w") as f:
+    f.write("def")

resources/test/fixtures/flake8_bandit/S113.py

@@ -0,0 +1,23 @@
+import requests
+
+requests.get('https://gmail.com')
+requests.get('https://gmail.com', timeout=None)
+requests.get('https://gmail.com', timeout=5)
+requests.post('https://gmail.com')
+requests.post('https://gmail.com', timeout=None)
+requests.post('https://gmail.com', timeout=5)
+requests.put('https://gmail.com')
+requests.put('https://gmail.com', timeout=None)
+requests.put('https://gmail.com', timeout=5)
+requests.delete('https://gmail.com')
+requests.delete('https://gmail.com', timeout=None)
+requests.delete('https://gmail.com', timeout=5)
+requests.patch('https://gmail.com')
+requests.patch('https://gmail.com', timeout=None)
+requests.patch('https://gmail.com', timeout=5)
+requests.options('https://gmail.com')
+requests.options('https://gmail.com', timeout=None)
+requests.options('https://gmail.com', timeout=5)
+requests.head('https://gmail.com')
+requests.head('https://gmail.com', timeout=None)
+requests.head('https://gmail.com', timeout=5)

resources/test/fixtures/flake8_bandit/S324.py

@@ -0,0 +1,52 @@
+import hashlib
+from hashlib import new as hashlib_new
+from hashlib import sha1 as hashlib_sha1
+
+# Invalid
+
+hashlib.new('md5')
+
+hashlib.new('md4', b'test')
+
+hashlib.new(name='md5', data=b'test')
+
+hashlib.new('MD4', data=b'test')
+
+hashlib.new('sha1')
+
+hashlib.new('sha1', data=b'test')
+
+hashlib.new('sha', data=b'test')
+
+hashlib.new(name='SHA', data=b'test')
+
+hashlib.sha(data=b'test')
+
+hashlib.md5()
+
+hashlib_new('sha1')
+
+hashlib_sha1('sha1')
+
+# usedforsecurity arg only available in Python 3.9+
+hashlib.new('sha1', usedforsecurity=True)
+
+# Valid
+
+hashlib.new('sha256')
+
+hashlib.new('SHA512')
+
+hashlib.sha256(data=b'test')
+
+# usedforsecurity arg only available in Python 3.9+
+hashlib_new(name='sha1', usedforsecurity=False)
+
+# usedforsecurity arg only available in Python 3.9+
+hashlib_sha1(name='sha1', usedforsecurity=False)
+
+# usedforsecurity arg only available in Python 3.9+
+hashlib.md4(usedforsecurity=False)
+
+# usedforsecurity arg only available in Python 3.9+
+hashlib.new(name='sha256', usedforsecurity=False)

resources/test/fixtures/flake8_bandit/S501.py

@@ -0,0 +1,40 @@
+import httpx
+import requests
+
+requests.get('https://gmail.com', timeout=30, verify=True)
+requests.get('https://gmail.com', timeout=30, verify=False)
+requests.post('https://gmail.com', timeout=30, verify=True)
+requests.post('https://gmail.com', timeout=30, verify=False)
+requests.put('https://gmail.com', timeout=30, verify=True)
+requests.put('https://gmail.com', timeout=30, verify=False)
+requests.delete('https://gmail.com', timeout=30, verify=True)
+requests.delete('https://gmail.com', timeout=30, verify=False)
+requests.patch('https://gmail.com', timeout=30, verify=True)
+requests.patch('https://gmail.com', timeout=30, verify=False)
+requests.options('https://gmail.com', timeout=30, verify=True)
+requests.options('https://gmail.com', timeout=30, verify=False)
+requests.head('https://gmail.com', timeout=30, verify=True)
+requests.head('https://gmail.com', timeout=30, verify=False)
+
+httpx.request('GET', 'https://gmail.com', verify=True)
+httpx.request('GET', 'https://gmail.com', verify=False)
+httpx.get('https://gmail.com', verify=True)
+httpx.get('https://gmail.com', verify=False)
+httpx.options('https://gmail.com', verify=True)
+httpx.options('https://gmail.com', verify=False)
+httpx.head('https://gmail.com', verify=True)
+httpx.head('https://gmail.com', verify=False)
+httpx.post('https://gmail.com', verify=True)
+httpx.post('https://gmail.com', verify=False)
+httpx.put('https://gmail.com', verify=True)
+httpx.put('https://gmail.com', verify=False)
+httpx.patch('https://gmail.com', verify=True)
+httpx.patch('https://gmail.com', verify=False)
+httpx.delete('https://gmail.com', verify=True)
+httpx.delete('https://gmail.com', verify=False)
+httpx.stream('https://gmail.com', verify=True)
+httpx.stream('https://gmail.com', verify=False)
+httpx.Client()
+httpx.Client(verify=False)
+httpx.AsyncClient()
+httpx.AsyncClient(verify=False)

resources/test/fixtures/flake8_bandit/S506.py

@@ -0,0 +1,31 @@
+import json
+import yaml
+from yaml import CSafeLoader
+from yaml import SafeLoader
+from yaml import SafeLoader as NewSafeLoader
+
+
+def test_yaml_load():
+    ystr = yaml.dump({"a": 1, "b": 2, "c": 3})
+    y = yaml.load(ystr)
+    yaml.dump(y)
+    try:
+        y = yaml.load(ystr, Loader=yaml.CSafeLoader)
+    except AttributeError:
+        # CSafeLoader only exists if you build yaml with LibYAML
+        y = yaml.load(ystr, Loader=yaml.SafeLoader)
+
+
+def test_json_load():
+    # no issue should be found
+    j = json.load("{}")
+
+
+yaml.load("{}", Loader=yaml.Loader)
+
+# no issue should be found
+yaml.load("{}", SafeLoader)
+yaml.load("{}", yaml.SafeLoader)
+yaml.load("{}", CSafeLoader)
+yaml.load("{}", yaml.CSafeLoader)
+yaml.load("{}", NewSafeLoader)

resources/test/fixtures/flake8_bandit/S508.py

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

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

@@ -0,0 +1,29 @@
+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_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)]
-    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)}
+    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
 
 
 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)
+        functions.append(lambda: x)  # error
 
-    [lambda: x async for x in pointless_async_iterable()]
+    [lambda: x async for x in pointless_async_iterable()]  # error
 
 
 a = 10
@@ -47,10 +47,10 @@ b = 0
 while True:
     a = a_ = a - 1
     b += 1
-    functions.append(lambda: a)
-    functions.append(lambda: a_)
-    functions.append(lambda: b)
-    functions.append(lambda: c)  # not a name error because of late binding!
+    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
     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
+        lambda: j * k  # error
 
 
 for j, k, l in [(1, 2, 3)]:
@@ -80,3 +80,95 @@ 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,15 +1,16 @@
 """
 Should emit:
-B024 - on lines 17, 34, 52, 58, 69, 74, 79, 84, 89
+B024 - on lines 18, 71, 82, 87, 92, 141
 """
 
 import abc
 import abc as notabc
 from abc import ABC, ABCMeta
-from abc import abstractmethod
+from abc import abstractmethod, abstractproperty
 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
 
@@ -49,12 +50,24 @@ class Base_6(ABC):
         foo()
 
 
-class Base_7(ABC):  # error
+class Base_7(ABC):
     @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,11 +1,12 @@
 """
 Should emit:
-B027 - on lines 12, 15, 18, 22, 30
+B027 - on lines 13, 16, 19, 23
 """
 import abc
 from abc import ABC
-from abc import abstractmethod
+from abc import abstractmethod, abstractproperty
 from abc import abstractmethod as notabstract
+from abc import abstractproperty as notabstract_property
 
 
 class AbstractClass(ABC):
@@ -42,6 +43,18 @@ 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_comprehensions/C400.py

@@ -2,3 +2,10 @@ 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,3 +2,10 @@ 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,5 +1,18 @@
-s1 = set([1, 2])
-s2 = set((1, 2))
-s3 = set([])
-s4 = set(())
-s5 = set()
+set([1, 2])
+set((1, 2))
+set([])
+set(())
+set()
+set((1,))
+set((
+    1,
+))
+set([
+    1,
+])
+set(
+    (1,)
+)
+set(
+    [1,]
+)

resources/test/fixtures/flake8_comprehensions/C408.py

@@ -3,3 +3,10 @@ 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,3 +4,10 @@ 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_pie/PIE790.py

@@ -0,0 +1,120 @@
+class Foo:
+    """buzz"""
+
+    pass  # PIE790
+
+
+if foo:
+    """foo"""
+    pass  # PIE790
+
+
+def multi_statement() -> None:
+    """This is a function."""
+    pass; print("hello")
+
+
+if foo:
+    pass
+else:
+    """bar"""
+    pass  # PIE790
+
+
+while True:
+    pass
+else:
+    """bar"""
+    pass  # PIE790
+
+
+for _ in range(10):
+    pass
+else:
+    """bar"""
+    pass  # PIE790
+
+
+async for _ in range(10):
+    pass
+else:
+    """bar"""
+    pass  # PIE790
+
+
+def foo() -> None:
+    """
+    buzz
+    """
+
+    pass  # PIE790
+
+
+async def foo():
+    """
+    buzz
+    """
+
+    pass  # PIE790
+
+
+try:
+    """
+    buzz
+    """
+    pass  # PIE790
+except ValueError:
+    pass
+
+
+try:
+    bar()
+except ValueError:
+    """bar"""
+    pass  # PIE790
+
+
+for _ in range(10):
+    """buzz"""
+    pass  # PIE790
+
+async for _ in range(10):
+    """buzz"""
+    pass  # PIE790
+
+while cond:
+    """buzz"""
+    pass  # PIE790
+
+
+with bar:
+    """buzz"""
+    pass  # PIE790
+
+async with bar:
+    """buzz"""
+    pass  # PIE790
+
+
+class Foo:
+    # bar
+    pass
+
+
+if foo:
+    # foo
+    pass
+
+
+class Error(Exception):
+    pass
+
+
+try:
+    foo()
+except NetworkError:
+    pass
+
+
+def foo() -> None:
+    pass

resources/test/fixtures/flake8_pie/PIE794.py

@@ -0,0 +1,40 @@
+class Foo(BaseModel):
+    name = StringField()
+    # ....
+    name = StringField()  # PIE794
+
+    def remove(self) -> None:
+        ...
+
+
+class Foo(BaseModel):
+    name: str = StringField()
+    # ....
+    name = StringField()  # PIE794
+
+    def foo(self) -> None:
+        ...
+
+
+class User(BaseModel):
+    bar: str = StringField()
+    foo: bool = BooleanField()
+    # ...
+    bar = StringField()  # PIE794
+
+
+class User(BaseModel):
+    @property
+    def buzz(self) -> str:
+        ...
+
+    @buzz.setter
+    def buzz(self, value: str | int) -> None:
+        ...
+
+
+class User:
+    bar: str = StringField()
+    foo: bool = BooleanField()
+    # ...
+    bar = StringField()  # PIE794

resources/test/fixtures/flake8_pie/PIE807.py

@@ -0,0 +1,20 @@
+@dataclass
+class Foo:
+    foo: List[str] = field(default_factory=lambda: [])  # PIE807
+
+
+class FooTable(BaseTable):
+    bar = fields.ListField(default=lambda: [])  # PIE807
+
+
+class FooTable(BaseTable):
+    bar = fields.ListField(lambda: [])  # PIE807
+
+
+@dataclass
+class Foo:
+    foo: List[str] = field(default_factory=list)
+
+
+class FooTable(BaseTable):
+    bar = fields.ListField(list)

resources/test/fixtures/flake8_pytest_style/PT001.py

@@ -0,0 +1,78 @@
+import pytest
+from pytest import fixture
+from pytest import fixture as aliased
+
+
+# `import pytest`
+
+
+@pytest.fixture
+def no_parentheses():
+    return 42
+
+
+@pytest.fixture()
+def parentheses_no_params():
+    return 42
+
+
+@pytest.fixture(scope="module")
+def parentheses_with_params():
+    return 42
+
+
+@pytest.fixture(
+
+)
+def parentheses_no_params_multiline():
+    return 42
+
+
+# `from pytest import fixture`
+
+
+@fixture
+def imported_from_no_parentheses():
+    return 42
+
+
+@fixture()
+def imported_from_parentheses_no_params():
+    return 42
+
+
+@fixture(scope="module")
+def imported_from_parentheses_with_params():
+    return 42
+
+
+@fixture(
+
+)
+def imported_from_parentheses_no_params_multiline():
+    return 42
+
+
+# `from pytest import fixture as aliased`
+
+
+@aliased
+def aliased_no_parentheses():
+    return 42
+
+
+@aliased()
+def aliased_parentheses_no_params():
+    return 42
+
+
+@aliased(scope="module")
+def aliased_parentheses_with_params():
+    return 42
+
+
+@aliased(
+
+)
+def aliased_parentheses_no_params_multiline():
+    return 42

resources/test/fixtures/flake8_pytest_style/PT002.py

@@ -0,0 +1,21 @@
+import pytest
+
+
+@pytest.fixture()
+def my_fixture():  # OK no args
+    return 0
+
+
+@pytest.fixture(scope="module")
+def my_fixture():  # OK only kwargs
+    return 0
+
+
+@pytest.fixture("module")
+def my_fixture():  # Error only args
+    return 0
+
+
+@pytest.fixture("module", autouse=True)
+def my_fixture():  # Error mixed
+    return 0

resources/test/fixtures/flake8_pytest_style/PT003.py

@@ -0,0 +1,16 @@
+import pytest
+
+
+@pytest.fixture()
+def ok_no_scope():
+    ...
+
+
+@pytest.fixture(scope="module")
+def ok_other_scope():
+    ...
+
+
+@pytest.fixture(scope="function")
+def error():
+    ...

resources/test/fixtures/flake8_pytest_style/PT004.py

@@ -0,0 +1,58 @@
+import abc
+from abc import abstractmethod
+
+import pytest
+
+
+@pytest.fixture()
+def _patch_something(mocker):  # OK simple
+    mocker.patch("some.thing")
+
+
+@pytest.fixture()
+def _patch_something(mocker):  # OK with return
+    if something:
+        return
+    mocker.patch("some.thing")
+
+
+@pytest.fixture()
+def _activate_context():  # OK with yield
+    with context:
+        yield
+
+
+class BaseTest:
+    @pytest.fixture()
+    @abc.abstractmethod
+    def my_fixture():  # OK abstract with import abc
+        raise NotImplementedError
+
+
+class BaseTest:
+    @pytest.fixture()
+    @abstractmethod
+    def my_fixture():  # OK abstract with from import
+        raise NotImplementedError
+
+
+@pytest.fixture()
+def my_fixture():  # OK ignoring yield from
+    yield from some_generator()
+
+
+
+@pytest.fixture()
+def my_fixture():  # OK ignoring yield value
+    yield 1
+
+
+@pytest.fixture()
+def patch_something(mocker):  # Error simple
+    mocker.patch("some.thing")
+
+
+@pytest.fixture()
+def activate_context():  # Error with yield
+    with context:
+        yield

resources/test/fixtures/flake8_pytest_style/PT005.py

@@ -0,0 +1,57 @@
+import abc
+from abc import abstractmethod
+
+import pytest
+
+
+@pytest.fixture()
+def my_fixture(mocker):  # OK with return
+    return 0
+
+
+@pytest.fixture()
+def activate_context():  # OK with yield
+    with get_context() as context:
+        yield context
+
+
+@pytest.fixture()
+def _any_fixture(mocker):  # Ok nested function
+    def nested_function():
+        return 1
+
+    mocker.patch("...", nested_function)
+
+
+class BaseTest:
+    @pytest.fixture()
+    @abc.abstractmethod
+    def _my_fixture():  # OK abstract with import abc
+        return NotImplemented
+
+
+class BaseTest:
+    @pytest.fixture()
+    @abstractmethod
+    def _my_fixture():  # OK abstract with from import
+        return NotImplemented
+
+
+@pytest.fixture()
+def _my_fixture(mocker):  # Error with return
+    return 0
+
+
+@pytest.fixture()
+def _activate_context():  # Error with yield
+    with get_context() as context:
+        yield context
+
+
+@pytest.fixture()
+def _activate_context():  # Error with conditional yield from
+    if some_condition:
+        with get_context() as context:
+            yield context
+    else:
+        yield from other_context()

resources/test/fixtures/flake8_pytest_style/PT006.py

@@ -0,0 +1,51 @@
+import pytest
+
+
+@pytest.mark.parametrize("param", [1, 2, 3])
+def test_always_ok(param):
+    ...
+
+
+@pytest.mark.parametrize("param1,param2", [(1, 2), (3, 4)])
+def test_csv(param1, param2):
+    ...
+
+
+@pytest.mark.parametrize("   param1,   ,    param2   , ", [(1, 2), (3, 4)])
+def test_csv_with_whitespace(param1, param2):
+    ...
+
+
+@pytest.mark.parametrize("param1,param2", [(1, 2), (3, 4)])
+def test_csv_bad_quotes(param1, param2):
+    ...
+
+
+@pytest.mark.parametrize(("param1", "param2"), [(1, 2), (3, 4)])
+def test_tuple(param1, param2):
+    ...
+
+
+@pytest.mark.parametrize(("param1",), [1, 2, 3])
+def test_tuple_one_elem(param1, param2):
+    ...
+
+
+@pytest.mark.parametrize(["param1", "param2"], [(1, 2), (3, 4)])
+def test_list(param1, param2):
+    ...
+
+
+@pytest.mark.parametrize(["param1"], [1, 2, 3])
+def test_list_one_elem(param1, param2):
+    ...
+
+
+@pytest.mark.parametrize([some_expr, another_expr], [1, 2, 3])
+def test_list_expressions(param1, param2):
+    ...
+
+
+@pytest.mark.parametrize([some_expr, "param2"], [1, 2, 3])
+def test_list_mixed_expr_literal(param1, param2):
+    ...

resources/test/fixtures/flake8_pytest_style/PT007.py

@@ -0,0 +1,55 @@
+import pytest
+
+
+@pytest.mark.parametrize("param", (1, 2))
+def test_tuple(param):
+    ...
+
+
+@pytest.mark.parametrize(
+    ("param1", "param2"),
+    (
+        (1, 2),
+        (3, 4),
+    ),
+)
+def test_tuple_of_tuples(param1, param2):
+    ...
+
+
+@pytest.mark.parametrize(
+    ("param1", "param2"),
+    (
+        [1, 2],
+        [3, 4],
+    ),
+)
+def test_tuple_of_lists(param1, param2):
+    ...
+
+
+@pytest.mark.parametrize("param", [1, 2])
+def test_list(param):
+    ...
+
+
+@pytest.mark.parametrize(
+    ("param1", "param2"),
+    [
+        (1, 2),
+        (3, 4),
+    ],
+)
+def test_list_of_tuples(param1, param2):
+    ...
+
+
+@pytest.mark.parametrize(
+    ("param1", "param2"),
+    [
+        [1, 2],
+        [3, 4],
+    ],
+)
+def test_list_of_lists(param1, param2):
+    ...

resources/test/fixtures/flake8_pytest_style/PT008.py

@@ -0,0 +1,48 @@
+# OK
+
+mocker.patch("module.name", not_lambda)
+module_mocker.patch("module.name", not_lambda)
+mocker.patch.object(obj, "attr", not_lambda)
+module_mocker.patch.object(obj, "attr", not_lambda)
+
+mocker.patch("module.name", return_value=None)
+module_mocker.patch("module.name", return_value=None)
+mocker.patch.object(obj, "attr", return_value=None)
+module_mocker.patch.object(obj, "attr", return_value=None)
+
+mocker.patch("module.name", lambda x, y: x)
+module_mocker.patch("module.name", lambda x, y: x)
+mocker.patch.object(obj, "attr", lambda x, y: x)
+module_mocker.patch.object(obj, "attr", lambda x, y: x)
+
+mocker.patch("module.name", lambda *args: args)
+module_mocker.patch("module.name", lambda *args: args)
+mocker.patch.object(obj, "attr", lambda *args: args)
+module_mocker.patch.object(obj, "attr", lambda *args: args)
+
+mocker.patch("module.name", lambda **kwargs: kwargs)
+module_mocker.patch("module.name", lambda **kwargs: kwargs)
+mocker.patch.object(obj, "attr", lambda **kwargs: kwargs)
+module_mocker.patch.object(obj, "attr", lambda **kwargs: kwargs)
+
+mocker.patch("module.name", lambda x, /, y: x)
+module_mocker.patch("module.name", lambda x, /, y: x)
+mocker.patch.object(obj, "attr", lambda x, /, y: x)
+module_mocker.patch.object(obj, "attr", lambda x, /, y: x)
+
+# Error
+
+mocker.patch("module.name", lambda: None)
+module_mocker.patch("module.name", lambda: None)
+mocker.patch.object(obj, "attr", lambda: None)
+module_mocker.patch.object(obj, "attr", lambda: None)
+
+mocker.patch("module.name", lambda x, y: None)
+module_mocker.patch("module.name", lambda x, y: None)
+mocker.patch.object(obj, "attr", lambda x, y: None)
+module_mocker.patch.object(obj, "attr", lambda x, y: None)
+
+mocker.patch("module.name", lambda *args, **kwargs: None)
+module_mocker.patch("module.name", lambda *args, **kwargs: None)
+mocker.patch.object(obj, "attr", lambda *args, **kwargs: None)
+module_mocker.patch.object(obj, "attr", lambda *args, **kwargs: None)

resources/test/fixtures/flake8_pytest_style/PT009.py

@@ -0,0 +1,76 @@
+import unittest
+
+
+class Test(unittest.TestCase):
+    def test_xxx(self):
+        assert 1 == 1  # OK no parameters
+
+    def test_assert_true(self):
+        expr = 1
+        msg = "Must be True"
+        self.assertTrue(expr)  # Error
+        self.assertTrue(expr=expr)  # Error
+        self.assertTrue(expr, msg)  # Error
+        self.assertTrue(expr=expr, msg=msg)  # Error
+        self.assertTrue(msg=msg, expr=expr)  # Error
+        self.assertTrue(*(expr, msg))  # Error, unfixable
+        self.assertTrue(**{"expr": expr, "msg": msg})  # Error, unfixable
+        self.assertTrue(msg=msg, expr=expr, unexpected_arg=False)  # Error, unfixable
+        self.assertTrue(msg=msg)  # Error, unfixable
+
+    def test_assert_false(self):
+        self.assertFalse(True)  # Error
+
+    def test_assert_equal(self):
+        self.assertEqual(1, 2)  # Error
+
+    def test_assert_not_equal(self):
+        self.assertNotEqual(1, 1)  # Error
+
+    def test_assert_greater(self):
+        self.assertGreater(1, 2)  # Error
+
+    def test_assert_greater_equal(self):
+        self.assertGreaterEqual(1, 2)  # Error
+
+    def test_assert_less(self):
+        self.assertLess(2, 1)  # Error
+
+    def test_assert_less_equal(self):
+        self.assertLessEqual(1, 2)  # Error
+
+    def test_assert_in(self):
+        self.assertIn(1, [2, 3])  # Error
+
+    def test_assert_not_in(self):
+        self.assertNotIn(2, [2, 3])  # Error
+
+    def test_assert_is_none(self):
+        self.assertIsNone(0)  # Error
+
+    def test_assert_is_not_none(self):
+        self.assertIsNotNone(0)  # Error
+
+    def test_assert_is(self):
+        self.assertIs([], [])  # Error
+
+    def test_assert_is_not(self):
+        self.assertIsNot(1, 1)  # Error
+
+    def test_assert_is_instance(self):
+        self.assertIsInstance(1, str)  # Error
+
+    def test_assert_is_not_instance(self):
+        self.assertNotIsInstance(1, int)  # Error
+
+    def test_assert_regex(self):
+        self.assertRegex("abc", r"def")  # Error
+
+    def test_assert_not_regex(self):
+        self.assertNotRegex("abc", r"abc")  # Error
+
+    def test_assert_regexp_matches(self):
+        self.assertRegexpMatches("abc", r"def")  # Error
+
+    def test_assert_not_regexp_matches(self):
+        self.assertNotRegex("abc", r"abc")  # Error

resources/test/fixtures/flake8_pytest_style/PT010.py

@@ -0,0 +1,11 @@
+import pytest
+
+
+def test_ok():
+    with pytest.raises():
+        pass
+
+
+def test_error():
+    with pytest.raises(UnicodeError):
+        pass

resources/test/fixtures/flake8_pytest_style/PT011.py

@@ -0,0 +1,32 @@
+import socket
+
+import pytest
+
+
+def test_ok():
+    with pytest.raises(ValueError, match="Can't divide by 0"):
+        raise ValueError("Can't divide by 0")
+
+
+def test_ok_different_error_from_config():
+    with pytest.raises(ZeroDivisionError):
+        raise ZeroDivisionError("Can't divide by 0")
+
+
+def test_error_no_argument_given():
+    with pytest.raises(ValueError):
+        raise ValueError("Can't divide 1 by 0")
+
+    with pytest.raises(socket.error):
+        raise ValueError("Can't divide 1 by 0")
+
+
+def test_error_match_is_empty():
+    with pytest.raises(ValueError, match=None):
+        raise ValueError("Can't divide 1 by 0")
+
+    with pytest.raises(ValueError, match=""):
+        raise ValueError("Can't divide 1 by 0")
+
+    with pytest.raises(ValueError, match=f""):
+        raise ValueError("Can't divide 1 by 0")

resources/test/fixtures/flake8_pytest_style/PT012.py

@@ -0,0 +1,64 @@
+import pytest
+
+
+def test_ok():
+    with pytest.raises(AttributeError):
+        [].size
+
+
+async def test_ok_trivial_with():
+    with pytest.raises(AttributeError):
+        with context_manager_under_test():
+            pass
+
+    with pytest.raises(AttributeError):
+        async with context_manager_under_test():
+            pass
+
+
+def test_ok_complex_single_call():
+    with pytest.raises(AttributeError):
+        my_func(
+            [].size,
+            [].size,
+        )
+
+
+def test_error_multiple_statements():
+    with pytest.raises(AttributeError):
+        len([])
+        [].size
+
+
+async def test_error_complex_statement():
+    with pytest.raises(AttributeError):
+        if True:
+            [].size
+
+    with pytest.raises(AttributeError):
+        for i in []:
+            [].size
+
+    with pytest.raises(AttributeError):
+        async for i in []:
+            [].size
+
+    with pytest.raises(AttributeError):
+        while True:
+            [].size
+
+    with pytest.raises(AttributeError):
+        with context_manager_under_test():
+            [].size
+
+    with pytest.raises(AttributeError):
+        async with context_manager_under_test():
+            [].size
+
+
+def test_error_try():
+    with pytest.raises(AttributeError):
+        try:
+            [].size
+        except:
+            raise

resources/test/fixtures/flake8_pytest_style/PT013.py

@@ -0,0 +1,13 @@
+# OK
+
+import pytest
+import pytest as pytest
+from notpytest import fixture
+from . import fixture
+from .pytest import fixture
+
+# Error
+
+import pytest as other_name
+from pytest import fixture
+from pytest import fixture as other_name

resources/test/fixtures/flake8_pytest_style/PT015.py

@@ -0,0 +1,25 @@
+import pytest
+
+
+def test_ok():
+    assert [0]
+
+
+def test_error():
+    assert None
+    assert False
+    assert 0
+    assert 0.0
+    assert ""
+    assert f""
+    assert []
+    assert ()
+    assert {}
+    assert list()
+    assert set()
+    assert tuple()
+    assert dict()
+    assert frozenset()
+    assert list([])
+    assert set(set())
+    assert tuple("")

resources/test/fixtures/flake8_pytest_style/PT016.py

@@ -0,0 +1,17 @@
+import pytest
+
+
+def test_xxx():
+    pytest.fail("this is a failure")  # Test OK arg
+
+
+def test_xxx():
+    pytest.fail(msg="this is a failure")  # Test OK kwarg
+
+
+def test_xxx():  # Error
+    pytest.fail()
+    pytest.fail("")
+    pytest.fail(f"")
+    pytest.fail(msg="")
+    pytest.fail(msg=f"")

resources/test/fixtures/flake8_pytest_style/PT017.py

@@ -0,0 +1,19 @@
+import pytest
+
+
+def test_ok():
+    try:
+        something()
+    except Exception as e:
+        something_else()
+
+    with pytest.raises(ZeroDivisionError) as e:
+        1 / 0
+    assert e.value.message
+
+
+def test_error():
+    try:
+        something()
+    except Exception as e:
+        assert e.message, "blah blah"

resources/test/fixtures/flake8_pytest_style/PT018.py

@@ -0,0 +1,18 @@
+import pytest
+
+
+def test_ok():
+    assert something
+    assert something or something_else
+    assert something or something_else and something_third
+    assert not (something and something_else)
+
+
+def test_error():
+    assert something and something_else
+    assert something and something_else and something_third
+    assert something and not something_else
+    assert something and (something_else or something_third)
+    assert not (something or something_else)
+    assert not (something or something_else or something_third)
+    assert not (something or something_else and something_third)

resources/test/fixtures/flake8_pytest_style/PT019.py

@@ -0,0 +1,14 @@
+def test_xxx(fixture):  # Ok good param name
+    pass
+
+
+def xxx(_param):  # Ok not a test
+    pass
+
+
+def test_xxx(_fixture):  # Error arg
+    pass
+
+
+def test_xxx(*, _fixture):  # Error kwonly
+    pass

resources/test/fixtures/flake8_pytest_style/PT020.py

@@ -0,0 +1,21 @@
+import pytest
+
+
+@pytest.fixture()
+def ok_no_parameters():
+    return 0
+
+
+@pytest.fixture
+def ok_without_parens():
+    return 0
+
+
+@pytest.yield_fixture()
+def error_without_parens():
+    return 0
+
+
+@pytest.yield_fixture
+def error_with_parens():
+    return 0

resources/test/fixtures/flake8_pytest_style/PT021.py

@@ -0,0 +1,58 @@
+import functools
+
+import pytest
+
+
+@pytest.fixture()
+def my_fixture():  # OK return
+    return 0
+
+
+@pytest.fixture()
+def my_fixture():  # OK yield
+    resource = acquire_resource()
+    yield resource
+    resource.release()
+
+
+@pytest.fixture()
+def my_fixture():  # OK other request
+    request = get_request()
+    request.addfinalizer(finalizer)
+    return request
+
+
+def create_resource(arg, request):  # OK other function
+    resource = Resource(arg)
+    request.addfinalizer(resource.release)
+    return resource
+
+
+@pytest.fixture()
+def resource_factory(request):
+    return functools.partial(create_resource, request=request)
+
+
+@pytest.fixture()
+def resource_factory(request):  # OK other function
+    def create_resource(arg) -> Resource:
+        resource = Resource(arg)
+        request.addfinalizer(resource.release)
+        return resource
+
+    return create_resource
+
+
+@pytest.fixture()
+def my_fixture(request):  # Error return
+    resource = acquire_resource()
+    request.addfinalizer(resource.release)
+    return resource
+
+
+@pytest.fixture()
+def my_fixture(request):  # Error yield
+    resource = acquire_resource()
+    request.addfinalizer(resource.release)
+    yield resource
+    resource  # prevent PT022

resources/test/fixtures/flake8_pytest_style/PT022.py

@@ -0,0 +1,17 @@
+import pytest
+
+
+@pytest.fixture()
+def ok_complex_logic():
+    if some_condition:
+        resource = acquire_resource()
+        yield resource
+        resource.release()
+        return
+    yield None
+
+
+@pytest.fixture()
+def error():
+    resource = acquire_resource()
+    yield resource