Fix invalid reference to ruff_options.rs (#1409)

Add ruff-lsp to README

.github/workflows/ci.yaml

@@ -12,7 +12,7 @@ env:
   RUSTUP_MAX_RETRIES: 10
 
 jobs:
-  cargo_build:
+  cargo-build:
     name: "cargo build"
     runs-on: ubuntu-latest
     steps:
@@ -20,6 +20,9 @@ jobs:
       - uses: actions-rs/toolchain@v1
         with:
           profile: minimal
+          toolchain: nightly-2022-11-01
+          override: true
+          components: rustfmt
       - uses: actions/cache@v3
         env:
           cache-name: cache-cargo
@@ -33,8 +36,14 @@ jobs:
             ${{ runner.os }}-build-
             ${{ runner.os }}-
       - run: cargo build --all --release
+      - run: ./target/release/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 --quiet playground/src/ruff_options.ts || echo "::error file=playground/src/ruff_options.ts::This file is outdated. Run 'cargo +nightly dev generate-all'."
+      - run: git diff --exit-code -- README.md src/checks_gen.rs ruff.schema.json playground/src/ruff_options.ts
 
-  cargo_fmt:
+  cargo-fmt:
     name: "cargo fmt"
     runs-on: ubuntu-latest
     steps:
@@ -70,6 +79,7 @@ jobs:
           toolchain: nightly-2022-11-01
           override: true
           components: clippy
+          target: wasm32-unknown-unknown
       - uses: actions/cache@v3
         env:
           cache-name: cache-cargo
@@ -83,8 +93,9 @@ jobs:
             ${{ runner.os }}-build-
             ${{ runner.os }}-
       - 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
 
-  cargo_test:
+  cargo-test:
     name: "cargo test"
     runs-on: ubuntu-latest
     steps:
@@ -106,9 +117,37 @@ jobs:
             ${{ runner.os }}-build-${{ env.cache-name }}-
             ${{ runner.os }}-build-
             ${{ runner.os }}-
+      - run: pip install black[d]==22.12.0
       - run: cargo test --all
+      - run: cargo test --package ruff --test black_compatibility_test -- --ignored
 
-  maturin_build:
+  wasm-pack-test:
+    name: "wasm-pack test"
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+      - uses: actions-rs/toolchain@v1
+        with:
+          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: jetli/wasm-pack-action@v0.4.0
+      - uses: jetli/wasm-bindgen-action@v0.2.0
+      - run: wasm-pack test --node
+
+  maturin-build:
     name: "maturin build"
     runs-on: ubuntu-latest
     steps:
@@ -120,7 +159,7 @@ jobs:
           override: true
       - uses: actions/setup-python@v4
         with:
-          python-version: "3.10"
+          python-version: "3.11"
       - run: pip install maturin
       - uses: actions/cache@v3
         env:

.github/workflows/playground.yaml

@@ -0,0 +1,50 @@
+name: "[Playground] Release"
+
+on:
+  workflow_dispatch:
+  push:
+    branches: [main]
+
+env:
+  CARGO_INCREMENTAL: 0
+  CARGO_NET_RETRY: 10
+  RUSTUP_MAX_RETRIES: 10
+
+jobs:
+  publish:
+    runs-on: ubuntu-latest
+    env:
+       CF_API_TOKEN_EXISTS: ${{ secrets.CF_API_TOKEN != '' }}
+    steps:
+      - uses: actions/checkout@v3
+      - uses: actions-rs/toolchain@v1
+        with:
+          profile: minimal
+          toolchain: nightly-2022-11-01
+          override: true
+          target: wasm32-unknown-unknown
+      - uses: actions/setup-node@v3
+        with:
+          node-version: 18
+          cache: "npm"
+          cache-dependency-path: playground/package-lock.json
+      - 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
+      - name: "Install Node dependencies"
+        run: npm ci
+        working-directory: playground
+      - name: "Run TypeScript checks"
+        run: npm run check
+        working-directory: playground
+      - name: "Build JavaScript bundle"
+        run: npm run build
+        working-directory: playground
+      - name: "Deploy to Cloudflare Pages"
+        if: ${{ env.CF_API_TOKEN_EXISTS == 'true' }}
+        uses: cloudflare/wrangler-action@2.0.0
+        with:
+          apiToken: ${{ secrets.CF_API_TOKEN }}
+          accountId: ${{ secrets.CF_ACCOUNT_ID }}
+          command: pages publish playground/dist --project-name=ruff --branch ${GITHUB_HEAD_REF} --commit-hash ${GITHUB_SHA}

.github/workflows/ruff.yaml

@@ -1,9 +1,8 @@
 name: "[ruff] Release"
 
 on:
-  create:
-    tags:
-      - v*
+  release:
+    types: [published]
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.ref }}

.pre-commit-config.yaml

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

BREAKING_CHANGES.md

