Skip to content

Scope type-checking imports#111

Merged
leynos merged 6 commits intopython-lib-release-actionfrom
codex/fix-exception-related-violations-in-tests
Sep 21, 2025
Merged

Scope type-checking imports#111
leynos merged 6 commits intopython-lib-release-actionfrom
codex/fix-exception-related-violations-in-tests

Conversation

@leynos
Copy link
Copy Markdown
Owner

@leynos leynos commented Sep 21, 2025

Summary

  • gate cmd-mox typing dependencies behind TYPE_CHECKING in conftest.py
  • move the ModuleType annotations for release-to-pypi tests behind type-checking blocks to satisfy TC003

Testing

  • uvx ruff check --select ICN003,TC003
  • uv run --with typer --with packaging --with plumbum --with pyyaml pytest

https://chatgpt.com/codex/tasks/task_e_68d026396ed4832285ef8e693f20a6fd

Summary by Sourcery

Scope type-only imports behind TYPE_CHECKING, introduce a CmdMoxEnvironment protocol with a shared shim path helper for cmd-mox tests, and standardize exception raising by extracting message strings into variables across scripts and tests.

Enhancements:

  • Gate type-only imports and annotations in conftest and test helpers behind TYPE_CHECKING blocks
  • Add CmdMoxEnvironment protocol and a central _shim_path function to unify shim directory resolution
  • Standardize exception raising by extracting error message strings into variables before raising errors in scripts and tests

@sourcery-ai
Copy link
Copy Markdown
Contributor

sourcery-ai Bot commented Sep 21, 2025

Reviewer's Guide

This PR scopes type-only imports behind TYPE_CHECKING, refactors exception raising to extract message variables before raising, and reorganizes the cmd-mox fixture definitions by introducing a helper for shim path resolution and stronger Protocol types.

File-Level Changes

Change Details Files
Refactor exception raising to use a message variable
  • Replaced inline f-strings with a message variable before raising errors in release-to-pypi and coverage scripts
  • Updated RuntimeError and GithubReleaseError raises in check_github_release.py, validate_toml_versions.py, run_rust.py
  • Adjusted related tests in generate-coverage and release-to-pypi-uv to use the new message pattern
.github/actions/release-to-pypi-uv/scripts/check_github_release.py
.github/actions/release-to-pypi-uv/scripts/validate_toml_versions.py
.github/actions/generate-coverage/scripts/run_rust.py
.github/actions/generate-coverage/tests/test_scripts.py
.github/actions/release-to-pypi-uv/tests/test_check_github_release.py
.github/actions/release-to-pypi-uv/tests/test_publish_release.py
.github/actions/release-to-pypi-uv/tests/test_validate_toml_versions.py
.github/actions/release-to-pypi-uv/tests/test_write_summary.py
Scope type-only imports behind TYPE_CHECKING
  • Wrapped imports of Path and ModuleType under if TYPE_CHECKING blocks
  • Moved Protocol annotations into type-checking guards to satisfy TC003
  • Imported typing as t and guarded annotation-only code
conftest.py
.github/actions/release-to-pypi-uv/tests/_helpers.py
Restructure cmd-mox fixture types and shim path handling
  • Introduced CmdMoxEnvironment Protocol and updated CmdMox to reference it
  • Added _shim_path helper to resolve command shim paths safely
  • Replaced direct shim_dir references in fixtures and tests with _shim_path
conftest.py
.github/actions/rust-build-release/tests/test_utils.py

Tips and commands

Interacting with Sourcery

  • Trigger a new review: Comment @sourcery-ai review on the pull request.
  • Continue discussions: Reply directly to Sourcery's review comments.
  • Generate a GitHub issue from a review comment: Ask Sourcery to create an
    issue from a review comment by replying to it. You can also reply to a
    review comment with @sourcery-ai issue to create an issue from it.
  • Generate a pull request title: Write @sourcery-ai anywhere in the pull
    request title to generate a title at any time. You can also comment
    @sourcery-ai title on the pull request to (re-)generate the title at any time.
  • Generate a pull request summary: Write @sourcery-ai summary anywhere in
    the pull request body to generate a PR summary at any time exactly where you
    want it. You can also comment @sourcery-ai summary on the pull request to
    (re-)generate the summary at any time.
  • Generate reviewer's guide: Comment @sourcery-ai guide on the pull
    request to (re-)generate the reviewer's guide at any time.
  • Resolve all Sourcery comments: Comment @sourcery-ai resolve on the
    pull request to resolve all Sourcery comments. Useful if you've already
    addressed all the comments and don't want to see them anymore.
  • Dismiss all Sourcery reviews: Comment @sourcery-ai dismiss on the pull
    request to dismiss all existing Sourcery reviews. Especially useful if you
    want to start fresh with a new review - don't forget to comment
    @sourcery-ai review to trigger a new review!

Customizing Your Experience

Access your dashboard to:

  • Enable or disable review features such as the Sourcery-generated pull request
    summary, the reviewer's guide, and others.
  • Change the review language.
  • Add, remove or edit custom review instructions.
  • Adjust other review settings.

Getting Help

