lapsed 3.0.0__tar.gz → 3.2.2__tar.gz

lapsed-3.2.2/.github/workflows/ci.yml

@@ -0,0 +1,81 @@
+name: CI
+
+# Runs on every pull request regardless of base branch, and on v* tags.
+#
+# Deliberately NOT restricted to `branches: [main]` the way the older workflows
+# are: this project develops through staging/test_release/feature branches, and
+# a base-branch filter means a PR into anything but main gets no CI at all.
+on:
+  pull_request:
+  push:
+    tags: ["v*"]
+  # Manual runs, useful for checking a branch before opening the PR.
+  workflow_dispatch:
+
+permissions:
+  contents: read
+
+# A newer push to the same PR supersedes the old run; tag builds are never
+# cancelled, since those gate a release.
+concurrency:
+  group: ci-${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: ${{ github.event_name == 'pull_request' }}
+
+jobs:
+  # Version-independent checks: the Rust toolchain, the Python linters (which
+  # analyse source rather than run it), and parity, which runs the Rust CLI and
+  # legacy-python side by side (see scripts/parity.py).
+  static:
+    name: ${{ matrix.check }}
+    runs-on: ubuntu-latest
+    strategy:
+      # Report every failing check in one run, rather than hiding the rest
+      # behind whichever fails first.
+      fail-fast: false
+      matrix:
+        check: [fmt, clippy, test, ruff, ruff-format, mypy, parity]
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: Install Rust
+        uses: dtolnay/rust-toolchain@stable
+        with:
+          # Only the checks that need them, so the Python jobs stay lean.
+          components: ${{ (matrix.check == 'fmt' && 'rustfmt') || (matrix.check == 'clippy' && 'clippy') || '' }}
+
+      - name: Cache cargo
+        uses: Swatinem/rust-cache@v2
+        with:
+          key: ${{ matrix.check }}
+
+      - name: Install uv
+        uses: astral-sh/setup-uv@v5
+        with:
+          enable-cache: true
+
+      # The exact command a developer runs locally.
+      - run: python scripts/check.py ${{ matrix.check }}
+
+  # The legacy Python suite, once per supported interpreter.
+  #
+  # Keep this list in sync with PYTHON_VERSIONS in scripts/check.py and the
+  # classifiers in legacy-python/pyproject.toml. 3.14 matters most here: it
+  # removed ast.Str/Num/Bytes/NameConstant/Ellipsis, which the visitor used.
+  pytest:
+    name: pytest (Python ${{ matrix.python }})
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        python: ["3.10", "3.11", "3.12", "3.13", "3.14"]
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: Install uv
+        uses: astral-sh/setup-uv@v5
+        with:
+          enable-cache: true
+
+      # uv fetches the interpreter itself, so no setup-python step is needed
+      # and the matrix cannot drift from what the runner image happens to ship.
+      - run: python scripts/check.py pytest --python ${{ matrix.python }}

lapsed-3.2.2/.github/workflows/wheels.yml

@@ -0,0 +1,212 @@
+name: Build Rust wheels
+
+# Wheels are the release artifact, so v* tags must build them -- previously
+# tags triggered nothing at all. `pull_request` is unfiltered for the same
+# reason as in ci.yml: a base-branch filter means PRs into staging or
+# test_release get no wheel build.
+on:
+  pull_request:
+  push:
+    branches: [ "main" ]
+    tags: [ "v*" ]
+  workflow_dispatch:
+
+permissions:
+  contents: read
+
+jobs:
+  test:
+    name: cargo test (${{ matrix.os }})
+    runs-on: ${{ matrix.os }}
+    strategy:
+      fail-fast: false
+      matrix:
+        os: [ubuntu-latest, windows-latest, macos-latest]
+    steps:
+      - uses: actions/checkout@v4
+      - uses: dtolnay/rust-toolchain@stable
+      - run: cargo test --all-features
+
+  linux:
+    name: wheel (linux ${{ matrix.target }})
+    needs: test
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        target: [x86_64, aarch64]
+    steps:
+      - uses: actions/checkout@v4
+      - name: Build manylinux wheel
+        uses: PyO3/maturin-action@v1
+        with:
+          target: ${{ matrix.target }}
+          args: --release --out dist
+          manylinux: auto
+      - uses: actions/upload-artifact@v4
+        with:
+          name: wheels-linux-${{ matrix.target }}
+          path: dist/*.whl
+
+  windows:
+    name: wheel (windows ${{ matrix.target }})
+    needs: test
+    runs-on: windows-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        target: [x64, x86]
+    steps:
+      - uses: actions/checkout@v4
+      - uses: actions/setup-python@v5
+        with:
+          python-version: "3.12"
+          architecture: ${{ matrix.target }}
+      - name: Build wheel
+        uses: PyO3/maturin-action@v1
+        with:
+          target: ${{ matrix.target == 'x64' && 'x86_64-pc-windows-msvc' || 'i686-pc-windows-msvc' }}
+          args: --release --out dist
+      - uses: actions/upload-artifact@v4
+        with:
+          name: wheels-windows-${{ matrix.target }}
+          path: dist/*.whl
+
+  macos:
+    name: wheel (macos ${{ matrix.target }})
+    needs: test
+    runs-on: macos-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        target: [x86_64, aarch64]
+    steps:
+      - uses: actions/checkout@v4
+      - name: Build wheel
+        uses: PyO3/maturin-action@v1
+        with:
+          target: ${{ matrix.target }}
+          args: --release --out dist
+      - uses: actions/upload-artifact@v4
+        with:
+          name: wheels-macos-${{ matrix.target }}
+          path: dist/*.whl
+
+  sdist:
+    name: source distribution
+    needs: test
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - uses: PyO3/maturin-action@v1
+        with:
+          command: sdist
+          args: --out dist
+      - uses: actions/upload-artifact@v4
+        with:
+          name: sdist
+          path: dist/*.tar.gz
+
+  # Every wheel installs and runs on its target platform.
+  smoke-test:
+    name: install & smoke test (${{ matrix.os }})
+    needs: [linux, windows, macos]
+    runs-on: ${{ matrix.os }}
+    strategy:
+      fail-fast: false
+      # Runner and artifact are paired explicitly rather than derived from the
+      # OS name. A wheel only installs on a matching architecture, and the
+      # previous nested-ternary form hardcoded macos-x86_64 -- which broke once
+      # `macos-latest` became Apple Silicon (macos-26-arm64), since the x86_64
+      # wheel is not installable there. Pairing them here means adding a
+      # platform is one obvious edit instead of an easily-missed branch.
+      #
+      # Not every built wheel has a runner to test on: linux-aarch64,
+      # windows-x86, and (as of GitHub retiring free Intel macOS hosting
+      # entirely -- every x64 macOS label is now a paid large-runner, e.g.
+      # macos-15-intel/macos-14-large -- macos-x86_64) are shipped untested.
+      # macos-13 used to cover the x86_64 wheel, but that label has no runner
+      # left to schedule it on: the job just queues forever and gets
+      # auto-cancelled by GitHub after 24h, which is what happened here.
+      matrix:
+        include:
+          - os: ubuntu-latest
+            artifact: wheels-linux-x86_64
+          - os: windows-latest
+            artifact: wheels-windows-x64
+          # macos-latest tracks whatever Apple Silicon image GitHub currently
+          # calls "latest", so it catches drift early.
+          - os: macos-latest
+            artifact: wheels-macos-aarch64
+          # macos-15 is a hard-pinned Apple Silicon version (not a moving
+          # "-latest" symlink), so this job stays reproducible even if/when
+          # "latest" moves again.
+          - os: macos-15
+            artifact: wheels-macos-aarch64
+    steps:
+      - uses: actions/checkout@v4
+      - uses: actions/setup-python@v5
+        with:
+          python-version: "3.12"
+      - name: Download this OS's wheel
+        uses: actions/download-artifact@v4
+        with:
+          pattern: ${{ matrix.artifact }}
+          path: dist
+          merge-multiple: true
+      # Fail loudly if the download produced nothing, rather than letting the
+      # install step report a confusing "no matching distribution".
+      - name: Verify a wheel was downloaded
+        shell: bash
+        run: |
+          ls -l dist
+          if [ "$(ls dist/*.whl 2>/dev/null | wc -l)" -eq 0 ]; then
+            echo "::error::no .whl in dist for ${{ matrix.artifact }}"
+            exit 1
+          fi
+      # The distribution is `lapsed`; the command it installs is `deadcode`.
+      # `--no-index` matters: this previously asked for `deadcode`, which does
+      # not match the built `lapsed-*.whl`, so pip fell through to PyPI and
+      # smoke-tested an unrelated package instead of this build. Forbidding the
+      # index makes that failure loud rather than silent.
+      - run: pip install --no-index --find-links dist lapsed
+      - run: deadcode --version
+
+  # Pushing a `v*` tag publishes to PyPI once every wheel built and smoke-tested.
+  # Uses PyPI trusted publishing (OIDC), so there is no token in the repository:
+  # register this workflow as a trusted publisher for `lapsed` on PyPI
+  # (owner ColinKennedy, repo deadcode, workflow wheels.yml, environment pypi).
+  publish:
+    name: publish to PyPI
+    if: startsWith(github.ref, 'refs/tags/v')
+    needs: [sdist, smoke-test]
+    runs-on: ubuntu-latest
+    environment:
+      name: pypi
+      url: https://pypi.org/project/lapsed/
+    permissions:
+      id-token: write
+    steps:
+      - uses: actions/checkout@v4
+      - uses: actions/download-artifact@v4
+        with:
+          path: dist
+          merge-multiple: true
+      # A tag that disagrees with Cargo.toml would upload the wrong version.
+      - name: Check the tag matches the package version
+        shell: bash
+        run: |
+          expected="${GITHUB_REF_NAME#v}"
+          actual="$(grep -m1 '^version = ' Cargo.toml | cut -d'"' -f2)"
+          if [ "$expected" != "$actual" ]; then
+            echo "::error::tag $GITHUB_REF_NAME does not match Cargo.toml version $actual"
+            exit 1
+          fi
+          ls -l dist
+          if ls dist | grep -v -E "^lapsed-$expected[-.]" ; then
+            echo "::error::dist holds files that are not version $expected"
+            exit 1
+          fi
+      - uses: pypa/gh-action-pypi-publish@release/v1
+        with:
+          packages-dir: dist

lapsed-3.2.2/.gitignore

@@ -0,0 +1,169 @@
+# Byte-compiled / optimized / DLL files
+__pycache__/
+*.py[cod]
+*$py.class
+
+# C extensions
+*.so
+
+# Distribution / packaging
+.Python
+build/
+develop-eggs/
+dist/
+downloads/
+eggs/
+.eggs/
+lib/
+lib64/
+parts/
+sdist/
+var/
+wheels/
+share/python-wheels/
+*.egg-info/
+.installed.cfg
+*.egg
+MANIFEST
+
+# PyInstaller
+#  Usually these files are written by a python script from a template
+#  before PyInstaller builds the exe, so as to inject date/other infos into it.
+*.manifest
+*.spec
+
+# Installer logs
+pip-log.txt
+pip-delete-this-directory.txt
+
+# Unit test / coverage reports
+htmlcov/
+.tox/
+.nox/
+.coverage
+.coverage.*
+.cache
+nosetests.xml
+coverage.xml
+*.cover
+*.py,cover
+.hypothesis/
+.pytest_cache/
+cover/
+
+# Translations
+*.mo
+*.pot
+
+# Django stuff:
+*.log
+local_settings.py
+db.sqlite3
+db.sqlite3-journal
+
+# Flask stuff:
+instance/
+.webassets-cache
+
+# Scrapy stuff:
+.scrapy
+
+# Sphinx documentation
+docs/_build/
+
+# PyBuilder
+.pybuilder/
+target/
+
+# Jupyter Notebook
+.ipynb_checkpoints
+
+# IPython
+profile_default/
+ipython_config.py
+
+# pyenv
+#   For a library or package, you might want to ignore these files since the code is
+#   intended to run in multiple environments; otherwise, check them in:
+# .python-version
+
+# pipenv
+#   According to pypa/pipenv#598, it is recommended to include Pipfile.lock in version control.
+#   However, in case of collaboration, if having platform-specific dependencies or dependencies
+#   having no cross-platform support, pipenv may install dependencies that don't work, or not
+#   install all needed dependencies.
+#Pipfile.lock
+
+# poetry
+#   Similar to Pipfile.lock, it is generally recommended to include poetry.lock in version control.
+#   This is especially recommended for binary packages to ensure reproducibility, and is more
+#   commonly ignored for libraries.
+#   https://python-poetry.org/docs/basic-usage/#commit-your-poetrylock-file-to-version-control
+#poetry.lock
+
+# pdm
+#   Similar to Pipfile.lock, it is generally recommended to include pdm.lock in version control.
+#pdm.lock
+#   pdm stores project-wide configurations in .pdm.toml, but it is recommended to not include it
+#   in version control.
+#   https://pdm.fming.dev/#use-with-ide
+.pdm.toml
+
+# PEP 582; used by e.g. github.com/David-OConnor/pyflow and github.com/pdm-project/pdm
+__pypackages__/
+
+# Celery stuff
+celerybeat-schedule
+celerybeat.pid
+
+# SageMath parsed files
+*.sage.py
+
+# Environments
+.env
+.venv
+env/
+venv/
+ENV/
+env.bak/
+venv.bak/
+
+# Spyder project settings
+.spyderproject
+.spyproject
+
+# Rope project settings
+.ropeproject
+
+# mkdocs documentation
+/site
+
+# mypy
+.mypy_cache/
+.dmypy.json
+dmypy.json
+
+# ruff
+.ruff_cache/
+
+# Pyre type checker
+.pyre/
+
+# pytype static type analyzer
+.pytype/
+
+# Cython debug symbols
+cython_debug/
+
+# PyCharm
+#  JetBrains specific template is maintained in a separate JetBrains.gitignore that can
+#  be found at https://github.com/github/gitignore/blob/main/Global/JetBrains.gitignore
+#  and can be added to the global gitignore or merged into this file.  For a more nuclear
+#  option (not recommended) you can uncomment the following to ignore the entire idea folder.
+#.idea/
+
+notes
+
+# uv lockfile for the archived Python package; generated on demand by the
+# check runner, not a source of truth for anything shipped.
+legacy-python/uv.lock

lapsed-3.0.0/CLAUDE.md → lapsed-3.2.2/AGENTS.md

@@ -10,7 +10,8 @@ As of the `refactor_to_rust` branch, the implementation is **Rust**, not Python
 
 - **Language:** Rust (edition 2021), packaged for PyPI via `maturin` with `bindings = "bin"` — the wheel ships a compiled native binary + console-script shim, no PyO3/Python bindings.
 - **Entry point:** `src/main.rs` → `deadcode::cli::print_main()`
-- **AST parsing:** `rustpython-parser`/`rustpython-ast`
+- **AST parsing:** `ruff_python_parser`/`ruff_python_ast` (Astral's parser, published on crates.io). This replaced `rustpython-parser`, whose newest release (0.4.0) tops out around Python 3.11 and could not parse 3.12+ source — see `src/actions/parse_abstract_syntax_tree.rs` for the specifics and `RUST_PORT_PLAN.md` for why the original choice was reversed.
+- **Minimum Rust:** 1.95 (required by the ruff crates).
 - **Config:** `pyproject.toml` at repo root now configures the `maturin` build, not tool behavior (there is no `[tool.deadcode]` section for the Rust CLI itself yet — config merging support could be re-added if needed, but the CLI flags are the primary interface).
 
 ## Development Setup
@@ -31,7 +32,7 @@ pip install target/wheels/deadcode-*.whl
 
 ## Architecture
 
-Mirrors the original Python pipeline, module-for-module, with two structural differences: AST traversal is a hand-written exhaustive `match` over `rustpython_ast`'s `Stmt`/`Expr` enums (no dynamic dispatch, no Python-style `ast.iter_fields` reflection), and `NestedScope` only tracks classes (confirmed behavior-preserving by tracing what actually reads it — see `src/utils/nested_scopes.rs`'s doc comment).
+Mirrors the original Python pipeline, module-for-module, with two structural differences: AST traversal is a hand-written exhaustive `match` over `ruff_python_ast`'s `Stmt`/`Expr` enums (no dynamic dispatch, no Python-style `ast.iter_fields` reflection), and `NestedScope` only tracks classes (confirmed behavior-preserving by tracing what actually reads it — see `src/utils/nested_scopes.rs`'s doc comment).
 
 1. **`src/actions/parse_arguments.rs`** — Parses CLI args (`clap`) and merges `pyproject.toml`'s `[tool.deadcode]` (if present) — mirrors `flatten_lists_of_comma_separated_values` + `parse_pyproject_toml`.
 2. **`src/actions/find_python_filenames.rs`** — Discovers `.py` files, applying `--exclude`/`--only` filters and tach.toml source-root rules.
@@ -46,12 +47,40 @@ Mirrors the original Python pipeline, module-for-module, with two structural dif
 | `src/constants.rs` | `UnusedCodeType` enum, DC01–DC13 error codes (DC10 deliberately absent) |
 | `src/data_types.rs` | `Args` struct (doubles as the `clap` CLI definition), `Part` |
 | `src/visitor/code_item.rs` | `CodeItem` — a single unused-code finding |
-| `src/utils/line_index.rs` | Byte-offset → (line, column) conversion (rustpython gives byte ranges, not line/col directly) |
+| `src/actions/parse_abstract_syntax_tree.rs` | The only place source is parsed; pins the parser's `target_version` to the newest Python grammar |
+| `src/utils/line_index.rs` | Byte-offset → (line, column) conversion (the parser gives byte ranges, not line/col directly) |
 | `src/utils/nested_scopes.rs` | Class inherits-from chain tracking |
 | `src/utils/fnmatch.rs` | Rust port of Python's `fnmatch` glob semantics |
-| `src/actions/remove_file_parts_from_content.rs` | Byte-level code removal for `--fix` — preserves several documented quirks/bugs from the Python original for exact parity (see its module doc comment) |
+| `src/actions/get_unused_import_parts.rs` | Statement-aware removal parts for unused imports (commas, `;` separators, emptied statements) — port of upstream's `get_unused_import_parts.py` |
+| `src/actions/remove_file_parts_from_content.rs` | Byte-level code removal for `--fix` — preserves the Python original's quirks except where they produce invalid Python (see its module doc comment) |
 | `src/actions/parse_tach_config.rs` | tach.toml support (source_roots, interfaces/expose, unchecked modules, tach.domain.toml merging) |
 
+### Where ruff's AST differs from CPython's `ast`
+
+The visitor is a port of Python code and is written to match CPython's `ast`
+semantics exactly. `ruff_python_ast` is not a 1:1 mirror of `ast`, so a few
+places translate deliberately. Each is commented at its site; the ones worth
+knowing before editing the visitor:
+
+- **A decorated `def`/`class` node's range starts at its first decorator**, where
+  CPython points at the `def`/`class` keyword. `push_definition` corrects for this
+  via `definition_keyword_start`. Getting this wrong reports decorated definitions
+  on the decorator's line and silently breaks `# noqa` lookup (the comment sits on
+  the `def` line).
+- **Merged node kinds:** `async def`/`def`, `async for`/`for`, `async with`/`with`
+  are one node with an `is_async` flag; `try`/`except*` is one node with `is_star`.
+- **Split literals:** CPython's single `ast.Constant` is one variant per literal
+  kind (`StringLiteral`, `NumberLiteral`, …).
+- **Restructured nodes:** `if`/`elif`/`else` is flattened into `elif_else_clauses`
+  rather than nested in `orelse`; `Dict` pairs keys and values in one `items` list;
+  `MatchClass` merges `kwd_attrs`/`kwd_patterns` into one `keywords` list.
+- **f-strings/t-strings are not plain expression trees.** They are lists of parts
+  (to support PEP 701 and implicit concatenation), so interpolations must be walked
+  explicitly via `walk_interpolated_element` — this is what makes a name used only
+  inside `f"{x}"` count as a usage.
+- **`ExprContext` has a fourth `Invalid` variant** with no CPython equivalent, used
+  for error-recovery nodes. Ignored.
+
 ### Deliberately NOT ported (confirmed dead/inert in the Python original)
 
 - `unreachable_code`/DC09 detection: computed in the Python code but explicitly excluded from `get_unused_code_items()`'s output and untested — zero observable effect, so it isn't implemented here at all.
@@ -65,6 +94,8 @@ DC01 unused-variable, DC02 unused-function, DC03 unused-class, DC04 unused-metho
 
 Unit tests live inline in `src/**` (`#[cfg(test)] mod tests`); integration tests live in `tests/*.rs`, using real temp directories (no filesystem mocking — this port always does real I/O) via the shared harness in `tests/common/mod.rs`. `tests/files/*.py` are real fixture files (not copies) whose exact line numbers are asserted against — do not reformat them without checking `tests/deadcode_integration.rs`.
 
+**Parity with upstream:** `python scripts/check.py parity` runs the Rust CLI and `legacy-python/` side by side on `tests/parity/cases/*` and every legacy fixture, comparing findings, exit codes and `--dry` diffs, and checks that Rust `--fix` never leaves an unparseable file. Known differences are listed with reasons in `tests/parity/known_differences.txt`; the check fails on a new difference *and* on a listed one that disappeared, so delete the line when you fix one. `python scripts/parity.py --show <case>` prints a case's differences.
+
 **Run a single test:**
 ```bash
 cargo test --test fix_cli_option

lapsed-3.2.2/CLAUDE.md

@@ -0,0 +1 @@
+@AGENTS.md