@@ -0,0 +1,23 @@
+# Breaking Changes
+
+## 0.0.181
+
+### Files excluded by `.gitignore` are now ignored ([#1234](https://github.com/charliermarsh/ruff/pull/1234))
+
+Ruff will now avoid checking files that are excluded by `.ignore`, `.gitignore`,
+`.git/info/exclude`, and global `gitignore` files. This behavior is powered by the [`ignore`](https://docs.rs/ignore/latest/ignore/struct.WalkBuilder.html#ignore-rules)
+crate, and is applied in addition to Ruff's built-in `exclude` system.
+
+To disable this behavior, set `respect-gitignore = false` in your `pyproject.toml` file.
+
+Note that hidden files (i.e., files and directories prefixed with a `.`) are _not_ ignored by
+default.
+
+## 0.0.178
+
+### Configuration files are now resolved hierarchically ([#1190](https://github.com/charliermarsh/ruff/pull/1190))
+
+`pyproject.toml` files are now resolved hierarchically, such that for each Python file, we find
+the first `pyproject.toml` file in its path, and use that to determine its lint settings.
+
+See the [README](https://github.com/charliermarsh/ruff#pyprojecttoml-discovery) for more.

CONTRIBUTING.md

@@ -48,8 +48,8 @@ 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/check_ast.rs` (for AST-based checks),
-   `src/check_tokens.rs` (for token-based checks), or `src/check_lines.rs` (for text-based checks).
+2. Define the _logic_ for triggering the rule 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).
 
@@ -59,9 +59,9 @@ pattern implemented therein.
 
 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 dev print-ast`
-with a Python file. Grep for the `Check::new` invocations to understand how other, similar rules
-are implemented.
+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 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
@@ -79,9 +79,7 @@ Then, run `cargo test`. Your test will fail, but you'll be prompted to follow-up
 `cargo insta review`. Accept the generated snapshot, then commit the snapshot file alongside the
 rest of your changes.
 
-Finally, to update the documentation, run `cargo dev generate-rules-table` from the repo root. To
-update the generated prefix map, run `cargo dev generate-check-code-prefix`. Both of these commands
-should be run whenever a new check is added to the codebase.
+Finally, regenerate the documentation and generated code with `cargo +nightly dev generate-all`.
 
 ### Example: Adding a new configuration option
 
@@ -105,6 +103,8 @@ You may also want to add the new configuration option to the `flake8-to-ruff` to
 responsible for converting `flake8` configuration files to Ruff's TOML format. This logic
 lives in `flake8_to_ruff/src/converter.rs`.
 
+Finally, regenerate the documentation and generated code with `cargo +nightly dev generate-all`.
+
 ## Release process
 
 As of now, Ruff has an ad hoc release process: releases are cut with high frequency via GitHub

Cargo.toml

@@ -6,12 +6,13 @@ members = [
 
 [package]
 name = "ruff"
-version = "0.0.141"
+version = "0.0.196"
 edition = "2021"
 rust-version = "1.65.0"
 
 [lib]
 name = "ruff"
+crate-type = ["cdylib", "rlib"]
 
 [dependencies]
 annotate-snippets = { version = "0.9.1", features = ["color"] }
@@ -20,52 +21,71 @@ 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" }
 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" }
-globset = {version = "0.4.9" }
+glob = { version = "0.3.0" }
+globset = { version = "0.4.9" }
+ignore = { version = "0.4.18" }
 itertools = { version = "0.10.5" }
 libcst = { git = "https://github.com/charliermarsh/LibCST", rev = "f2f0b7a487a8725d161fe8b3ed73a6758b21e177" }
 log = { version = "0.4.17" }
+natord = { version = "1.0.9" }
 nohash-hasher = { version = "0.2.0" }
-notify = { version = "4.0.17" }
+notify = { version = "5.0.0" }
 num-bigint = { version = "0.4.3" }
 once_cell = { version = "1.16.0" }
 path-absolutize = { version = "3.0.14", features = ["once_cell_cache", "use_unix_paths_on_wasm"] }
-rayon = { version = "1.5.3" }
+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.196", path = "ruff_macros" }
 rustc-hash = { version = "1.1.0" }
-rustpython-ast = { features = ["unparse"], git = "https://github.com/RustPython/RustPython.git", rev = "f885db8c61514f069979861f6b3bd83292086231" }
-rustpython-common = { git = "https://github.com/RustPython/RustPython.git", rev = "f885db8c61514f069979861f6b3bd83292086231" }
-rustpython-parser = { features = ["lalrpop"], git = "https://github.com/RustPython/RustPython.git", rev = "f885db8c61514f069979861f6b3bd83292086231" }
+rustpython-ast = { features = ["unparse"], git = "https://github.com/RustPython/RustPython.git", rev = "68d26955b3e24198a150315e7959719b03709dee" }
+rustpython-common = { git = "https://github.com/RustPython/RustPython.git", rev = "68d26955b3e24198a150315e7959719b03709dee" }
+rustpython-parser = { features = ["lalrpop"], git = "https://github.com/RustPython/RustPython.git", rev = "68d26955b3e24198a150315e7959719b03709dee" }
+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" }
 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" }
-update-informer = { version = "0.5.0", default-features = false, features = ["pypi"], optional = true }
 walkdir = { version = "2.3.2" }
 
 [target.'cfg(not(target_family = "wasm"))'.dependencies]
-clearscreen = { version = "1.0.10" } # uses which
+clearscreen = { version = "1.0.10" }
+rayon = { version = "1.5.3" }
+update-informer = { version = "0.5.0", default-features = false, features = ["pypi"], optional = true }
 
 # https://docs.rs/getrandom/0.2.7/getrandom/#webassembly-support
 # For (future) wasm-pack support
 [target.'cfg(all(target_family = "wasm", target_os = "unknown"))'.dependencies]
 getrandom = { version = "0.2.7", features = ["js"] }
+console_error_panic_hook = { version = "0.1.7" }
+console_log = { version = "0.2.0" }
+serde-wasm-bindgen = { version = "0.4" }
+js-sys = { version = "0.3.60" }
+wasm-bindgen = { version = "0.2.83" }
 
 [dev-dependencies]
-assert_cmd = { version = "2.0.4" }
-criterion = { version = "0.4.0" }
 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"]
@@ -83,6 +103,11 @@ opt-level = 3
 [profile.dev.package.similar]
 opt-level = 3
 
+# Reduce complexity of a parser function that would trigger a locals limit in a wasm tool.
+# https://github.com/bytecodealliance/wasm-tools/blob/b5c3d98e40590512a3b12470ef358d5c7b983b15/crates/wasmparser/src/limits.rs#L29
+[profile.dev.package.rustpython-parser]
+opt-level = 1
+
 [[bench]]
 name = "source_code_locator"
 harness = false

LICENSE

@@ -267,6 +267,31 @@ are:
     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
@@ -338,6 +363,106 @@ are:
     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-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)
@@ -446,6 +571,29 @@ are:
     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

flake8_to_ruff/Cargo.lock

@@ -771,7 +771,7 @@ checksum = "0ce7134b9999ecaf8bcd65542e436736ef32ddca1b3e06094cb6ec5755203b80"
 
 [[package]]
 name = "flake8_to_ruff"
-version = "0.0.141"
+version = "0.0.196"
 dependencies = [
  "anyhow",
  "clap",
@@ -1975,7 +1975,7 @@ dependencies = [
 
 [[package]]
 name = "ruff"
-version = "0.0.141"
+version = "0.0.196"
 dependencies = [
  "anyhow",
  "bincode",
@@ -2028,7 +2028,7 @@ dependencies = [
 [[package]]
 name = "rustpython-ast"
 version = "0.1.0"
-source = "git+https://github.com/RustPython/RustPython.git?rev=f885db8c61514f069979861f6b3bd83292086231#f885db8c61514f069979861f6b3bd83292086231"
+source = "git+https://github.com/RustPython/RustPython.git?rev=1b6cb170e925a43d605b3fed9f6b878e63e47744#1b6cb170e925a43d605b3fed9f6b878e63e47744"
 dependencies = [
  "num-bigint",
  "rustpython-common",
@@ -2038,7 +2038,7 @@ dependencies = [
 [[package]]
 name = "rustpython-common"
 version = "0.0.0"
-source = "git+https://github.com/RustPython/RustPython.git?rev=f885db8c61514f069979861f6b3bd83292086231#f885db8c61514f069979861f6b3bd83292086231"
+source = "git+https://github.com/RustPython/RustPython.git?rev=1b6cb170e925a43d605b3fed9f6b878e63e47744#1b6cb170e925a43d605b3fed9f6b878e63e47744"
 dependencies = [
  "ascii",
  "cfg-if 1.0.0",
@@ -2061,7 +2061,7 @@ dependencies = [
 [[package]]
 name = "rustpython-compiler-core"
 version = "0.1.2"
-source = "git+https://github.com/RustPython/RustPython.git?rev=f885db8c61514f069979861f6b3bd83292086231#f885db8c61514f069979861f6b3bd83292086231"
+source = "git+https://github.com/RustPython/RustPython.git?rev=1b6cb170e925a43d605b3fed9f6b878e63e47744#1b6cb170e925a43d605b3fed9f6b878e63e47744"
 dependencies = [
  "bincode",
  "bitflags",
@@ -2078,7 +2078,7 @@ dependencies = [
 [[package]]
 name = "rustpython-parser"
 version = "0.1.2"
-source = "git+https://github.com/RustPython/RustPython.git?rev=f885db8c61514f069979861f6b3bd83292086231#f885db8c61514f069979861f6b3bd83292086231"
+source = "git+https://github.com/RustPython/RustPython.git?rev=1b6cb170e925a43d605b3fed9f6b878e63e47744#1b6cb170e925a43d605b3fed9f6b878e63e47744"
 dependencies = [
  "ahash",
  "anyhow",

flake8_to_ruff/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "flake8-to-ruff"
-version = "0.0.141-dev.0"
+version = "0.0.196-dev.0"
 edition = "2021"
 
 [lib]
@@ -16,6 +16,8 @@ ruff = { path = "..", default-features = false }
 rustc-hash = { version = "1.1.0" }
 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" }
 
 [dev-dependencies]

flake8_to_ruff/examples/cryptography/pyproject.toml

@@ -0,0 +1,65 @@
+[build-system]
+requires = [
+    # The minimum setuptools version is specific to the PEP 517 backend,
+    # and may be stricter than the version required in `setup.cfg`
+    "setuptools>=40.6.0,!=60.9.0",
+    "wheel",
+    # Must be kept in sync with the `install_requirements` in `setup.cfg`
+    "cffi>=1.12; platform_python_implementation != 'PyPy'",
+    "setuptools-rust>=0.11.4",
+]
+build-backend = "setuptools.build_meta"
+
+[tool.black]
+line-length = 79
+target-version = ["py36"]
+
+[tool.pytest.ini_options]
+addopts = "-r s --capture=no --strict-markers --benchmark-disable"
+markers = [
+    "skip_fips: this test is not executed in FIPS mode",
+    "supported: parametrized test requiring only_if and skip_message",
+]
+
+[tool.mypy]
+show_error_codes = true
+check_untyped_defs = true
+no_implicit_reexport = true
+warn_redundant_casts = true
+warn_unused_ignores = true
+warn_unused_configs = true
+strict_equality = true
+
+[[tool.mypy.overrides]]
+module = [
+    "pretend"
+]
+ignore_missing_imports = true
+
+[tool.coverage.run]
+branch = true
+relative_files = true
+source = [
+    "cryptography",
+    "tests/",
+]
+
+[tool.coverage.paths]
+source = [
+   "src/cryptography",
+   "*.tox/*/lib*/python*/site-packages/cryptography",
+   "*.tox\\*\\Lib\\site-packages\\cryptography",
+   "*.tox/pypy/site-packages/cryptography",
+]
+tests =[
+   "tests/",
+   "*tests\\",
+]
+
+[tool.coverage.report]
+exclude_lines = [
+    "@abc.abstractmethod",
+    "@abc.abstractproperty",
+    "@typing.overload",
+    "if typing.TYPE_CHECKING",
+]

flake8_to_ruff/examples/cryptography/setup.cfg

@@ -0,0 +1,91 @@
+[metadata]
+name = cryptography
+version = attr: cryptography.__version__
+description = cryptography is a package which provides cryptographic recipes and primitives to Python developers.
+long_description = file: README.rst
+long_description_content_type = text/x-rst
+license = BSD-3-Clause OR Apache-2.0
+url = https://github.com/pyca/cryptography
+author = The Python Cryptographic Authority and individual contributors
+author_email = cryptography-dev@python.org
+project_urls =
+    Documentation=https://cryptography.io/
+    Source=https://github.com/pyca/cryptography/
+    Issues=https://github.com/pyca/cryptography/issues
+    Changelog=https://cryptography.io/en/latest/changelog/
+classifiers =
+    Development Status :: 5 - Production/Stable
+    Intended Audience :: Developers
+    License :: OSI Approved :: Apache Software License
+    License :: OSI Approved :: BSD License
+    Natural Language :: English
+    Operating System :: MacOS :: MacOS X
+    Operating System :: POSIX
+    Operating System :: POSIX :: BSD
+    Operating System :: POSIX :: Linux
+    Operating System :: Microsoft :: Windows
+    Programming Language :: Python
+    Programming Language :: Python :: 3
+    Programming Language :: Python :: 3 :: Only
+    Programming Language :: Python :: 3.6
+    Programming Language :: Python :: 3.7
+    Programming Language :: Python :: 3.8
+    Programming Language :: Python :: 3.9
+    Programming Language :: Python :: 3.10
+    Programming Language :: Python :: 3.11
+    Programming Language :: Python :: Implementation :: CPython
+    Programming Language :: Python :: Implementation :: PyPy
+    Topic :: Security :: Cryptography
+
+[options]
+python_requires = >=3.6
+include_package_data = True
+zip_safe = False
+package_dir =
+    =src
+packages = find:
+# `install_requires` must be kept in sync with `pyproject.toml`
+install_requires =
+    cffi >=1.12
+
+[options.packages.find]
+where = src
+exclude =
+    _cffi_src
+    _cffi_src.*
+
+[options.extras_require]
+test =
+    pytest>=6.2.0
+    pytest-benchmark
+    pytest-cov
+    pytest-subtests
+    pytest-xdist
+    pretend
+    iso8601
+    pytz
+    hypothesis>=1.11.4,!=3.79.2
+docs =
+    sphinx >= 1.6.5,!=1.8.0,!=3.1.0,!=3.1.1,!=5.2.0,!=5.2.0.post0
+    sphinx_rtd_theme
+docstest =
+    pyenchant >= 1.6.11
+    twine >= 1.12.0
+    sphinxcontrib-spelling >= 4.0.1
+sdist =
+    setuptools_rust >= 0.11.4
+pep8test =
+    black
+    flake8
+    flake8-import-order
+    pep8-naming
+# This extra is for OpenSSH private keys that use bcrypt KDF
+# Versions: v3.1.3 - ignore_few_rounds, v3.1.5 - abi3
+ssh =
+    bcrypt >= 3.1.5
+
+[flake8]
+ignore = E203,E211,W503,W504,N818
+exclude = .tox,*.egg,.git,_build,.hypothesis
+select = E,W,F,N,I
+application-import-names = cryptography,cryptography_vectors,tests

flake8_to_ruff/pyproject.toml

@@ -12,6 +12,7 @@ classifiers = [
     "Programming Language :: Python :: 3.8",
     "Programming Language :: Python :: 3.9",
     "Programming Language :: Python :: 3.10",
+    "Programming Language :: Python :: 3.11",
     "Programming Language :: Python :: 3 :: Only",
     "Topic :: Software Development :: Libraries :: Python Modules",
     "Topic :: Software Development :: Quality Assurance",

flake8_to_ruff/src/black.rs

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

flake8_to_ruff/src/converter.rs

@@ -7,16 +7,24 @@ use ruff::flake8_tidy_imports::settings::Strictness;
 use ruff::settings::options::Options;
 use ruff::settings::pyproject::Pyproject;
 use ruff::{
-    flake8_annotations, flake8_bugbear, flake8_quotes, flake8_tidy_imports, mccabe, pep8_naming,
+    flake8_annotations, flake8_bugbear, flake8_errmsg, flake8_quotes, flake8_tidy_imports, mccabe,
+    pep8_naming,
 };
 
+use crate::black::Black;
 use crate::plugin::Plugin;
 use crate::{parser, plugin};
 
 pub fn convert(
-    flake8: &HashMap<String, Option<String>>,
+    config: &HashMap<String, HashMap<String, Option<String>>>,
+    black: Option<&Black>,
     plugins: Option<Vec<Plugin>>,
 ) -> Result<Pyproject> {
+    // Extract the Flake8 section.
+    let flake8 = config
+        .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();
     for (key, value) in flake8 {
@@ -53,10 +61,15 @@ pub fn convert(
             plugin::resolve_select(
                 flake8,
                 &plugins.unwrap_or_else(|| {
-                    plugin::infer_plugins_from_options(flake8)
-                        .into_iter()
-                        .chain(plugin::infer_plugins_from_codes(&referenced_codes))
-                        .collect()
+                    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()
                 }),
             )
         });
@@ -73,6 +86,7 @@ pub fn convert(
     let mut options = Options::default();
     let mut flake8_annotations = flake8_annotations::settings::Options::default();
     let mut flake8_bugbear = flake8_bugbear::settings::Options::default();
+    let mut flake8_errmsg = flake8_errmsg::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();
@@ -194,6 +208,15 @@ pub fn convert(
                     Ok(max_complexity) => mccabe.max_complexity = Some(max_complexity),
                     Err(e) => eprintln!("Unable to parse '{key}' property: {e}"),
                 },
+                // flake8-errmsg
+                "errmsg-max-string-length" | "errmsg_max_string_length" => {
+                    match value.clone().parse::<usize>() {
+                        Ok(max_string_length) => {
+                            flake8_errmsg.max_string_length = Some(max_string_length);
+                        }
+                        Err(e) => eprintln!("Unable to parse '{key}' property: {e}"),
+                    }
+                }
                 // Unknown
                 _ => eprintln!("Skipping unsupported property: {key}"),
             }
@@ -209,6 +232,9 @@ pub fn convert(
     if flake8_bugbear != flake8_bugbear::settings::Options::default() {
         options.flake8_bugbear = Some(flake8_bugbear);
     }
+    if flake8_errmsg != flake8_errmsg::settings::Options::default() {
+        options.flake8_errmsg = Some(flake8_errmsg);
+    }
     if flake8_quotes != flake8_quotes::settings::Options::default() {
         options.flake8_quotes = Some(flake8_quotes);
     }
@@ -222,6 +248,19 @@ pub fn convert(
         options.pep8_naming = Some(pep8_naming);
     }
 
+    // Extract any settings from the existing `pyproject.toml`.
+    if let Some(black) = black {
+        if let Some(line_length) = &black.line_length {
+            options.line_length = Some(*line_length);
+        }
+
+        if let Some(target_version) = &black.target_version {
+            if let Some(target_version) = target_version.iter().min() {
+                options.target_version = Some(*target_version);
+            }
+        }
+    }
+
     // Create the pyproject.toml.
     Ok(Pyproject::new(options))
 }
@@ -241,18 +280,31 @@ mod tests {
 
     #[test]
     fn it_converts_empty() -> Result<()> {
-        let actual = convert(&HashMap::from([]), None)?;
+        let actual = convert(
+            &HashMap::from([("flake8".to_string(), HashMap::default())]),
+            None,
+            None,
+        )?;
         let expected = Pyproject::new(Options {
+            allowed_confusables: None,
             dummy_variable_rgx: None,
             exclude: None,
+            extend: None,
             extend_exclude: None,
             extend_ignore: None,
             extend_select: None,
+            external: None,
             fix: None,
+            fix_only: None,
             fixable: None,
+            format: None,
+            force_exclude: None,
             ignore: Some(vec![]),
+            ignore_init_module_imports: None,
             line_length: None,
             per_file_ignores: None,
+            required_version: None,
+            respect_gitignore: None,
             select: Some(vec![
                 CheckCodePrefix::E,
                 CheckCodePrefix::F,
@@ -262,13 +314,19 @@ mod tests {
             src: None,
             target_version: None,
             unfixable: None,
+            cache_dir: None,
             flake8_annotations: None,
             flake8_bugbear: None,
+            flake8_errmsg: None,
             flake8_quotes: None,
             flake8_tidy_imports: None,
+            flake8_import_conventions: None,
+            flake8_unused_arguments: None,
             isort: None,
             mccabe: None,
             pep8_naming: None,
+            pydocstyle: None,
+            pyupgrade: None,
         });
         assert_eq!(actual, expected);
 
@@ -278,20 +336,33 @@ mod tests {
     #[test]
     fn it_converts_dashes() -> Result<()> {
         let actual = convert(
-            &HashMap::from([("max-line-length".to_string(), Some("100".to_string()))]),
+            &HashMap::from([(
+                "flake8".to_string(),
+                HashMap::from([("max-line-length".to_string(), Some("100".to_string()))]),
+            )]),
+            None,
             Some(vec![]),
         )?;
         let expected = Pyproject::new(Options {
+            allowed_confusables: None,
             dummy_variable_rgx: None,
             exclude: None,
+            extend: None,
             extend_exclude: None,
             extend_ignore: None,
             extend_select: None,
+            external: None,
             fix: None,
+            fix_only: None,
             fixable: None,
+            format: None,
+            force_exclude: None,
             ignore: Some(vec![]),
+            ignore_init_module_imports: None,
             line_length: Some(100),
             per_file_ignores: None,
+            required_version: None,
+            respect_gitignore: None,
             select: Some(vec![
                 CheckCodePrefix::E,
                 CheckCodePrefix::F,
@@ -301,13 +372,19 @@ mod tests {
             src: None,
             target_version: None,
             unfixable: None,
+            cache_dir: None,
             flake8_annotations: None,
             flake8_bugbear: None,
+            flake8_errmsg: None,
             flake8_quotes: None,
             flake8_tidy_imports: None,
+            flake8_import_conventions: None,
+            flake8_unused_arguments: None,
             isort: None,
             mccabe: None,
             pep8_naming: None,
+            pydocstyle: None,
+            pyupgrade: None,
         });
         assert_eq!(actual, expected);
 
@@ -317,20 +394,33 @@ mod tests {
     #[test]
     fn it_converts_underscores() -> Result<()> {
         let actual = convert(
-            &HashMap::from([("max_line_length".to_string(), Some("100".to_string()))]),
+            &HashMap::from([(
+                "flake8".to_string(),
+                HashMap::from([("max_line_length".to_string(), Some("100".to_string()))]),
+            )]),
+            None,
             Some(vec![]),
         )?;
         let expected = Pyproject::new(Options {
+            allowed_confusables: None,
             dummy_variable_rgx: None,
             exclude: None,
+            extend: None,
             extend_exclude: None,
             extend_ignore: None,
             extend_select: None,
+            external: None,
             fix: None,
+            fix_only: None,
             fixable: None,
+            format: None,
+            force_exclude: None,
             ignore: Some(vec![]),
+            ignore_init_module_imports: None,
             line_length: Some(100),
             per_file_ignores: None,
+            required_version: None,
+            respect_gitignore: None,
             select: Some(vec![
                 CheckCodePrefix::E,
                 CheckCodePrefix::F,
@@ -340,13 +430,19 @@ mod tests {
             src: None,
             target_version: None,
             unfixable: None,
+            cache_dir: None,
             flake8_annotations: None,
             flake8_bugbear: None,
+            flake8_errmsg: None,
             flake8_quotes: None,
             flake8_tidy_imports: None,
+            flake8_import_conventions: None,
+            flake8_unused_arguments: None,
             isort: None,
             mccabe: None,
             pep8_naming: None,
+            pydocstyle: None,
+            pyupgrade: None,
         });
         assert_eq!(actual, expected);
 
@@ -356,20 +452,33 @@ mod tests {
     #[test]
     fn it_ignores_parse_errors() -> Result<()> {
         let actual = convert(
-            &HashMap::from([("max_line_length".to_string(), Some("abc".to_string()))]),
+            &HashMap::from([(
+                "flake8".to_string(),
+                HashMap::from([("max_line_length".to_string(), Some("abc".to_string()))]),
+            )]),
+            None,
             Some(vec![]),
         )?;
         let expected = Pyproject::new(Options {
+            allowed_confusables: None,
             dummy_variable_rgx: None,
             exclude: None,
+            extend: None,
             extend_exclude: None,
             extend_ignore: None,
             extend_select: None,
+            external: None,
             fix: None,
+            fix_only: None,
             fixable: None,
+            format: None,
+            force_exclude: None,
             ignore: Some(vec![]),
+            ignore_init_module_imports: None,
             line_length: None,
             per_file_ignores: None,
+            required_version: None,
+            respect_gitignore: None,
             select: Some(vec![
                 CheckCodePrefix::E,
                 CheckCodePrefix::F,
@@ -379,13 +488,19 @@ mod tests {
             src: None,
             target_version: None,
             unfixable: None,
+            cache_dir: None,
             flake8_annotations: None,
             flake8_bugbear: None,
+            flake8_errmsg: None,
             flake8_quotes: None,
             flake8_tidy_imports: None,
+            flake8_import_conventions: None,
+            flake8_unused_arguments: None,
             isort: None,
             mccabe: None,
             pep8_naming: None,
+            pydocstyle: None,
+            pyupgrade: None,
         });
         assert_eq!(actual, expected);
 
@@ -395,20 +510,33 @@ mod tests {
     #[test]
     fn it_converts_plugin_options() -> Result<()> {
         let actual = convert(
-            &HashMap::from([("inline-quotes".to_string(), Some("single".to_string()))]),
+            &HashMap::from([(
+                "flake8".to_string(),
+                HashMap::from([("inline-quotes".to_string(), Some("single".to_string()))]),
+            )]),
+            None,
             Some(vec![]),
         )?;
         let expected = Pyproject::new(Options {
+            allowed_confusables: None,
             dummy_variable_rgx: None,
             exclude: None,
+            extend: None,
             extend_exclude: None,
             extend_ignore: None,
             extend_select: None,
+            external: None,
             fix: None,
+            fix_only: None,
             fixable: None,
+            format: None,
+            force_exclude: None,
             ignore: Some(vec![]),
+            ignore_init_module_imports: None,
             line_length: None,
             per_file_ignores: None,
+            required_version: None,
+            respect_gitignore: None,
             select: Some(vec![
                 CheckCodePrefix::E,
                 CheckCodePrefix::F,
@@ -418,8 +546,10 @@ mod tests {
             src: None,
             target_version: None,
             unfixable: None,
+            cache_dir: None,
             flake8_annotations: None,
             flake8_bugbear: None,
+            flake8_errmsg: None,
             flake8_quotes: Some(flake8_quotes::settings::Options {
                 inline_quotes: Some(flake8_quotes::settings::Quote::Single),
                 multiline_quotes: None,
@@ -427,9 +557,13 @@ mod tests {
                 avoid_escape: None,
             }),
             flake8_tidy_imports: None,
+            flake8_import_conventions: None,
+            flake8_unused_arguments: None,
             isort: None,
             mccabe: None,
             pep8_naming: None,
+            pydocstyle: None,
+            pyupgrade: None,
         });
         assert_eq!(actual, expected);
 
@@ -440,22 +574,35 @@ mod tests {
     fn it_converts_docstring_conventions() -> Result<()> {
         let actual = convert(
             &HashMap::from([(
-                "docstring-convention".to_string(),
-                Some("numpy".to_string()),
+                "flake8".to_string(),
+                HashMap::from([(
+                    "docstring-convention".to_string(),
+                    Some("numpy".to_string()),
+                )]),
             )]),
+            None,
             Some(vec![Plugin::Flake8Docstrings]),
         )?;
         let expected = Pyproject::new(Options {
+            allowed_confusables: None,
             dummy_variable_rgx: None,
             exclude: None,
+            extend: None,
             extend_exclude: None,
             extend_ignore: None,
             extend_select: None,
+            external: None,
             fix: None,
+            fix_only: None,
             fixable: None,
+            format: None,
+            force_exclude: None,
             ignore: Some(vec![]),
+            ignore_init_module_imports: None,
             line_length: None,
             per_file_ignores: None,
+            required_version: None,
+            respect_gitignore: None,
             select: Some(vec![
                 CheckCodePrefix::D100,
                 CheckCodePrefix::D101,
@@ -478,6 +625,7 @@ mod tests {
                 CheckCodePrefix::D214,
                 CheckCodePrefix::D215,
                 CheckCodePrefix::D300,
+                CheckCodePrefix::D301,
                 CheckCodePrefix::D400,
                 CheckCodePrefix::D403,
                 CheckCodePrefix::D404,
@@ -500,13 +648,19 @@ mod tests {
             src: None,
             target_version: None,
             unfixable: None,
+            cache_dir: None,
             flake8_annotations: None,
             flake8_bugbear: None,
+            flake8_errmsg: None,
             flake8_quotes: None,
             flake8_tidy_imports: None,
+            flake8_import_conventions: None,
+            flake8_unused_arguments: None,
             isort: None,
             mccabe: None,
             pep8_naming: None,
+            pydocstyle: None,
+            pyupgrade: None,
         });
         assert_eq!(actual, expected);
 
@@ -516,20 +670,33 @@ mod tests {
     #[test]
     fn it_infers_plugins_if_omitted() -> Result<()> {
         let actual = convert(
-            &HashMap::from([("inline-quotes".to_string(), Some("single".to_string()))]),
+            &HashMap::from([(
+                "flake8".to_string(),
+                HashMap::from([("inline-quotes".to_string(), Some("single".to_string()))]),
+            )]),
+            None,
             None,
         )?;
         let expected = Pyproject::new(Options {
+            allowed_confusables: None,
             dummy_variable_rgx: None,
             exclude: None,
+            extend: None,
             extend_exclude: None,
             extend_ignore: None,
             extend_select: None,
+            external: None,
             fix: None,
+            fix_only: None,
             fixable: None,
+            format: None,
+            force_exclude: None,
             ignore: Some(vec![]),
+            ignore_init_module_imports: None,
             line_length: None,
             per_file_ignores: None,
+            required_version: None,
+            respect_gitignore: None,
             select: Some(vec![
                 CheckCodePrefix::E,
                 CheckCodePrefix::F,
@@ -540,8 +707,10 @@ mod tests {
             src: None,
             target_version: None,
             unfixable: None,
+            cache_dir: None,
             flake8_annotations: None,
             flake8_bugbear: None,
+            flake8_errmsg: None,
             flake8_quotes: Some(flake8_quotes::settings::Options {
                 inline_quotes: Some(flake8_quotes::settings::Quote::Single),
                 multiline_quotes: None,
@@ -549,9 +718,13 @@ mod tests {
                 avoid_escape: None,
             }),
             flake8_tidy_imports: None,
+            flake8_import_conventions: None,
+            flake8_unused_arguments: None,
             isort: None,
             mccabe: None,
             pep8_naming: None,
+            pydocstyle: None,
+            pyupgrade: None,
         });
         assert_eq!(actual, expected);
 

flake8_to_ruff/src/lib.rs

@@ -11,6 +11,7 @@
     clippy::too_many_lines
 )]
 
+pub mod black;
 pub mod converter;
 mod parser;
 pub mod plugin;

flake8_to_ruff/src/main.rs

@@ -17,6 +17,7 @@ use std::path::PathBuf;
 use anyhow::Result;
 use clap::Parser;
 use configparser::ini::Ini;
+use flake8_to_ruff::black::parse_black_options;
 use flake8_to_ruff::converter;
 use flake8_to_ruff::plugin::Plugin;
 
@@ -26,10 +27,14 @@ use flake8_to_ruff::plugin::Plugin;
     long_about = None
 )]
 struct Cli {
-    /// Path to the Flake8 configuration file (e.g., 'setup.cfg', 'tox.ini', or
-    /// '.flake8').
+    /// Path to the Flake8 configuration file (e.g., `setup.cfg`, `tox.ini`, or
+    /// `.flake8`).
     #[arg(required = true)]
     file: PathBuf,
+    /// Optional path to a `pyproject.toml` file, used to ensure compatibility
+    /// with Black.
+    #[arg(long)]
+    pyproject: Option<PathBuf>,
     /// List of plugins to enable.
     #[arg(long, value_delimiter = ',')]
     plugin: Option<Vec<Plugin>>,
@@ -43,13 +48,15 @@ fn main() -> Result<()> {
     ini.set_multiline(true);
     let config = ini.load(cli.file).map_err(|msg| anyhow::anyhow!(msg))?;
 
-    // Extract the Flake8 section.
-    let flake8 = config
-        .get("flake8")
-        .expect("Unable to find flake8 section in INI file.");
+    // Read the pyproject.toml file.
+    let black = cli
+        .pyproject
+        .map(parse_black_options)
+        .transpose()?
+        .flatten();
 
-    // Create the pyproject.toml.
-    let pyproject = converter::convert(flake8, cli.plugin)?;
+    // Create Ruff's pyproject.toml section.
+    let pyproject = converter::convert(&config, black.as_ref(), cli.plugin)?;
     println!("{}", toml::to_string_pretty(&pyproject)?);
 
     Ok(())

flake8_to_ruff/src/parser.rs

@@ -1,8 +1,9 @@
 use std::str::FromStr;
 
-use anyhow::Result;
+use anyhow::{bail, Result};
 use once_cell::sync::Lazy;
 use regex::Regex;
+use ruff::checks::PREFIX_REDIRECTS;
 use ruff::checks_gen::CheckCodePrefix;
 use ruff::settings::types::PatternPrefixPair;
 use rustc_hash::FxHashMap;
@@ -18,7 +19,9 @@ pub fn parse_prefix_codes(value: &str) -> Vec<CheckCodePrefix> {
         if code.is_empty() {
             continue;
         }
-        if let Ok(code) = CheckCodePrefix::from_str(code) {
+        if let Some(code) = PREFIX_REDIRECTS.get(code) {
+            codes.push(code.clone());
+        } else if let Ok(code) = CheckCodePrefix::from_str(code) {
             codes.push(code);
         } else {
             eprintln!("Unsupported prefix code: {code}");
@@ -42,7 +45,7 @@ pub fn parse_bool(value: &str) -> Result<bool> {
     match value.trim() {
         "true" => Ok(true),
         "false" => Ok(false),
-        _ => Err(anyhow::anyhow!("Unexpected boolean value: {value}")),
+        _ => bail!("Unexpected boolean value: {value}"),
     }
 }
 
@@ -83,16 +86,22 @@ impl State {
     fn parse(&self) -> Vec<PatternPrefixPair> {
         let mut codes: Vec<PatternPrefixPair> = vec![];
         for code in &self.codes {
-            match CheckCodePrefix::from_str(code) {
-                Ok(code) => {
-                    for filename in &self.filenames {
-                        codes.push(PatternPrefixPair {
-                            pattern: filename.clone(),
-                            prefix: code.clone(),
-                        });
-                    }
+            if let Some(code) = PREFIX_REDIRECTS.get(code.as_str()) {
+                for filename in &self.filenames {
+                    codes.push(PatternPrefixPair {
+                        pattern: filename.clone(),
+                        prefix: code.clone(),
+                    });
                 }
-                Err(_) => eprintln!("Skipping unrecognized prefix: {code}"),
+            } else if let Ok(code) = CheckCodePrefix::from_str(code) {
+                for filename in &self.filenames {
+                    codes.push(PatternPrefixPair {
+                        pattern: filename.clone(),
+                        prefix: code.clone(),
+                    });
+                }
+            } else {
+                eprintln!("Unsupported prefix code: {code}");
             }
         }
         codes
@@ -135,7 +144,6 @@ fn tokenize_files_to_codes_mapping(value: &str) -> Vec<Token> {
 }
 
 /// Parse a 'files-to-codes' mapping, mimicking Flake8's internal logic.
-///
 /// See: <https://github.com/PyCQA/flake8/blob/7dfe99616fc2f07c0017df2ba5fa884158f3ea8a/src/flake8/utils.py#L45>
 pub fn parse_files_to_codes_mapping(value: &str) -> Result<Vec<PatternPrefixPair>> {
     if value.trim().is_empty() {
@@ -154,7 +162,7 @@ pub fn parse_files_to_codes_mapping(value: &str) -> Result<Vec<PatternPrefixPair
                 state.filenames.push(token.src);
                 state.seen_sep = false;
             } else {
-                return Err(anyhow::anyhow!("Unexpected token: {:?}", token.token_name));
+                bail!("Unexpected token: {:?}", token.token_name);
             }
         } else {
             if matches!(token.token_name, TokenType::Eof) {
@@ -169,7 +177,7 @@ pub fn parse_files_to_codes_mapping(value: &str) -> Result<Vec<PatternPrefixPair
                 state.filenames.push(token.src);
                 state.seen_sep = false;
             } else {
-                return Err(anyhow::anyhow!("Unexpected token: {:?}", token.token_name));
+                bail!("Unexpected token: {:?}", token.token_name);
             }
         }
     }

flake8_to_ruff/src/plugin.rs

@@ -1,23 +1,30 @@
 use std::collections::{BTreeSet, HashMap};
+use std::fmt;
 use std::str::FromStr;
 
 use anyhow::anyhow;
 use ruff::checks_gen::CheckCodePrefix;
 
-#[derive(Debug, Clone, Ord, PartialOrd, Eq, PartialEq)]
+#[derive(Clone, Ord, PartialOrd, Eq, PartialEq)]
 pub enum Plugin {
+    Flake8Annotations,
     Flake8Bandit,
+    Flake8BlindExcept,
     Flake8Bugbear,
     Flake8Builtins,
     Flake8Comprehensions,
+    Flake8Datetimez,
     Flake8Debugger,
     Flake8Docstrings,
-    Flake8TidyImports,
+    Flake8ErrMsg,
+    Flake8Eradicate,
     Flake8Print,
     Flake8Quotes,
-    Flake8Annotations,
+    Flake8Return,
+    Flake8Simplify,
+    Flake8TidyImports,
     McCabe,
-    Flake8BlindExcept,
+    PandasVet,
     PEP8Naming,
     Pyupgrade,
 }
@@ -27,51 +34,99 @@ impl FromStr for Plugin {
 
     fn from_str(string: &str) -> Result<Self, Self::Err> {
         match string {
+            "flake8-annotations" => Ok(Plugin::Flake8Annotations),
             "flake8-bandit" => Ok(Plugin::Flake8Bandit),
+            "flake8-blind-except" => Ok(Plugin::Flake8BlindExcept),
             "flake8-bugbear" => Ok(Plugin::Flake8Bugbear),
             "flake8-builtins" => Ok(Plugin::Flake8Builtins),
             "flake8-comprehensions" => Ok(Plugin::Flake8Comprehensions),
+            "flake8-datetimez" => Ok(Plugin::Flake8Datetimez),
             "flake8-debugger" => Ok(Plugin::Flake8Debugger),
             "flake8-docstrings" => Ok(Plugin::Flake8Docstrings),
-            "flake8-tidy-imports" => Ok(Plugin::Flake8TidyImports),
+            "flake8-eradicate" => Ok(Plugin::Flake8Eradicate),
+            "flake8-errmsg" => Ok(Plugin::Flake8ErrMsg),
             "flake8-print" => Ok(Plugin::Flake8Print),
             "flake8-quotes" => Ok(Plugin::Flake8Quotes),
-            "flake8-annotations" => Ok(Plugin::Flake8Annotations),
-            "flake8-blind-except" => Ok(Plugin::Flake8BlindExcept),
+            "flake8-return" => Ok(Plugin::Flake8Return),
+            "flake8-simplify" => Ok(Plugin::Flake8Simplify),
+            "flake8-tidy-imports" => Ok(Plugin::Flake8TidyImports),
             "mccabe" => Ok(Plugin::McCabe),
+            "pandas-vet" => Ok(Plugin::PandasVet),
             "pep8-naming" => Ok(Plugin::PEP8Naming),
             "pyupgrade" => Ok(Plugin::Pyupgrade),
-            _ => Err(anyhow!("Unknown plugin: {}", string)),
+            _ => Err(anyhow!("Unknown plugin: {string}")),
         }
     }
 }
 
+impl fmt::Debug for Plugin {
+    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+        write!(
+            f,
+            "{}",
+            match self {
+                Plugin::Flake8Annotations => "flake8-annotations",
+                Plugin::Flake8Bandit => "flake8-bandit",
+                Plugin::Flake8BlindExcept => "flake8-blind-except",
+                Plugin::Flake8Bugbear => "flake8-bugbear",
+                Plugin::Flake8Builtins => "flake8-builtins",
+                Plugin::Flake8Comprehensions => "flake8-comprehensions",
+                Plugin::Flake8Datetimez => "flake8-datetimez",
+                Plugin::Flake8Debugger => "flake8-debugger",
+                Plugin::Flake8Docstrings => "flake8-docstrings",
+                Plugin::Flake8Eradicate => "flake8-eradicate",
+                Plugin::Flake8ErrMsg => "flake8-errmsg",
+                Plugin::Flake8Print => "flake8-print",
+                Plugin::Flake8Quotes => "flake8-quotes",
+                Plugin::Flake8Return => "flake8-return",
+                Plugin::Flake8Simplify => "flake8-simplify",
+                Plugin::Flake8TidyImports => "flake8-tidy-imports",
+                Plugin::McCabe => "mccabe",
+                Plugin::PandasVet => "pandas-vet",
+                Plugin::PEP8Naming => "pep8-naming",
+                Plugin::Pyupgrade => "pyupgrade",
+            }
+        )
+    }
+}
+
 impl Plugin {
     pub fn default(&self) -> CheckCodePrefix {
         match self {
+            Plugin::Flake8Annotations => CheckCodePrefix::ANN,
             Plugin::Flake8Bandit => CheckCodePrefix::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::Flake8TidyImports => CheckCodePrefix::I25,
+            // TODO(charlie): Handle rename of `E` to `ERA`.
+            Plugin::Flake8Eradicate => CheckCodePrefix::ERA,
+            Plugin::Flake8ErrMsg => CheckCodePrefix::EM,
             Plugin::Flake8Print => CheckCodePrefix::T2,
             Plugin::Flake8Quotes => CheckCodePrefix::Q,
-            Plugin::Flake8Annotations => CheckCodePrefix::ANN,
-            Plugin::Flake8BlindExcept => CheckCodePrefix::BLE,
+            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::U,
+            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.
@@ -89,14 +144,17 @@ impl Plugin {
                 // Default to PEP8.
                 DocstringConvention::PEP8.select()
             }
-            Plugin::Flake8TidyImports => vec![CheckCodePrefix::I25],
+            Plugin::Flake8Eradicate => vec![CheckCodePrefix::ERA],
+            Plugin::Flake8ErrMsg => vec![CheckCodePrefix::EM],
             Plugin::Flake8Print => vec![CheckCodePrefix::T2],
             Plugin::Flake8Quotes => vec![CheckCodePrefix::Q],
-            Plugin::Flake8Annotations => vec![CheckCodePrefix::ANN],
-            Plugin::Flake8BlindExcept => vec![CheckCodePrefix::BLE],
+            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::U],
+            Plugin::Pyupgrade => vec![CheckCodePrefix::UP],
         }
     }
 }
@@ -117,7 +175,7 @@ impl FromStr for DocstringConvention {
             "pep8" => Ok(DocstringConvention::PEP8),
             "numpy" => Ok(DocstringConvention::NumPy),
             "google" => Ok(DocstringConvention::Google),
-            _ => Err(anyhow!("Unknown docstring convention: {}", string)),
+            _ => Err(anyhow!("Unknown docstring convention: {string}")),
         }
     }
 }
@@ -154,6 +212,7 @@ impl DocstringConvention {
                 // CheckCodePrefix::D214,
                 // CheckCodePrefix::D215,
                 CheckCodePrefix::D300,
+                CheckCodePrefix::D301,
                 CheckCodePrefix::D400,
                 CheckCodePrefix::D402,
                 CheckCodePrefix::D403,
@@ -201,6 +260,7 @@ impl DocstringConvention {
                 CheckCodePrefix::D214,
                 CheckCodePrefix::D215,
                 CheckCodePrefix::D300,
+                CheckCodePrefix::D301,
                 CheckCodePrefix::D400,
                 // CheckCodePrefix::D402,
                 CheckCodePrefix::D403,
@@ -249,6 +309,7 @@ impl DocstringConvention {
                 CheckCodePrefix::D214,
                 // CheckCodePrefix::D215,
                 CheckCodePrefix::D300,
+                CheckCodePrefix::D301,
                 // CheckCodePrefix::D400,
                 CheckCodePrefix::D402,
                 CheckCodePrefix::D403,
@@ -281,31 +342,6 @@ pub fn infer_plugins_from_options(flake8: &HashMap<String, Option<String>>) -> V
     let mut plugins = BTreeSet::new();
     for key in flake8.keys() {
         match key.as_str() {
-            // flake8-docstrings
-            "docstring-convention" | "docstring_convention" => {
-                plugins.insert(Plugin::Flake8Docstrings);
-            }
-            // flake8-bugbear
-            "extend-immutable-calls" | "extend_immutable_calls" => {
-                plugins.insert(Plugin::Flake8Bugbear);
-            }
-            // flake8-builtins
-            "builtins-ignorelist" | "builtins_ignorelist" => {
-                plugins.insert(Plugin::Flake8Builtins);
-            }
-            // flake8-quotes
-            "quotes" | "inline-quotes" | "inline_quotes" => {
-                plugins.insert(Plugin::Flake8Quotes);
-            }
-            "multiline-quotes" | "multiline_quotes" => {
-                plugins.insert(Plugin::Flake8Quotes);
-            }
-            "docstring-quotes" | "docstring_quotes" => {
-                plugins.insert(Plugin::Flake8Quotes);
-            }
-            "avoid-escape" | "avoid_escape" => {
-                plugins.insert(Plugin::Flake8Quotes);
-            }
             // flake8-annotations
             "suppress-none-returning" | "suppress_none_returning" => {
                 plugins.insert(Plugin::Flake8Annotations);
@@ -331,6 +367,41 @@ pub fn infer_plugins_from_options(flake8: &HashMap<String, Option<String>>) -> V
             "allow-star-arg-any" | "allow_star_arg_any" => {
                 plugins.insert(Plugin::Flake8Annotations);
             }
+            // flake8-bugbear
+            "extend-immutable-calls" | "extend_immutable_calls" => {
+                plugins.insert(Plugin::Flake8Bugbear);
+            }
+            // flake8-builtins
+            "builtins-ignorelist" | "builtins_ignorelist" => {
+                plugins.insert(Plugin::Flake8Builtins);
+            }
+            // flake8-docstrings
+            "docstring-convention" | "docstring_convention" => {
+                plugins.insert(Plugin::Flake8Docstrings);
+            }
+            // flake8-eradicate
+            "eradicate-aggressive" | "eradicate_aggressive" => {
+                plugins.insert(Plugin::Flake8Eradicate);
+            }
+            "eradicate-whitelist" | "eradicate_whitelist" => {
+                plugins.insert(Plugin::Flake8Eradicate);
+            }
+            "eradicate-whitelist-extend" | "eradicate_whitelist_extend" => {
+                plugins.insert(Plugin::Flake8Eradicate);
+            }
+            // flake8-quotes
+            "quotes" | "inline-quotes" | "inline_quotes" => {
+                plugins.insert(Plugin::Flake8Quotes);
+            }
+            "multiline-quotes" | "multiline_quotes" => {
+                plugins.insert(Plugin::Flake8Quotes);
+            }
+            "docstring-quotes" | "docstring_quotes" => {
+                plugins.insert(Plugin::Flake8Quotes);
+            }
+            "avoid-escape" | "avoid_escape" => {
+                plugins.insert(Plugin::Flake8Quotes);
+            }
             // flake8-tidy-imports
             "ban-relative-imports" | "ban_relative_imports" => {
                 plugins.insert(Plugin::Flake8TidyImports);
@@ -352,6 +423,9 @@ pub fn infer_plugins_from_options(flake8: &HashMap<String, Option<String>>) -> V
             "staticmethod-decorators" | "staticmethod_decorators" => {
                 plugins.insert(Plugin::PEP8Naming);
             }
+            "max-string-length" | "max_string_length" => {
+                plugins.insert(Plugin::Flake8ErrMsg);
+            }
             _ => {}
         }
     }
@@ -364,19 +438,24 @@ pub fn infer_plugins_from_options(flake8: &HashMap<String, Option<String>>) -> V
 /// `flake8-annotations` is active.
 pub fn infer_plugins_from_codes(codes: &BTreeSet<CheckCodePrefix>) -> Vec<Plugin> {
     [
+        Plugin::Flake8Annotations,
         Plugin::Flake8Bandit,
+        Plugin::Flake8BlindExcept,
         Plugin::Flake8Bugbear,
         Plugin::Flake8Builtins,
         Plugin::Flake8Comprehensions,
+        Plugin::Flake8Datetimez,
         Plugin::Flake8Debugger,
         Plugin::Flake8Docstrings,
-        Plugin::Flake8TidyImports,
+        Plugin::Flake8Eradicate,
+        Plugin::Flake8ErrMsg,
         Plugin::Flake8Print,
         Plugin::Flake8Quotes,
-        Plugin::Flake8Annotations,
-        Plugin::Flake8BlindExcept,
+        Plugin::Flake8Return,
+        Plugin::Flake8Simplify,
+        Plugin::Flake8TidyImports,
+        Plugin::PandasVet,
         Plugin::PEP8Naming,
-        Plugin::Pyupgrade,
     ]
     .into_iter()
     .filter(|plugin| {

playground/.eslintrc

@@ -0,0 +1,25 @@
+{
+  "parser": "@typescript-eslint/parser",
+  "plugins": ["@typescript-eslint", "prettier"],
+  "extends": [
+    "eslint:recommended",
+    "plugin:@typescript-eslint/eslint-recommended",
+    "plugin:@typescript-eslint/recommended",
+    "plugin:react/recommended",
+    "plugin:react/jsx-runtime",
+    "plugin:react-hooks/recommended",
+    "plugin:import/recommended",
+    "plugin:import/typescript",
+    "plugin:prettier/recommended"
+  ],
+  "rules": {
+    // Disable some recommended rules that we don't want to enforce.
+    "@typescript-eslint/no-explicit-any": "off",
+    "@typescript-eslint/no-empty-function": "off"
+  },
+  "settings": {
+    "react": {
+      "version": "detect"
+    }
+  }
+}

playground/.gitignore

@@ -0,0 +1,130 @@
+# Logs
+logs
+*.log
+npm-debug.log*
+yarn-debug.log*
+yarn-error.log*
+lerna-debug.log*
+.pnpm-debug.log*
+
+# Diagnostic reports (https://nodejs.org/api/report.html)
+report.[0-9]*.[0-9]*.[0-9]*.[0-9]*.json
+
+# Runtime data
+pids
+*.pid
+*.seed
+*.pid.lock
+
+# Directory for instrumented libs generated by jscoverage/JSCover
+lib-cov
+
+# Coverage directory used by tools like istanbul
+coverage
+*.lcov
+
+# nyc test coverage
+.nyc_output
+
+# Grunt intermediate storage (https://gruntjs.com/creating-plugins#storing-task-files)
+.grunt
+
+# Bower dependency directory (https://bower.io/)
+bower_components
+
+# node-waf configuration
+.lock-wscript
+
+# Compiled binary addons (https://nodejs.org/api/addons.html)
+build/Release
+
+# Dependency directories
+node_modules/
+jspm_packages/
+
+# Snowpack dependency directory (https://snowpack.dev/)
+web_modules/
+
+# TypeScript cache
+*.tsbuildinfo
+
+# Optional npm cache directory
+.npm
+
+# Optional eslint cache
+.eslintcache
+
+# Optional stylelint cache
+.stylelintcache
+
+# Microbundle cache
+.rpt2_cache/
+.rts2_cache_cjs/
+.rts2_cache_es/
+.rts2_cache_umd/
+
+# Optional REPL history
+.node_repl_history
+
+# Output of 'npm pack'
+*.tgz
+
+# Yarn Integrity file
+.yarn-integrity
+
+# dotenv environment variable files
+.env
+.env.development.local
+.env.test.local
+.env.production.local
+.env.local
+
+# parcel-bundler cache (https://parceljs.org/)
+.cache
+.parcel-cache
+
+# Next.js build output
+.next
+out
+
+# Nuxt.js build / generate output
+.nuxt
+dist
+
+# Gatsby files
+.cache/
+# Comment in the public line in if your project uses Gatsby and not Next.js
+# https://nextjs.org/blog/next-9-1#public-directory-support
+# public
+
+# vuepress build output
+.vuepress/dist
+
+# vuepress v2.x temp and cache directory
+.temp
+.cache
+
+# Docusaurus cache and generated files
+.docusaurus
+
+# Serverless directories
+.serverless/
+
+# FuseBox cache
+.fusebox/
+
+# DynamoDB Local files
+.dynamodb/
+
+# TernJS port file
+.tern-port
+
+# Stores VSCode versions used for testing VSCode extensions
+.vscode-test
+
+# yarn v2
+.yarn/cache
+.yarn/unplugged
+.yarn/build-state.yml
+.yarn/install-state.gz
+.pnp.*

playground/.prettierignore

@@ -0,0 +1 @@
+src/ruff_options.ts

playground/README.md

@@ -0,0 +1,10 @@
+# playground
+
+In-browser playground for Ruff. Available [https://ruff.pages.dev/](https://ruff.pages.dev/).
+
+## Getting started
+
+- To build the WASM module, run `wasm-pack build --target web --out-dir playground/src/pkg` from the
+  root directory.
+- Install TypeScript dependencies with: `npm install`.
+- Start the development server with: `npm run dev`.

playground/index.html

@@ -0,0 +1,29 @@
+<!DOCTYPE html>
+<html lang="en">
+  <head>
+    <meta charset="UTF-8" />
+    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+    <meta
+      name="description"
+      content="An in-browser playground for Ruff, an extremely fast Python linter written in Rust."
+    />
+    <meta name="keywords" content="ruff, python, rust, webassembly, wasm" />
+    <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>"
+    />
+  </head>
+  <body>
+    <div id="root"></div>
+    <div style="display: flex; position: fixed; right: 16px; top: 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/package.json

@@ -0,0 +1,38 @@
+{
+  "name": "playground",
+  "private": true,
+  "version": "0.0.0",
+  "type": "module",
+  "scripts": {
+    "build": "tsc && vite build",
+    "check": "npm run lint && npm run tsc",
+    "dev": "vite",
+    "fmt": "prettier --cache -w .",
+    "lint": "eslint --cache --ext .ts,.tsx src",
+    "preview": "vite preview",
+    "tsc": "tsc"
+  },
+  "dependencies": {
+    "@monaco-editor/react": "^4.4.6",
+    "lz-string": "^1.4.4",
+    "monaco-editor": "^0.34.1",
+    "react": "^18.2.0",
+    "react-dom": "^18.2.0"
+  },
+  "devDependencies": {
+    "@types/react": "^18.0.26",
+    "@types/react-dom": "^18.0.9",
+    "@typescript-eslint/eslint-plugin": "^5.47.1",
+    "@typescript-eslint/parser": "^5.47.1",
+    "@vitejs/plugin-react-swc": "^3.0.0",
+    "eslint": "^8.30.0",
+    "eslint-config-prettier": "^8.5.0",
+    "eslint-plugin-import": "^2.26.0",
+    "eslint-plugin-prettier": "^4.2.1",
+    "eslint-plugin-react": "^7.31.11",
+    "eslint-plugin-react-hooks": "^4.6.0",
+    "prettier": "^2.8.1",
+    "typescript": "^4.9.3",
+    "vite": "^4.0.0"
+  }
+}

playground/src/App.tsx

@@ -0,0 +1,200 @@
+import lzstring from "lz-string";
+import Editor, { useMonaco } from "@monaco-editor/react";
+import { MarkerSeverity } from "monaco-editor/esm/vs/editor/editor.api";
+import { useEffect, useState, useCallback } from "react";
+
+import init, { Check, check } from "./pkg/ruff.js";
+import { AVAILABLE_OPTIONS } from "./ruff_options";
+import { Config, getDefaultConfig, toRuffConfig } from "./config";
+import { Options } from "./Options";
+
+const DEFAULT_SOURCE =
+  "# Define a function that takes an integer n and returns the nth number in the Fibonacci\n" +
+  "# sequence.\n" +
+  "def fibonacci(n):\n" +
+  "  if n == 0:\n" +
+  "    return 0\n" +
+  "  elif n == 1:\n" +
+  "    return 1\n" +
+  "  else:\n" +
+  "    return fibonacci(n-1) + fibonacci(n-2)\n" +
+  "\n" +
+  "# Use a for loop to generate and print the first 10 numbers in the Fibonacci sequence.\n" +
+  "for i in range(10):\n" +
+  "  print(fibonacci(i))\n" +
+  "\n" +
+  "# Output:\n" +
+  "# 0\n" +
+  "# 1\n" +
+  "# 1\n" +
+  "# 2\n" +
+  "# 3\n" +
+  "# 5\n" +
+  "# 8\n" +
+  "# 13\n" +
+  "# 21\n" +
+  "# 34\n";
+
+function restoreConfigAndSource(): [Config, string] {
+  const value = lzstring.decompressFromEncodedURIComponent(
+    window.location.hash.slice(1)
+  );
+  let config = {};
+  let source = DEFAULT_SOURCE;
+
+  if (value) {
+    const parts = value.split("$$$");
+    config = JSON.parse(parts[0]);
+    source = parts[1];
+  }
+
+  return [config, source];
+}
+
+function persistConfigAndSource(config: Config, source: string) {
+  window.location.hash = lzstring.compressToEncodedURIComponent(
+    JSON.stringify(config) + "$$$" + source
+  );
+}
+
+const defaultConfig = getDefaultConfig(AVAILABLE_OPTIONS);
+
+export default function App() {
+  const monaco = useMonaco();
+  const [initialized, setInitialized] = useState<boolean>(false);
+  const [config, setConfig] = useState<Config | null>(null);
+  const [source, setSource] = useState<string | null>(null);
+  const [error, setError] = useState<string | null>(null);
+
+  useEffect(() => {
+    init().then(() => setInitialized(true));
+  }, []);
+
+  useEffect(() => {
+    if (source == null && config == null && monaco) {
+      const [config, source] = restoreConfigAndSource();
+      setConfig(config);
+      setSource(source);
+    }
+  }, [monaco, source, config]);
+
+  useEffect(() => {
+    if (config != null && source != null) {
+      persistConfigAndSource(config, source);
+    }
+  }, [config, source]);
+
+  useEffect(() => {
+    const editor = monaco?.editor;
+    const model = editor?.getModels()[0];
+    if (!editor || !model || !initialized || source == null || config == null) {
+      return;
+    }
+
+    let checks: Check[];
+    try {
+      checks = check(source, toRuffConfig(config));
+      setError(null);
+    } catch (e) {
+      setError(String(e));
+      return;
+    }
+
+    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}`,
+        severity: MarkerSeverity.Error,
+      }))
+    );
+
+    const codeActionProvider = monaco?.languages.registerCodeActionProvider(
+      "python",
+      {
+        // @ts-expect-error: The type definition is wrong.
+        provideCodeActions: function (model, position) {
+          const actions = checks
+            .filter((check) => position.startLineNumber === check.location.row)
+            .filter((check) => check.fix)
+            .map((check) => ({
+              title: `Fix ${check.code}`,
+              id: `fix-${check.code}`,
+              kind: "quickfix",
+              edit: check.fix
+                ? {
+                    edits: [
+                      {
+                        resource: model.uri,
+                        versionId: model.getVersionId(),
+                        edit: {
+                          range: {
+                            startLineNumber: check.fix.location.row,
+                            startColumn: check.fix.location.column + 1,
+                            endLineNumber: check.fix.end_location.row,
+                            endColumn: check.fix.end_location.column + 1,
+                          },
+                          text: check.fix.content,
+                        },
+                      },
+                    ],
+                  }
+                : undefined,
+            }));
+          return { actions, dispose: () => {} };
+        },
+      }
+    );
+
+    return () => {
+      codeActionProvider?.dispose();
+    };
+  }, [config, source, monaco, initialized]);
+
+  const handleEditorChange = useCallback(
+    (value: string | undefined) => {
+      setSource(value || "");
+    },
+    [setSource]
+  );
+
+  const handleOptionChange = useCallback(
+    (groupName: string, fieldName: string, value: string) => {
+      const group = Object.assign({}, (config || {})[groupName]);
+      if (value === defaultConfig[groupName][fieldName] || value === "") {
+        delete group[fieldName];
+      } else {
+        group[fieldName] = value;
+      }
+
+      setConfig({
+        ...config,
+        [groupName]: group,
+      });
+    },
+    [config]
+  );
+
+  return (
+    <div id="app">
+      <Options
+        config={config}
+        defaultConfig={defaultConfig}
+        onChange={handleOptionChange}
+      />
+      <Editor
+        options={{ readOnly: false, minimap: { enabled: false } }}
+        wrapperProps={{ className: "editor" }}
+        defaultLanguage="python"
+        value={source || ""}
+        theme={"light"}
+        onChange={handleEditorChange}
+      />
+      {error && <div id="error">{error}</div>}
+    </div>
+  );
+}

playground/src/Options.tsx

@@ -0,0 +1,72 @@
+import { Config } from "./config";
+import { AVAILABLE_OPTIONS } from "./ruff_options";
+
+function OptionEntry({
+  config,
+  defaultConfig,
+  groupName,
+  fieldName,
+  onChange,
+}: {
+  config: Config | null;
+  defaultConfig: Config;
+  groupName: string;
+  fieldName: string;
+  onChange: (groupName: string, fieldName: string, value: string) => void;
+}) {
+  const value =
+    config && config[groupName] && config[groupName][fieldName]
+      ? config[groupName][fieldName]
+      : "";
+
+  return (
+    <span>
+      <label>
+        {fieldName}
+        <input
+          value={value}
+          placeholder={defaultConfig[groupName][fieldName]}
+          type="text"
+          onChange={(event) => {
+            onChange(groupName, fieldName, event.target.value);
+          }}
+        />
+      </label>
+    </span>
+  );
+}
+
+export function Options({
+  config,
+  defaultConfig,
+  onChange,
+}: {
+  config: Config | null;
+  defaultConfig: Config;
+  onChange: (groupName: string, fieldName: string, value: string) => void;
+}) {
+  return (
+    <div className="options">
+      {AVAILABLE_OPTIONS.map((group) => (
+        <details key={group.name}>
+          <summary>{group.name}</summary>
+          <div>
+            <ul>
+              {group.fields.map((field) => (
+                <li key={field.name}>
+                  <OptionEntry
+                    config={config}
+                    defaultConfig={defaultConfig}
+                    groupName={group.name}
+                    fieldName={field.name}
+                    onChange={onChange}
+                  />
+                </li>
+              ))}
+            </ul>
+          </div>
+        </details>
+      ))}
+    </div>
+  );
+}

playground/src/config.ts

@@ -0,0 +1,52 @@
+import { OptionGroup } from "./ruff_options";
+
+export type Config = { [key: string]: { [key: string]: string } };
+
+export function getDefaultConfig(availableOptions: OptionGroup[]): Config {
+  const config: Config = {};
+  availableOptions.forEach((group) => {
+    config[group.name] = {};
+    group.fields.forEach((f) => {
+      config[group.name][f.name] = f.default;
+    });
+  });
+  return config;
+}
+
+/**
+ * Convert the config in the application to something Ruff accepts.
+ *
+ * Application config is always nested one level. Ruff allows for some
+ * top-level options.
+ *
+ * Any option value is parsed as JSON to convert it to a native JS object.
+ * If that fails, e.g. while a user is typing, we let the application handle that
+ * and show an error.
+ */
+export function toRuffConfig(config: Config): any {
+  const convertValue = (value: string): any => {
+    return value === "None" ? null : JSON.parse(value);
+  };
+
+  const result: any = {};
+  Object.keys(config).forEach((group_name) => {
+    const fields = config[group_name];
+    if (!fields || Object.keys(fields).length === 0) {
+      return;
+    }
+
+    if (group_name === "globals") {
+      Object.keys(fields).forEach((field_name) => {
+        result[field_name] = convertValue(fields[field_name]);
+      });
+    } else {
+      result[group_name] = {};
+
+      Object.keys(fields).forEach((field_name) => {
+        result[group_name][field_name] = convertValue(fields[field_name]);
+      });
+    }
+  });
+
+  return result;
+}

playground/src/custom.d.ts

@@ -0,0 +1,6 @@
+declare module "lz-string" {
+  function decompressFromEncodedURIComponent(
+    input: string | null
+  ): string | null;
+  function compressToEncodedURIComponent(input: string | null): string;
+}

playground/src/main.tsx

@@ -0,0 +1,10 @@
+import React from "react";
+import ReactDOM from "react-dom/client";
+import App from "./App";
+import "./style.css";
+
+ReactDOM.createRoot(document.getElementById("root") as HTMLElement).render(
+  <React.StrictMode>
+    <App />
+  </React.StrictMode>
+);

playground/src/ruff_options.ts

@@ -0,0 +1,239 @@
+
+// This file is auto-generated by `cargo dev generate-playground-options`.
+export interface OptionGroup {
+    name: string;
+    fields: {
+        name: string;
+        default: string;
+        type: string;
+    }[];
+};
+
+export const AVAILABLE_OPTIONS: OptionGroup[] = [
+    {"name": "globals", "fields": [
+        {
+            "name": "allowed-confusables",
+            "default": '[]',
+            "type": 'Vec<char>',
+        },
+        {
+            "name": "dummy-variable-rgx",
+            "default": '"^(_+|(_+[a-zA-Z0-9_]*[a-zA-Z0-9]+?))$"',
+            "type": 'Regex',
+        },
+        {
+            "name": "extend-ignore",
+            "default": '[]',
+            "type": 'Vec<CheckCodePrefix>',
+        },
+        {
+            "name": "extend-select",
+            "default": '[]',
+            "type": 'Vec<CheckCodePrefix>',
+        },
+        {
+            "name": "external",
+            "default": '[]',
+            "type": 'Vec<String>',
+        },
+        {
+            "name": "fix-only",
+            "default": 'false',
+            "type": 'bool',
+        },
+        {
+            "name": "ignore",
+            "default": '[]',
+            "type": 'Vec<CheckCodePrefix>',
+        },
+        {
+            "name": "line-length",
+            "default": '88',
+            "type": 'usize',
+        },
+        {
+            "name": "required-version",
+            "default": 'None',
+            "type": 'String',
+        },
+        {
+            "name": "select",
+            "default": '["E", "F"]',
+            "type": 'Vec<CheckCodePrefix>',
+        },
+        {
+            "name": "target-version",
+            "default": '"py310"',
+            "type": 'PythonVersion',
+        },
+        {
+            "name": "unfixable",
+            "default": '[]',
+            "type": 'Vec<CheckCodePrefix>',
+        },
+    ]},
+    {"name": "flake8-annotations", "fields": [
+        {
+            "name": "allow-star-arg-any",
+            "default": 'false',
+            "type": 'bool',
+        },
+        {
+            "name": "mypy-init-return",
+            "default": 'false',
+            "type": 'bool',
+        },
+        {
+            "name": "suppress-dummy-args",
+            "default": 'false',
+            "type": 'bool',
+        },
+        {
+            "name": "suppress-none-returning",
+            "default": 'false',
+            "type": 'bool',
+        },
+    ]},
+    {"name": "flake8-bugbear", "fields": [
+        {
+            "name": "extend-immutable-calls",
+            "default": '[]',
+            "type": 'Vec<String>',
+        },
+    ]},
+    {"name": "flake8-errmsg", "fields": [
+        {
+            "name": "max-string-length",
+            "default": '0',
+            "type": 'usize',
+        },
+    ]},
+    {"name": "flake8-import-conventions", "fields": [
+        {
+            "name": "aliases",
+            "default": '{"altair": "alt", "matplotlib.pyplot": "plt", "numpy": "np", "pandas": "pd", "seaborn": "sns"}',
+            "type": 'FxHashMap<String, String>',
+        },
+        {
+            "name": "extend-aliases",
+            "default": '{}',
+            "type": 'FxHashMap<String, String>',
+        },
+    ]},
+    {"name": "flake8-quotes", "fields": [
+        {
+            "name": "avoid-escape",
+            "default": 'true',
+            "type": 'bool',
+        },
+        {
+            "name": "docstring-quotes",
+            "default": '"double"',
+            "type": 'Quote',
+        },
+        {
+            "name": "inline-quotes",
+            "default": '"double"',
+            "type": 'Quote',
+        },
+        {
+            "name": "multiline-quotes",
+            "default": '"double"',
+            "type": 'Quote',
+        },
+    ]},
+    {"name": "flake8-tidy-imports", "fields": [
+        {
+            "name": "ban-relative-imports",
+            "default": '"parents"',
+            "type": 'Strictness',
+        },
+    ]},
+    {"name": "flake8-unused-arguments", "fields": [
+        {
+            "name": "ignore-variadic-names",
+            "default": 'false',
+            "type": 'bool',
+        },
+    ]},
+    {"name": "isort", "fields": [
+        {
+            "name": "combine-as-imports",
+            "default": 'false',
+            "type": 'bool',
+        },
+        {
+            "name": "extra-standard-library",
+            "default": '[]',
+            "type": 'Vec<String>',
+        },
+        {
+            "name": "force-single-line",
+            "default": 'false',
+            "type": 'bool',
+        },
+        {
+            "name": "force-wrap-aliases",
+            "default": 'false',
+            "type": 'bool',
+        },
+        {
+            "name": "known-first-party",
+            "default": '[]',
+            "type": 'Vec<String>',
+        },
+        {
+            "name": "known-third-party",
+            "default": '[]',
+            "type": 'Vec<String>',
+        },
+        {
+            "name": "single-line-exclusions",
+            "default": '[]',
+            "type": 'Vec<String>',
+        },
+        {
+            "name": "split-on-trailing-comma",
+            "default": 'true',
+            "type": 'bool',
+        },
+    ]},
+    {"name": "mccabe", "fields": [
+        {
+            "name": "max-complexity",
+            "default": '10',
+            "type": 'usize',
+        },
+    ]},
+    {"name": "pep8-naming", "fields": [
+        {
+            "name": "classmethod-decorators",
+            "default": '["classmethod"]',
+            "type": 'Vec<String>',
+        },
+        {
+            "name": "ignore-names",
+            "default": '["setUp", "tearDown", "setUpClass", "tearDownClass", "setUpModule", "tearDownModule", "asyncSetUp", "asyncTearDown", "setUpTestData", "failureException", "longMessage", "maxDiff"]',
+            "type": 'Vec<String>',
+        },
+        {
+            "name": "staticmethod-decorators",
+            "default": '["staticmethod"]',
+            "type": 'Vec<String>',
+        },
+    ]},
+    {"name": "pydocstyle", "fields": [
+        {
+            "name": "convention",
+            "default": '"convention"',
+            "type": 'Convention',
+        },
+    ]},
+    {"name": "pyupgrade", "fields": [
+        {
+            "name": "keep-runtime-typing",
+            "default": 'false',
+            "type": 'bool',
+        },
+    ]},
+];

playground/src/style.css

@@ -0,0 +1,60 @@
+* {
+  box-sizing: border-box;
+}
+
+body,
+html,
+#root,
+#app {
+  margin: 0;
+  height: 100%;
+  width: 100%;
+}
+
+#app {
+  display: flex;
+}
+
+.options {
+  height: 100vh;
+  overflow-y: scroll;
+  padding: 1em;
+  min-width: 300px;
+  border-right: 1px solid lightgray;
+}
+
+.options ul {
+  padding-left: 1em;
+  list-style-type: none;
+}
+
+.options li {
+  margin-bottom: 0.3em;
+}
+
+.options details {
+  margin-bottom: 1em;
+}
+
+.options summary {
+  font-size: 1.3rem;
+}
+
+.options input {
+  display: block;
+  width: 100%;
+}
+
+.editor {
+  padding: 1em;
+}
+
+#error {
+  position: fixed;
+  bottom: 0;
+  width: 100%;
+  min-height: 1em;
+  padding: 1em;
+  background: darkred;
+  color: white;
+}

playground/src/vite-env.d.ts

@@ -0,0 +1 @@
+/// <reference types="vite/client" />

playground/tsconfig.json

@@ -0,0 +1,21 @@
+{
+  "compilerOptions": {
+    "target": "ESNext",
+    "useDefineForClassFields": true,
+    "lib": ["DOM", "DOM.Iterable", "ESNext"],
+    "allowJs": false,
+    "skipLibCheck": true,
+    "esModuleInterop": false,
+    "allowSyntheticDefaultImports": true,
+    "strict": true,
+    "forceConsistentCasingInFileNames": true,
+    "module": "ESNext",
+    "moduleResolution": "Node",
+    "resolveJsonModule": true,
+    "isolatedModules": true,
+    "noEmit": true,
+    "jsx": "react-jsx"
+  },
+  "include": ["src"],
+  "references": [{ "path": "./tsconfig.node.json" }]
+}

playground/tsconfig.node.json

@@ -0,0 +1,9 @@
+{
+  "compilerOptions": {
+    "composite": true,
+    "module": "ESNext",
+    "moduleResolution": "Node",
+    "allowSyntheticDefaultImports": true
+  },
+  "include": ["vite.config.ts"]
+}

playground/vite.config.ts

@@ -0,0 +1,7 @@
+import { defineConfig } from "vite";
+import react from "@vitejs/plugin-react-swc";
+
+// https://vitejs.dev/config/
+export default defineConfig({
+  plugins: [react()],
+});

pyproject.toml

@@ -12,6 +12,7 @@ classifiers = [
     "Programming Language :: Python :: 3.8",
     "Programming Language :: Python :: 3.9",
     "Programming Language :: Python :: 3.10",
+    "Programming Language :: Python :: 3.11",
     "Programming Language :: Python :: 3 :: Only",
     "Topic :: Software Development :: Libraries :: Python Modules",
     "Topic :: Software Development :: Quality Assurance",
@@ -32,6 +33,13 @@ build-backend = "maturin"
 bindings = "bin"
 strip = true
 
-[tool.isort]
-profile = "black"
-known_third_party = ["fastapi", "pydantic", "starlette"]
+[tool.ruff]
+
+[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"

resources/test/fixtures/F632.py

@@ -1,8 +0,0 @@
-if x is "abc":
-    pass
-
-if 123 is not y:
-    pass
-
-if "123" is x < 3:
-    pass

resources/test/fixtures/README.md

@@ -0,0 +1,3 @@
+# fixtures
+
+Fixture files used for snapshot testing.

resources/test/fixtures/RUF001.py

@@ -1,7 +0,0 @@
-x = "𝐁ad string"
-
-
-def f():
-    """Here's a docstring with an unusual parenthesis: ）"""
-    # And here's a comment with an unusual punctuation mark: ᜵
-    ...

resources/test/fixtures/RUF003.py

@@ -1,7 +0,0 @@
-x = "𝐁ad string"
-
-
-def f():
-    """Here's a docstring with an unusual parenthesis: ）"""
-    # And here's a comment with an unusual punctuation mark: ᜵
-    ...

resources/test/fixtures/T201.py

@@ -1 +0,0 @@
-print("Hello, world!")  # T201

resources/test/fixtures/U009_4.py

@@ -1,3 +0,0 @@
-# coding=utf8 # noqa: U009
-
-print("Hello world")

resources/test/fixtures/W292_2.py

@@ -1,2 +0,0 @@
-def fn() -> None:
-    pass

resources/test/fixtures/eradicate/ERA001.py

@@ -0,0 +1,15 @@
+#import os
+# from foo import junk
+#a = 3
+a = 4
+#foo(1, 2, 3)
+
+def foo(x, y, z):
+    content = 1 # print('hello')
+    print(x, y, z)
+
+    # This is a real comment.
+    #return True
+    return False
+
+#import os  # noqa: ERA001

resources/test/fixtures/flake8_annotations/allow_overload.py

@@ -0,0 +1,49 @@
+from typing import overload
+
+
+@overload
+def foo(i: int) -> "int":
+    ...
+
+
+@overload
+def foo(i: "str") -> "str":
+    ...
+
+
+def foo(i):
+    return i
+
+
+@overload
+def bar(i: int) -> "int":
+    ...
+
+
+@overload
+def bar(i: "str") -> "str":
+    ...
+
+
+class X:
+    def bar(i):
+        return i
+
+
+# TODO(charlie): This third case should raise an error (as in Mypy), because we have a
+# statement between the interfaces and implementation.
+@overload
+def baz(i: int) -> "int":
+    ...
+
+
+@overload
+def baz(i: "str") -> "str":
+    ...
+
+
+x = 1
+
+
+def baz(i):
+    return i

resources/test/fixtures/flake8_blind_except/BLE.py

@@ -53,3 +53,11 @@ try:
         raise e
 except Exception:
     pass
+
+
+try:
+    pass
+except Exception as e:
+    raise bad
+except BaseException:
+    pass

resources/test/fixtures/flake8_boolean_trap/FBT.py

@@ -38,5 +38,22 @@ def function(
 def used(do):
     return do
 
+
 used("a", True)
 used(do=True)
+
+
+# Avoid FBT003 for explicitly allowed methods.
+"""
+FBT003 Boolean positional value on dict
+"""
+a = {"a": "b"}
+a.get("hello", False)
+{}.get("hello", False)
+{}.setdefault("hello", True)
+{}.pop("hello", False)
+{}.pop(True, False)
+dict.fromkeys(("world",), True)
+{}.deploy(True, False)
+getattr(someobj, attrname, False)
+mylist.index(True)

resources/test/fixtures/flake8_bugbear/B009_B010.py

@@ -20,6 +20,8 @@ getattr(foo, "_123abc")
 getattr(foo, "abc123")
 getattr(foo, r"abc123")
 _ = lambda x: getattr(x, "bar")
+if getattr(x, "bar"):
+    pass
 
 # Valid setattr usage
 setattr(foo, bar, None)
@@ -28,6 +30,8 @@ setattr(foo, "123abc", None)
 setattr(foo, r"123\abc", None)
 setattr(foo, "except", None)
 _ = lambda x: setattr(x, "bar", 1)
+if setattr(x, "bar", 1):
+    pass
 
 # Invalid usage
 setattr(foo, "bar", None)

resources/test/fixtures/flake8_bugbear/B905.py

@@ -0,0 +1,10 @@
+zip()
+zip(range(3))
+zip("a", "b")
+zip("a", "b", *zip("c"))
+zip(zip("a"), strict=False)
+zip(zip("a", strict=True))
+
+zip(range(3), strict=True)
+zip("a", "b", strict=False)
+zip("a", "b", "c", strict=True)