@coderabbitai
Copy link
Copy Markdown
Contributor

coderabbitai Bot commented Sep 21, 2025

Important

Review skipped

Auto reviews are disabled on base/target branches other than the default branch.

Please check the settings in the CodeRabbit UI or the .coderabbit.yaml file in this repository. To trigger a single review, invoke the @coderabbitai review command.

You can disable this status message by setting the reviews.review_status to false in the CodeRabbit configuration file.

Note

Other AI code review bot(s) detected

CodeRabbit has detected other AI code review bot(s) in this pull request and will avoid duplicating their findings in the review comments. This may lead to a less comprehensive review.

✨ Finishing touches
🧪 Generate unit tests
  • Create PR with unit tests
  • Post copyable unit tests in a comment
  • Commit unit tests in branch codex/fix-exception-related-violations-in-tests

Comment @coderabbitai help to get the list of available commands and usage tips.

Copy link
Copy Markdown
Contributor

@sourcery-ai sourcery-ai Bot left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hey there - I've reviewed your changes and they look great!

Prompt for AI Agents
Please address the comments from this code review:

## Individual Comments

### Comment 1
<location> `.github/actions/generate-coverage/scripts/run_rust.py:163-165` </location>
<code_context>
     )
     if proc.stdout is None or proc.stderr is None:
-        raise RuntimeError("cargo output streams not captured")  # noqa: TRY003
+        message = "cargo output streams not captured"
+        raise RuntimeError(message)
     stdout_lines: list[str] = []

</code_context>

<issue_to_address>
**suggestion:** Consider including more context in the error message for cargo output streams.

Specify whether stdout or stderr is missing in the error message to make debugging easier, particularly in CI.

```suggestion
    if proc.stdout is None or proc.stderr is None:
        missing_streams = []
        if proc.stdout is None:
            missing_streams.append("stdout")
        if proc.stderr is None:
            missing_streams.append("stderr")
        message = f"cargo output streams not captured: missing {', '.join(missing_streams)}"
        raise RuntimeError(message)
```
</issue_to_address>

Sourcery is free for open source - if you like our reviews please consider sharing them ✨
Help me be more useful! Please click 👍 or 👎 on each comment and I'll use the feedback to improve your reviews.

Comment thread .github/actions/generate-coverage/scripts/run_rust.py
@leynos leynos merged commit 9c502e4 into python-lib-release-action Sep 21, 2025
5 of 8 checks passed
@leynos leynos deleted the codex/fix-exception-related-violations-in-tests branch September 21, 2025 21:02
leynos added a commit that referenced this pull request Sep 22, 2025
* Scope type-checking imports

* Fix lint warnings across release scripts

* Clarify cargo stream capture error

* ci: add lint and format checks

* Install action-validator in CI lint workflow

* Install bun validator packages in CI
leynos added a commit that referenced this pull request Sep 23, 2025
* Scope type-checking imports

* Fix lint warnings across release scripts

* Clarify cargo stream capture error

* ci: add lint and format checks

* Install action-validator in CI lint workflow

* Install bun validator packages in CI
leynos added a commit that referenced this pull request Sep 24, 2025
* Scope type-checking imports

* Fix lint warnings across release scripts

* Clarify cargo stream capture error

* ci: add lint and format checks

* Install action-validator in CI lint workflow

* Install bun validator packages in CI
leynos added a commit that referenced this pull request Sep 24, 2025
* Add release-to-pypi-uv composite action

* Document trusted publishing permissions

* Clarify GH_TOKEN handling in README

* Fix local usage example

* Improve GitHub release error handling

* Fix cmd_utils discovery in publish script

* Skip more build caches

* Fail fast on TOML parse errors

* Format release summary output

* Add no-tag error test

* Test TOML parse failures

* Make uv python version configurable

* Document concurrency guard in usage

* Address review feedback with retries and tests

* Improve TOML version validation and test strategy

Extends boolean parsing to support more truthy values when validating dynamic version flags in TOML files. Refactors tests to run in-process with better coverage of various flag values and scenarios, replacing subprocess-based tests for efficiency and detail. Updates action to simplify Python version handling with uv and improves path detection for testing.

These changes make validation logic more robust and enhance test reliability.

* Add cmd-mox users guide

