python-constricter 0.3.3__tar.gz → 0.3.5__tar.gz

{python_constricter-0.3.3 → python_constricter-0.3.5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.5
 Name: python-constricter
-Version: 0.3.3
+Version: 0.3.5
 Import-Name: constricter
 Summary: Lint rules: every local variable is typed where it's first bound. A flake8 plugin, a pylint plugin and a standalone CLI.
 Author: Ivy Duggan
@@ -173,38 +173,39 @@ enabled).
 
 Options:
 
-| Option           | CLI                                                                                                                                                                          | `[tool.constricter]`                            | flake8 (CLI or config)          | pylint                            |
-| ---------------- | ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | ----------------------------------------------- | ------------------------------- | --------------------------------- |
-| level            | `--level`                                                                                                                                                                    | `level`                                         | `--constricter-level`           | `constricter-level`               |
-| strictest        | `--max`: `--level=suffocate` for every path, `--all-scopes`, and the opt-in `LVA012`                                                                                         | —                                               | —                               | —                                 |
-| every fix        | `--max-fix`: `--max`, `--fix --unsafe-fixes`, and `--infer-with` each of basedpyright, ty and pyrefly that's installed and runs                                              | —                                               | —                               | —                                 |
-| type comments    | `--type-comments`                                                                                                                                                            | `type-comments`                                 | `--constricter-type-comments`   | `constricter-type-comments = yes` |
-| all scopes       | `--all-scopes`                                                                                                                                                               | `all-scopes`                                    | `--constricter-all-scopes`      | `constricter-all-scopes = yes`    |
-| nesting          | `--nesting N`                                                                                                                                                                | `nesting`                                       | `--constricter-nesting`         | `constricter-nesting`             |
-| max length       | `--max-length N` (LVA011)                                                                                                                                                    | `max-length`                                    | `--constricter-max-length`      | `constricter-max-length`          |
-| vague            | `--vague LEVEL` (LVA005, and the fixes offered): -1 none (the default), 0 one `Any` inside a type that says the rest (`tuple[str, Any]`), N from 1 N + 1, or one alone       | `vague`                                         | `--constricter-vague`           | `constricter-vague`               |
-| min python       | `--min-python VERSION` (the oldest Python the code runs on, whose syntax `--fix` writes; default: `requires-python`'s)                                                       | `min-python`                                    | -                               | -                                 |
-| type hierarchy   | -                                                                                                                                                                            | `narrower` (a table)                            | `--constricter-narrower`        | `constricter-narrower`            |
-| fix              | `--fix` (`--unsafe-fixes` for guesses), `--diff` to preview                                                                                                                  | -                                               | -                               | -                                 |
-| infer with       | `--infer-with CHECKERS` (`basedpyright`, `ty`, `pyrefly`, several: inferred types, as guesses)                                                                               | `infer-with`                                    | -                               | -                                 |
-| infer from       | `--infer-from FILE` (the types `python -m constricter.trace -m pytest` recorded from a run, as guesses)                                                                      | `infer-from`                                    | -                               | -                                 |
-| show fixes       | `--show-fixes` (each fix and how it was decided, text)                                                                                                                       | -                                               | -                               | -                                 |
-| fix levels       | `--fix-select`, `--fix-ignore`, `--unsafe-fix-select` (mechanisms: [docs/FIXES.md](https://github.com/ivylikethevine/python-constricter/blob/main/docs/FIXES.md#fix-levels)) | `fix-select`, `fix-ignore`, `unsafe-fix-select` | -                               | -                                 |
-| fix plain bases  | `--fix-plain-bases BASES` (frameworks' classes whose subclasses' bodies `--fix` annotates; django's are built in)                                                            | `fix-plain-bases`                               | -                               | -                                 |
-| select           | `--select CODES` (codes or prefixes)                                                                                                                                         | `select`                                        | flake8's own `select`           | pylint's own `enable`             |
-| extend select    | `--extend-select CODES` (also report these; an opt-in code by its full code)                                                                                                 | `extend-select`                                 | flake8's own `extend-select`    | pylint's own `enable`             |
-| ignore           | `--ignore CODES`                                                                                                                                                             | `ignore`                                        | flake8's own `extend-ignore`    | pylint's own `disable`            |
-| exclude          | `--exclude GLOB` (repeatable)                                                                                                                                                | `exclude`                                       | flake8's own `exclude`          | pylint's own `ignore-paths`       |
-| format           | `--format`: `text`, `full` (with source), `json`, `github`, `sarif`, `gitlab`, `junit`, `rdjson`                                                                             | -                                               | -                               | -                                 |
-| statistics       | `--statistics` (counts per code, text format)                                                                                                                                | -                                               | -                               | -                                 |
-| jobs             | `--jobs N` (`-j`; 0: one per CPU)                                                                                                                                            | `jobs`                                          | flake8's own `--jobs`           | pylint's own `--jobs`             |
-| baseline         | `--baseline FILE`; `--write-baseline` records it                                                                                                                             | `baseline`                                      | -                               | -                                 |
-| coverage         | `--coverage`, `--fail-under PCT`                                                                                                                                             | -                                               | -                               | -                                 |
-| per-path levels  | -                                                                                                                                                                            | `per-path-levels`                               | -                               | -                                 |
-| per-file ignores | -                                                                                                                                                                            | `per-file-ignores`                              | flake8's own `per-file-ignores` | -                                 |
-| stdin            | `-` as the path, `--stdin-filename PATH`                                                                                                                                     | -                                               | flake8's own `-`                | -                                 |
-| exit status      | `--exit-zero`                                                                                                                                                                | -                                               | flake8's own `--exit-zero`      | pylint's own `--exit-zero`        |
-| output file      | `--output-file FILE`                                                                                                                                                         | -                                               | flake8's own `--output-file`    | pylint's own `--output`           |
+| Option           | CLI                                                                                                                                                                                                                                                                                                                        | `[tool.constricter]`                            | flake8 (CLI or config)          | pylint                            |
+| ---------------- | -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | ----------------------------------------------- | ------------------------------- | --------------------------------- |
+| level            | `--level`                                                                                                                                                                                                                                                                                                                  | `level`                                         | `--constricter-level`           | `constricter-level`               |
+| strictest        | `--max`: `--level=suffocate` for every path, `--all-scopes`, and the opt-in `LVA012`                                                                                                                                                                                                                                       | —                                               | —                               | —                                 |
+| every fix        | `--max-fix`: `--max`, `--fix --unsafe-fixes`, and `--infer-with` each of basedpyright, ty and pyrefly that's installed and runs                                                                                                                                                                                            | —                                               | —                               | —                                 |
+| type comments    | `--type-comments`                                                                                                                                                                                                                                                                                                          | `type-comments`                                 | `--constricter-type-comments`   | `constricter-type-comments = yes` |
+| all scopes       | `--all-scopes`                                                                                                                                                                                                                                                                                                             | `all-scopes`                                    | `--constricter-all-scopes`      | `constricter-all-scopes = yes`    |
+| nesting          | `--nesting N`                                                                                                                                                                                                                                                                                                              | `nesting`                                       | `--constricter-nesting`         | `constricter-nesting`             |
+| max length       | `--max-length N` (LVA011)                                                                                                                                                                                                                                                                                                  | `max-length`                                    | `--constricter-max-length`      | `constricter-max-length`          |
+| vague            | `--vague LEVEL` (LVA005, and the fixes offered): -1 none (the default), 0 one `Any` inside a type that says the rest (`tuple[str, Any]`), N from 1 N + 1, or one alone                                                                                                                                                     | `vague`                                         | `--constricter-vague`           | `constricter-vague`               |
+| min python       | `--min-python VERSION` (the oldest Python the code runs on, whose syntax `--fix` writes; default: `requires-python`'s)                                                                                                                                                                                                     | `min-python`                                    | -                               | -                                 |
+| type hierarchy   | -                                                                                                                                                                                                                                                                                                                          | `narrower` (a table)                            | `--constricter-narrower`        | `constricter-narrower`            |
+| fix              | `--fix` (`--unsafe-fixes` for guesses), `--diff` to preview                                                                                                                                                                                                                                                                | -                                               | -                               | -                                 |
+| infer with       | `--infer-with CHECKERS` (`basedpyright`, `ty`, `pyrefly`, several: inferred types, as guesses)                                                                                                                                                                                                                             | `infer-with`                                    | -                               | -                                 |
+| infer from       | `--infer-from FILE` (the types `python -m constricter.trace -m pytest` recorded from a run, as guesses)                                                                                                                                                                                                                    | `infer-from`                                    | -                               | -                                 |
+| show fixes       | `--show-fixes` (each fix and how it was decided; with `--fix`, those made too)                                                                                                                                                                                                                                             | -                                               | -                               | -                                 |
+| fix levels       | `--fix-select`, `--fix-ignore`, `--unsafe-fix-select` (mechanisms: [docs/FIXES.md](https://github.com/ivylikethevine/python-constricter/blob/main/docs/FIXES.md#fix-levels))                                                                                                                                               | `fix-select`, `fix-ignore`, `unsafe-fix-select` | -                               | -                                 |
+| fix plain bases  | `--fix-plain-bases BASES` (frameworks' classes whose subclasses' bodies `--fix` annotates; django's are built in)                                                                                                                                                                                                          | `fix-plain-bases`                               | -                               | -                                 |
+| fix widen        | `--fix-widen KINDS` (wider types `--fix` may write, each marked: `untyped-parameters`, `empty-containers`, `mixed-containers`, `unions`, `vague`, `untyped-calls`, `unknown-calls`; `all`: every one; [docs/FIXES.md](https://github.com/ivylikethevine/python-constricter/blob/main/docs/FIXES.md#wider-types-fix-widen)) | `fix-widen`                                     | -                               | -                                 |
+| select           | `--select CODES` (codes or prefixes)                                                                                                                                                                                                                                                                                       | `select`                                        | flake8's own `select`           | pylint's own `enable`             |
+| extend select    | `--extend-select CODES` (also report these; an opt-in code by its full code)                                                                                                                                                                                                                                               | `extend-select`                                 | flake8's own `extend-select`    | pylint's own `enable`             |
+| ignore           | `--ignore CODES`                                                                                                                                                                                                                                                                                                           | `ignore`                                        | flake8's own `extend-ignore`    | pylint's own `disable`            |
+| exclude          | `--exclude GLOB` (repeatable)                                                                                                                                                                                                                                                                                              | `exclude`                                       | flake8's own `exclude`          | pylint's own `ignore-paths`       |
+| format           | `--format`: `text`, `full` (with source), `json`, `github`, `sarif`, `gitlab`, `junit`, `rdjson`                                                                                                                                                                                                                           | -                                               | -                               | -                                 |
+| statistics       | `--statistics` (counts per code, text format)                                                                                                                                                                                                                                                                              | -                                               | -                               | -                                 |
+| jobs             | `--jobs N` (`-j`; 0: one per CPU)                                                                                                                                                                                                                                                                                          | `jobs`                                          | flake8's own `--jobs`           | pylint's own `--jobs`             |
+| baseline         | `--baseline FILE`; `--write-baseline` records it                                                                                                                                                                                                                                                                           | `baseline`                                      | -                               | -                                 |
+| coverage         | `--coverage`, `--fail-under PCT`                                                                                                                                                                                                                                                                                           | -                                               | -                               | -                                 |
+| per-path levels  | -                                                                                                                                                                                                                                                                                                                          | `per-path-levels`                               | -                               | -                                 |
+| per-file ignores | -                                                                                                                                                                                                                                                                                                                          | `per-file-ignores`                              | flake8's own `per-file-ignores` | -                                 |
+| stdin            | `-` as the path, `--stdin-filename PATH`                                                                                                                                                                                                                                                                                   | -                                               | flake8's own `-`                | -                                 |
+| exit status      | `--exit-zero`                                                                                                                                                                                                                                                                                                              | -                                               | flake8's own `--exit-zero`      | pylint's own `--exit-zero`        |
+| output file      | `--output-file FILE`                                                                                                                                                                                                                                                                                                       | -                                               | flake8's own `--output-file`    | pylint's own `--output`           |
 
 `constricter --explain LVA002` prints a code's rationale, its fix, and the levels that report it.
 
@@ -245,10 +246,11 @@ ignore = ["LVA003"]
 return type or whose `return`s agree (in another checked file too), a copy, subscript, attribute or
 method call of a local whose type is known, and values computed from those; a loop's target or an
 unpacking's names get a declaration on the line before. `--unsafe-fixes` adds guesses, and
-`--show-fixes` lists each fix and how its value decided it. `--infer-with basedpyright` (or `ty`, or
-`pyrefly`, or several: `basedpyright,ty`; each installed alongside) asks those type checkers for
-what `--fix` can't type itself, as guesses; `--infer-from FILE` takes the types a run bound each
-name to, recorded by `python -m constricter.trace -m pytest`, the same way. The full list is in
+`--show-fixes` lists each fix and how its value decided it, and after `--fix` each one made.
+`--infer-with basedpyright` (or `ty`, or `pyrefly`, or several: `basedpyright,ty`; each installed
+alongside) asks those type checkers for what `--fix` can't type itself, as guesses;
+`--infer-from FILE` takes the types a run bound each name to, recorded by
+`python -m constricter.trace -m pytest`, the same way. The full list is in
 [docs/FIXES.md](https://github.com/ivylikethevine/python-constricter/blob/main/docs/FIXES.md).
 
 ### Installing and running
@@ -274,7 +276,7 @@ pre-commit, after ruff's hooks (or `constricter-fix`, which runs `--fix` first):
 
 ```yaml
 - repo: https://github.com/ivylikethevine/python-constricter
-  rev: v0.3.3
+  rev: v0.3.5
   hooks:
     - id: constricter
 ```
@@ -307,8 +309,8 @@ default one is used only if it exists.
 total; the bindings are the ones the rules cover (with `--all-scopes`, module and class bodies too),
 and `# noqa` doesn't make one typed. `--fail-under PCT` (which implies `--coverage`) exits 1 below
 PCT, so CI can hold a codebase to a share. With `--format=json` it prints
-`{"typed", "total", "percent", "files"}`, which a badge can read: publish that JSON somewhere (a
-gist, a release asset) and point
+`{"typed", "total", "widened", "percent", "files"}`, which a badge can read: publish that JSON
+somewhere (a gist, a release asset) and point
 [shields.io's dynamic JSON badge](https://shields.io/badges/dynamic-json-badge) at it with the query
 `$.percent`. This project keeps its own share at 100% in CI, so its badge is static.
 

{python_constricter-0.3.3 → python_constricter-0.3.5}/README.md

@@ -146,38 +146,39 @@ enabled).
 
 Options:
 
-| Option           | CLI                                                                                                                                                                          | `[tool.constricter]`                            | flake8 (CLI or config)          | pylint                            |
-| ---------------- | ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | ----------------------------------------------- | ------------------------------- | --------------------------------- |
-| level            | `--level`                                                                                                                                                                    | `level`                                         | `--constricter-level`           | `constricter-level`               |
-| strictest        | `--max`: `--level=suffocate` for every path, `--all-scopes`, and the opt-in `LVA012`                                                                                         | —                                               | —                               | —                                 |
-| every fix        | `--max-fix`: `--max`, `--fix --unsafe-fixes`, and `--infer-with` each of basedpyright, ty and pyrefly that's installed and runs                                              | —                                               | —                               | —                                 |
-| type comments    | `--type-comments`                                                                                                                                                            | `type-comments`                                 | `--constricter-type-comments`   | `constricter-type-comments = yes` |
-| all scopes       | `--all-scopes`                                                                                                                                                               | `all-scopes`                                    | `--constricter-all-scopes`      | `constricter-all-scopes = yes`    |
-| nesting          | `--nesting N`                                                                                                                                                                | `nesting`                                       | `--constricter-nesting`         | `constricter-nesting`             |
-| max length       | `--max-length N` (LVA011)                                                                                                                                                    | `max-length`                                    | `--constricter-max-length`      | `constricter-max-length`          |
-| vague            | `--vague LEVEL` (LVA005, and the fixes offered): -1 none (the default), 0 one `Any` inside a type that says the rest (`tuple[str, Any]`), N from 1 N + 1, or one alone       | `vague`                                         | `--constricter-vague`           | `constricter-vague`               |
-| min python       | `--min-python VERSION` (the oldest Python the code runs on, whose syntax `--fix` writes; default: `requires-python`'s)                                                       | `min-python`                                    | -                               | -                                 |
-| type hierarchy   | -                                                                                                                                                                            | `narrower` (a table)                            | `--constricter-narrower`        | `constricter-narrower`            |
-| fix              | `--fix` (`--unsafe-fixes` for guesses), `--diff` to preview                                                                                                                  | -                                               | -                               | -                                 |
-| infer with       | `--infer-with CHECKERS` (`basedpyright`, `ty`, `pyrefly`, several: inferred types, as guesses)                                                                               | `infer-with`                                    | -                               | -                                 |
-| infer from       | `--infer-from FILE` (the types `python -m constricter.trace -m pytest` recorded from a run, as guesses)                                                                      | `infer-from`                                    | -                               | -                                 |
-| show fixes       | `--show-fixes` (each fix and how it was decided, text)                                                                                                                       | -                                               | -                               | -                                 |
-| fix levels       | `--fix-select`, `--fix-ignore`, `--unsafe-fix-select` (mechanisms: [docs/FIXES.md](https://github.com/ivylikethevine/python-constricter/blob/main/docs/FIXES.md#fix-levels)) | `fix-select`, `fix-ignore`, `unsafe-fix-select` | -                               | -                                 |
-| fix plain bases  | `--fix-plain-bases BASES` (frameworks' classes whose subclasses' bodies `--fix` annotates; django's are built in)                                                            | `fix-plain-bases`                               | -                               | -                                 |
-| select           | `--select CODES` (codes or prefixes)                                                                                                                                         | `select`                                        | flake8's own `select`           | pylint's own `enable`             |
-| extend select    | `--extend-select CODES` (also report these; an opt-in code by its full code)                                                                                                 | `extend-select`                                 | flake8's own `extend-select`    | pylint's own `enable`             |
-| ignore           | `--ignore CODES`                                                                                                                                                             | `ignore`                                        | flake8's own `extend-ignore`    | pylint's own `disable`            |
-| exclude          | `--exclude GLOB` (repeatable)                                                                                                                                                | `exclude`                                       | flake8's own `exclude`          | pylint's own `ignore-paths`       |
-| format           | `--format`: `text`, `full` (with source), `json`, `github`, `sarif`, `gitlab`, `junit`, `rdjson`                                                                             | -                                               | -                               | -                                 |
-| statistics       | `--statistics` (counts per code, text format)                                                                                                                                | -                                               | -                               | -                                 |
-| jobs             | `--jobs N` (`-j`; 0: one per CPU)                                                                                                                                            | `jobs`                                          | flake8's own `--jobs`           | pylint's own `--jobs`             |
-| baseline         | `--baseline FILE`; `--write-baseline` records it                                                                                                                             | `baseline`                                      | -                               | -                                 |
-| coverage         | `--coverage`, `--fail-under PCT`                                                                                                                                             | -                                               | -                               | -                                 |
-| per-path levels  | -                                                                                                                                                                            | `per-path-levels`                               | -                               | -                                 |
-| per-file ignores | -                                                                                                                                                                            | `per-file-ignores`                              | flake8's own `per-file-ignores` | -                                 |
-| stdin            | `-` as the path, `--stdin-filename PATH`                                                                                                                                     | -                                               | flake8's own `-`                | -                                 |
-| exit status      | `--exit-zero`                                                                                                                                                                | -                                               | flake8's own `--exit-zero`      | pylint's own `--exit-zero`        |
-| output file      | `--output-file FILE`                                                                                                                                                         | -                                               | flake8's own `--output-file`    | pylint's own `--output`           |
+| Option           | CLI                                                                                                                                                                                                                                                                                                                        | `[tool.constricter]`                            | flake8 (CLI or config)          | pylint                            |
+| ---------------- | -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | ----------------------------------------------- | ------------------------------- | --------------------------------- |
+| level            | `--level`                                                                                                                                                                                                                                                                                                                  | `level`                                         | `--constricter-level`           | `constricter-level`               |
+| strictest        | `--max`: `--level=suffocate` for every path, `--all-scopes`, and the opt-in `LVA012`                                                                                                                                                                                                                                       | —                                               | —                               | —                                 |
+| every fix        | `--max-fix`: `--max`, `--fix --unsafe-fixes`, and `--infer-with` each of basedpyright, ty and pyrefly that's installed and runs                                                                                                                                                                                            | —                                               | —                               | —                                 |
+| type comments    | `--type-comments`                                                                                                                                                                                                                                                                                                          | `type-comments`                                 | `--constricter-type-comments`   | `constricter-type-comments = yes` |
+| all scopes       | `--all-scopes`                                                                                                                                                                                                                                                                                                             | `all-scopes`                                    | `--constricter-all-scopes`      | `constricter-all-scopes = yes`    |
+| nesting          | `--nesting N`                                                                                                                                                                                                                                                                                                              | `nesting`                                       | `--constricter-nesting`         | `constricter-nesting`             |
+| max length       | `--max-length N` (LVA011)                                                                                                                                                                                                                                                                                                  | `max-length`                                    | `--constricter-max-length`      | `constricter-max-length`          |
+| vague            | `--vague LEVEL` (LVA005, and the fixes offered): -1 none (the default), 0 one `Any` inside a type that says the rest (`tuple[str, Any]`), N from 1 N + 1, or one alone                                                                                                                                                     | `vague`                                         | `--constricter-vague`           | `constricter-vague`               |
+| min python       | `--min-python VERSION` (the oldest Python the code runs on, whose syntax `--fix` writes; default: `requires-python`'s)                                                                                                                                                                                                     | `min-python`                                    | -                               | -                                 |
+| type hierarchy   | -                                                                                                                                                                                                                                                                                                                          | `narrower` (a table)                            | `--constricter-narrower`        | `constricter-narrower`            |
+| fix              | `--fix` (`--unsafe-fixes` for guesses), `--diff` to preview                                                                                                                                                                                                                                                                | -                                               | -                               | -                                 |
+| infer with       | `--infer-with CHECKERS` (`basedpyright`, `ty`, `pyrefly`, several: inferred types, as guesses)                                                                                                                                                                                                                             | `infer-with`                                    | -                               | -                                 |
+| infer from       | `--infer-from FILE` (the types `python -m constricter.trace -m pytest` recorded from a run, as guesses)                                                                                                                                                                                                                    | `infer-from`                                    | -                               | -                                 |
+| show fixes       | `--show-fixes` (each fix and how it was decided; with `--fix`, those made too)                                                                                                                                                                                                                                             | -                                               | -                               | -                                 |
+| fix levels       | `--fix-select`, `--fix-ignore`, `--unsafe-fix-select` (mechanisms: [docs/FIXES.md](https://github.com/ivylikethevine/python-constricter/blob/main/docs/FIXES.md#fix-levels))                                                                                                                                               | `fix-select`, `fix-ignore`, `unsafe-fix-select` | -                               | -                                 |
+| fix plain bases  | `--fix-plain-bases BASES` (frameworks' classes whose subclasses' bodies `--fix` annotates; django's are built in)                                                                                                                                                                                                          | `fix-plain-bases`                               | -                               | -                                 |
+| fix widen        | `--fix-widen KINDS` (wider types `--fix` may write, each marked: `untyped-parameters`, `empty-containers`, `mixed-containers`, `unions`, `vague`, `untyped-calls`, `unknown-calls`; `all`: every one; [docs/FIXES.md](https://github.com/ivylikethevine/python-constricter/blob/main/docs/FIXES.md#wider-types-fix-widen)) | `fix-widen`                                     | -                               | -                                 |
+| select           | `--select CODES` (codes or prefixes)                                                                                                                                                                                                                                                                                       | `select`                                        | flake8's own `select`           | pylint's own `enable`             |
+| extend select    | `--extend-select CODES` (also report these; an opt-in code by its full code)                                                                                                                                                                                                                                               | `extend-select`                                 | flake8's own `extend-select`    | pylint's own `enable`             |
+| ignore           | `--ignore CODES`                                                                                                                                                                                                                                                                                                           | `ignore`                                        | flake8's own `extend-ignore`    | pylint's own `disable`            |
+| exclude          | `--exclude GLOB` (repeatable)                                                                                                                                                                                                                                                                                              | `exclude`                                       | flake8's own `exclude`          | pylint's own `ignore-paths`       |
+| format           | `--format`: `text`, `full` (with source), `json`, `github`, `sarif`, `gitlab`, `junit`, `rdjson`                                                                                                                                                                                                                           | -                                               | -                               | -                                 |
+| statistics       | `--statistics` (counts per code, text format)                                                                                                                                                                                                                                                                              | -                                               | -                               | -                                 |
+| jobs             | `--jobs N` (`-j`; 0: one per CPU)                                                                                                                                                                                                                                                                                          | `jobs`                                          | flake8's own `--jobs`           | pylint's own `--jobs`             |
+| baseline         | `--baseline FILE`; `--write-baseline` records it                                                                                                                                                                                                                                                                           | `baseline`                                      | -                               | -                                 |
+| coverage         | `--coverage`, `--fail-under PCT`                                                                                                                                                                                                                                                                                           | -                                               | -                               | -                                 |
+| per-path levels  | -                                                                                                                                                                                                                                                                                                                          | `per-path-levels`                               | -                               | -                                 |
+| per-file ignores | -                                                                                                                                                                                                                                                                                                                          | `per-file-ignores`                              | flake8's own `per-file-ignores` | -                                 |
+| stdin            | `-` as the path, `--stdin-filename PATH`                                                                                                                                                                                                                                                                                   | -                                               | flake8's own `-`                | -                                 |
+| exit status      | `--exit-zero`                                                                                                                                                                                                                                                                                                              | -                                               | flake8's own `--exit-zero`      | pylint's own `--exit-zero`        |
+| output file      | `--output-file FILE`                                                                                                                                                                                                                                                                                                       | -                                               | flake8's own `--output-file`    | pylint's own `--output`           |
 
 `constricter --explain LVA002` prints a code's rationale, its fix, and the levels that report it.
 
@@ -218,10 +219,11 @@ ignore = ["LVA003"]
 return type or whose `return`s agree (in another checked file too), a copy, subscript, attribute or
 method call of a local whose type is known, and values computed from those; a loop's target or an
 unpacking's names get a declaration on the line before. `--unsafe-fixes` adds guesses, and
-`--show-fixes` lists each fix and how its value decided it. `--infer-with basedpyright` (or `ty`, or
-`pyrefly`, or several: `basedpyright,ty`; each installed alongside) asks those type checkers for
-what `--fix` can't type itself, as guesses; `--infer-from FILE` takes the types a run bound each
-name to, recorded by `python -m constricter.trace -m pytest`, the same way. The full list is in
+`--show-fixes` lists each fix and how its value decided it, and after `--fix` each one made.
+`--infer-with basedpyright` (or `ty`, or `pyrefly`, or several: `basedpyright,ty`; each installed
+alongside) asks those type checkers for what `--fix` can't type itself, as guesses;
+`--infer-from FILE` takes the types a run bound each name to, recorded by
+`python -m constricter.trace -m pytest`, the same way. The full list is in
 [docs/FIXES.md](https://github.com/ivylikethevine/python-constricter/blob/main/docs/FIXES.md).
 
 ### Installing and running
@@ -247,7 +249,7 @@ pre-commit, after ruff's hooks (or `constricter-fix`, which runs `--fix` first):
 
 ```yaml
 - repo: https://github.com/ivylikethevine/python-constricter
-  rev: v0.3.3
+  rev: v0.3.5
   hooks:
     - id: constricter
 ```
@@ -280,8 +282,8 @@ default one is used only if it exists.
 total; the bindings are the ones the rules cover (with `--all-scopes`, module and class bodies too),
 and `# noqa` doesn't make one typed. `--fail-under PCT` (which implies `--coverage`) exits 1 below
 PCT, so CI can hold a codebase to a share. With `--format=json` it prints
-`{"typed", "total", "percent", "files"}`, which a badge can read: publish that JSON somewhere (a
-gist, a release asset) and point
+`{"typed", "total", "widened", "percent", "files"}`, which a badge can read: publish that JSON
+somewhere (a gist, a release asset) and point
 [shields.io's dynamic JSON badge](https://shields.io/badges/dynamic-json-badge) at it with the query
 `$.percent`. This project keeps its own share at 100% in CI, so its badge is static.
 

{python_constricter-0.3.3 → python_constricter-0.3.5}/constricter/__init__.py

@@ -25,7 +25,7 @@ from constricter.offences import (
 )
 from constricter.rules.checker import Coverage, annotation_coverage, check_source, check_tree
 
-__version__ = "0.3.3"
+__version__ = "0.3.5"
 __all__ = [
     "COMMENT_TYPED_TARGET",
     "DEFAULT_CHECKS",

python_constricter-0.3.5/constricter/__main__.py

@@ -0,0 +1,26 @@
+# SPDX-License-Identifier: MIT
+"""`python -m constricter`, and the `constricter` script."""
+
+import contextlib
+import os
+import sys
+
+from constricter.cli.command import main
+
+
+def run() -> None:
+    """Run the command, and leave with its status at once.
+
+    Not by the interpreter's own exit, which frees every parsed file and the index an object at a
+    time: a fifth of a check of a thousand files. What the command wrote is flushed first; nothing
+    else waits on the exit (its workers have ended, its output file is closed).
+    """
+    status: int = main()
+    with contextlib.suppress(OSError, ValueError):  # a reader that left, a stream closed already
+        _ = sys.stdout.flush()
+        _ = sys.stderr.flush()
+    os._exit(status)
+
+
+if __name__ == "__main__":  # not when `--jobs` workers import it
+    run()

{python_constricter-0.3.3 → python_constricter-0.3.5}/constricter/cli/command.py

@@ -21,11 +21,11 @@ from constricter.cli.options import Mode, Options, Output
 from constricter.cli.paths import STDIN, python_files
 from constricter.cli.protocol import HintError
 from constricter.cli.report import Format, Result, fix_reasons, render, statistics
-from constricter.cli.runs import BaselineRun, CheckRun, CoverageRun, FileRun
-from constricter.cli.workers import Workers
+from constricter.cli.runs import Added, BaselineRun, CheckRun, CoverageRun, FileRun, merged
+from constricter.cli.workers import Workers, kept, started
 from constricter.fix.core import fixes
 from constricter.fix.core.known import Callee, Hints, Outside, Returns
-from constricter.fix.index import callers, decorated, installed, plain, project
+from constricter.fix.index import callers, decorated, installed, loose, plain, project
 from constricter.noqa import lines, unsuppressed
 from constricter.offences import (
     DEFAULT_CHECKS,
@@ -127,6 +127,7 @@ def _placed(offence: Offence, where: list[notebook.Line]) -> Offence:
 
 
 # One changed part of a fixed file (the file, or a notebook's cell): its label, old and new lines.
+_Hinted: TypeAlias = dict[Path, tuple[Hints, ...]]  # each file's hints, a checker's each
 _Change: TypeAlias = tuple[str, list[str], list[str]]
 # One JSON value a coverage report holds, and one file's row of them.
 _Scalar: TypeAlias = str | int | float
@@ -308,7 +309,29 @@ def _handled(path: Path, text: tuple[str, Path], offences: list[Offence], option
         return CheckRun(results, baselined, error=f"{name}: error: {message}")
     if fixed:
         _ = parsed.take(raw)  # the tree of the text it had: no check will ask for it again
-    return CheckRun(left, baselined, fixed)
+    return CheckRun(
+        left,
+        baselined,
+        fixed,
+        made=[r._replace(replacements=(), fixed=True) for r in results if r.offence in fixing],
+        rounds=(_added(raw, name, fixing),),
+    )
+
+
+def _added(raw: str, name: Path, fixing: Sequence[Offence]) -> Added:
+    """Find the lines fixing `fixing` adds to `raw`, the text of `name` (see `fixes.inserted`).
+
+    Returns:
+      Each one's cell (`None` outside a notebook) and the line it goes before; a notebook's cells
+      get declarations alone.
+
+    """
+    if name.suffix != notebook.SUFFIX:
+        return tuple((None, line) for line in fixes.inserted(lines(raw), fixing))
+    declared: list[tuple[int, int]] = [
+        (o.cell or 0, o.edit.span[0]) for o in fixing if o.edit is not None and o.edit.edit is Edit.DECLARE
+    ]
+    return tuple(sorted(declared))
 
 
 def _baseline_path(path: Path, outside: Outside, options: Options) -> BaselineRun:
@@ -340,6 +363,17 @@ def _cover_path(path: Path, _outside: Outside, options: Options) -> CoverageRun:
 
 
 def _check_all(options: Options) -> tuple[list[Path], list[FileRun]]:
+    """Check every file (see `_check_rounds`), its rounds by one set of worker processes.
+
+    Returns:
+      The names, and what each file found.
+
+    """
+    with kept():
+        return _check_rounds(options)
+
+
+def _check_rounds(options: Options) -> tuple[list[Path], list[FileRun]]:
     """Check every file (`--jobs` at a time), in order.
 
     With `--infer-with`, the type checker's server runs throughout: it's asked for every file's
@@ -401,7 +435,7 @@ def _check_all(options: Options) -> tuple[list[Path], list[FileRun]]:
             index: int
             run: FileRun
             for index, run in zip(again, redone, strict=True):
-                runs[index] = _merged(runs[index], run)
+                runs[index] = merged(runs[index], run)
             again = [index for index, run in zip(again, redone, strict=True) if cast("CheckRun", run).fixed]
         checker: str
         path: Path
@@ -447,7 +481,7 @@ def _called_again(
     calling = [
         at
         for at in calling
-        if project.returned(modules, paths[at], {}) != project.returned(before, paths[at], {})
+        if loose.returned(modules, paths[at], {}) != loose.returned(before, paths[at], {})
     ]
     return runs, _checked_more(paths, runs, calling, (check, options, session), modules)
 
@@ -473,7 +507,7 @@ def _checked_more(
     at: int
     run: FileRun
     for at, run in zip(which, redone, strict=True):
-        runs[at] = _merged(runs[at], run) if how[1].mode is Mode.FIX else run
+        runs[at] = merged(runs[at], run) if how[1].mode is Mode.FIX else run
     return modules
 
 
@@ -509,44 +543,29 @@ def _checked_all(
       What each file found, and the index of every file's module.
 
     """
-    hinted: dict[Path, tuple[Hints, ...]] = {} if session is None else session.hints(_texts(paths))
+    # Before a worker starts: one forked while the servers' threads run could wait on a lock one holds.
+    hinted: _Hinted = {} if session is None else session.hints(_texts(paths))
     if options.input.trace is not None:
         hinted = traced.merged(hinted, traced.load(options.input.trace), paths)
     coverage: bool = options.mode is Mode.COVERAGE  # needs nothing from the other files
-    stack: contextlib.ExitStack
-    with contextlib.ExitStack() as stack:
-        pool: Workers | None = None
-        if options.jobs != 1 and len(paths) > 1:
-            pool = stack.enter_context(Workers(paths, options.jobs))
-        if modules is None and pool:
-            modules = project.Index({}, []) if coverage else pool.index()
-        elif modules is None:
-            modules = project.Index({}, []) if coverage else project.index(paths)
-            collecting.indexed()
-        if not coverage:
-            modules = plain.settled(
-                decorated.passed(installed.with_installed(modules, installed.search_path())),
-                options.checks.plain_bases,
-            )
-        return schedule.checked(
-            paths,
-            check,
-            pool,
-            (modules, hinted),
-            _merged if options.mode is Mode.FIX else None,
+    pool: Workers | None = started(paths, options.jobs) if options.jobs != 1 and len(paths) > 1 else None
+    if modules is None and pool:
+        modules = project.Index({}, []) if coverage else pool.index()
+    elif modules is None:
+        modules = project.Index({}, []) if coverage else project.index(paths)
+        collecting.indexed()
+    if not coverage:
+        modules = plain.settled(
+            decorated.passed(installed.with_installed(modules, installed.search_path())),
+            options.checks.plain_bases,
         )
-
-
-def _merged(before: FileRun, after: FileRun) -> FileRun:
-    """Join a file's two `--fix` rounds' `CheckRun`s: what's left is the later's, what's fixed is both's.
-
-    Returns:
-      The joined run.
-
-    """
-    first: CheckRun = cast("CheckRun", before)
-    later: CheckRun = cast("CheckRun", after)
-    return replace(later, fixed=first.fixed + later.fixed)
+    return schedule.checked(
+        paths,
+        check,
+        pool,
+        (modules, hinted),
+        merged if options.mode is Mode.FIX else None,
+    )
 
 
 def _texts(paths: Sequence[Path]) -> dict[Path, str]:
@@ -579,10 +598,16 @@ def _report(options: Options, runs: Sequence[FileRun], files: int) -> int:
     results: list[Result] = [result for run in checked for result in run.results]
     output: Output = options.output
     text: bool = output.fmt in {Format.TEXT, Format.FULL}
+    # With `--show-fixes`, the fixes `--fix` made too: after the rest, as text or JSON.
+    shown: list[Result] = [*results, *(made for run in checked if output.show_fixes for made in run.made)]
     line: str
-    for line in statistics(results) if text and output.statistics else render(output.fmt, results):
+    for line in (
+        statistics(results)
+        if text and output.statistics
+        else render(output.fmt, shown if output.fmt is Format.JSON else results)
+    ):
         _ = sys.stdout.write(f"{line}\n")
-    for line in fix_reasons(results) if text and output.show_fixes else ():
+    for line in fix_reasons(shown) if text and output.show_fixes else ():
         _ = sys.stdout.write(f"{line}\n")
     errors: int = sum(r.offence.is_error(r.level) for r in results)
     if text and not output.quiet:
@@ -611,30 +636,53 @@ def _coverage(options: Options, paths: Sequence[Path], runs: Sequence[FileRun])
     counted: list[tuple[Path, Coverage]] = [
         (path, run.coverage) for path, run in zip(paths, covered, strict=True) if run.coverage is not None
     ]
-    total: Coverage = Coverage(sum(c.typed for _, c in counted), sum(c.total for _, c in counted))
+    total: Coverage = Coverage(
+        sum(c.typed for _, c in counted),
+        sum(c.total for _, c in counted),
+        sum(c.widened for _, c in counted),
+    )
     if options.output.fmt is Format.JSON:
         report: dict[str, _Scalar | list[_Row]] = {
-            "typed": total.typed,
-            "total": total.total,
-            "percent": round(total.percent, 1),
-            "files": [
-                {"path": str(path), "typed": c.typed, "total": c.total, "percent": round(c.percent, 1)}
-                for path, c in counted
-            ],
+            **_counts(total),
+            "files": [{"path": str(path), **_counts(c)} for path, c in counted],
         }
         _ = sys.stdout.write(json.dumps(report, indent=2) + "\n")
     else:
         path: Path
         c: Coverage
         for path, c in counted:
-            _ = sys.stdout.write(f"{path}: {c.typed}/{c.total} typed ({c.percent:.1f}%)\n")
-        _ = sys.stdout.write(
-            f"Total: {total.typed}/{total.total} typed ({total.percent:.1f}%) in {len(counted)} file(s).\n",
-        )
+            _ = sys.stdout.write(f"{path}: {_typed(c)}\n")
+        _ = sys.stdout.write(f"Total: {_typed(total)} in {len(counted)} file(s).\n")
     threshold: float | None = options.output.fail_under
     return EXIT_FOUND if threshold is not None and total.percent < threshold else EXIT_CLEAN
 
 
+def _counts(found: Coverage) -> _Row:
+    """Name a coverage's counts, for `--format=json`.
+
+    Returns:
+      Them, by name.
+
+    """
+    return {
+        "typed": found.typed,
+        "total": found.total,
+        "widened": found.widened,
+        "percent": round(found.percent, 1),
+    }
+
+
+def _typed(found: Coverage) -> str:
+    """Write a coverage as text: `3/4 typed (75.0%)`, then what a widening annotated, if anything.
+
+    Returns:
+      It.
+
+    """
+    wider: str = f", {found.widened} widened" if found.widened else ""
+    return f"{found.typed}/{found.total} typed ({found.percent:.1f}%){wider}"
+
+
 def _run(options: Options) -> int:
     """Check, fix, diff, count or baseline, printing what that finds.