* Use cmd-mox to stub rust build command tests (#92)

* Use cmd-mox for rust build command tests

* Guard cmd-mox integration on Windows

* Refactor cmd-mox helpers into shared conftest

* Apply cmd-mox fake which simplification

* Mark Windows smoke tests as xfail (#94)

* Mark Windows smoke tests as xfail

* Tighten Windows smoke test expectations

* Address reviewer feedback for release-to-pypi-uv action (#98)

* Address review comments for release to PyPI action

* Add tests and docs for python-version handling

* Fix cmd_mox fixture usage and expose dev extra (#101)

* Fix cmd_mox fixture usage and expose dev extras

* Remove pyproject optional dev extra

* Remove Pyright configuration

* Add missing docstrings to release-to-pypi-uv modules (#103)

* Silence type-check import lints for release action (#104)

* Add toolchain-specific cargo cache key and clean shellstub imports (#88)

* Address review feedback for shellstub imports

* Fix MSYS2 install comments breaking pacman (#89)

* Fix MSYS2 install comments breaking pacman

* Fix Windows llvm-mingw metadata export

* Handle runtime detection timeouts

* Fix rust host detection timeout and Windows bin path (#91)

* Fix rust host detection timeout and Windows bin path

* Add timeout coverage for rust host detection

* Unify runtime probe timeout configuration

* test: capture rustc probe kwargs in timeout test

* Remove inline comments from Windows GNU MSYS2 package list (#99)

* Remove inline MSYS2 install comments

* Skip nfpm steps on Windows builds

* Handle nfpm packaging only for Linux

* Fix Windows invocation of rust-build-release (#102)

* Silence type-check import lints for release action

* Adds ignore rule for Crush agent artifacts

Ignores files generated by the Crush AI agent to prevent them from being tracked in version control.

Adds a symlink to AGENTS.md for discovery by Crush

* Format code after rebase validation to satisfy repo style checks.

💘 Generated with Crush
Co-Authored-By: Crush <crush@charm.land>

* fmt: extend fmt target to run ruff check --select D202,I001 --fix; apply resulting fixes

💘 Generated with Crush
Co-Authored-By: Crush <crush@charm.land>

---------

Co-authored-by: Payton McIntosh <pmcintosh@df12.net>
Co-authored-by: Crush <crush@charm.land>

* Narrow module fixtures to ModuleType (#105)

* Add docstrings for release-to-pypi-uv tests and helpers (#106)

* Add missing docstrings for release-to-pypi-uv tests

* Simplify cmd-mox typing and streamline docstrings

* Apply formatting

* chore: remove unused imports across scripts and tests

* style(_helpers): alphabetise __all__ tuple

* tests: drop superfluous parentheses from @pytest.fixture usage

---------

Co-authored-by: Payton McIntosh <pmcintosh@df12.net>

* Scope type-checking imports (#111)

* Scope type-checking imports

* Fix lint warnings across release scripts

* Clarify cargo stream capture error

* ci: add lint and format checks

* Install action-validator in CI lint workflow

* Install bun validator packages in CI

* Test full success message for matching versions (#113)

* Address review comments (#116)

* Address review feedback for release-to-pypi-uv actions (#112)

* Address review feedback

* Add CLI coverage for publish and validate scripts

* Add deterministic validation tests and bunx validator checks

* Update ci.yml remove unneeded step

* Fix formatting

* Fix Windows xfail marker removal for pytest 8 (#120)

* Fix Windows xfail marker removal for pytest 8

* Tighten Windows xfail marker filtering

* Handle runtime probe timeouts and expand release tests (#119)

* Handle runtime probe timeouts and expand release tests

* Add _probe_runtime coverage and assert timeout warnings

* Expand TOML skip directories for release validation (#122)

* Expand pyproject skip list handling

* Strengthen TOML and runtime timeout tests

* Assert cargo fallback logs podman failure

* Parameterize skip-directory regression

* Reinforce regression coverage for release tooling (#130)

* Refine skip directory regression parameterization

* Document skip directories and DRY timeout assertions

* Parametrize publish index test

* Refactor runtime timeout tests

* Rebase onto origin/python-lib-release-action and resolve conflicts

- Resolve merge in validate_toml_versions tests by standardizing module loading
- Register dynamically loaded scripts in sys.modules to support reload semantics
- Make toolchain triple test robust to host arch by selecting matching target
- Run formatting, lint, typecheck, and tests to validate integration

💘 Generated with Crush
Co-Authored-By: Crush <crush@charm.land>

---------

Co-authored-by: Crush <crush@charm.land>

* Harden release-to-pypi-uv workflow and regression coverage (#134)

* Improve release validation jitter handling

* Adjust runtime fallback host triples per platform

* Make release validation deterministic and configurable

* Rebase python-lib-release-action onto origin/main; resolve conflicts preserving branch intent; drop uv.lock in favor of main; fix tests and typing/lint issues; all tests pass and linters clean

* Close cargo pipes when coverage stream missing (#137)

* Close cargo pipes when missing

* Ensure cargo pipes close on all paths

* Ensure guard closes cargo pipes before exiting

* Handle release script auth failure and multiline outputs (#136)

* Handle release script auth failure and multiline outputs

* Harden windows toolchain setup and extend runtime tests

* Handle release auth errors and tweak toolchain retries

* Fix cross install warning expectation (#139)

* Fix cross install warning assertion

* Harden cross install harness checks

* Sanitize runtime probe timeout and guard actions

* Refine runtime probe helpers and add timeout tests

* Fix runtime probe lint findings

* Share echo recorder fixture across runtime tests

* Update fmt target description (#140)

* Resolve rebase conflicts and align runtime tests with platform/timeouts from main while preserving branch improvements; ensure formatting passes and all tests/linters are green.

💘 Generated with Crush
Co-Authored-By: Crush <crush@charm.land>

---------

Co-authored-by: Payton McIntosh <pmcintosh@df12.net>
Co-authored-by: Crush <crush@charm.land>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant