fix: extend setuptools<82 retry to pyproject.toml apps#272
Merged
Conversation
|
Important Review skippedAuto reviews are disabled on base/target branches other than the default branch. Please check the settings in the CodeRabbit UI or the ⚙️ Run configurationConfiguration used: Path: .coderabbit.yaml Review profile: CHILL Plan: Pro Run ID: You can disable this status message by setting the Use the checkbox below for a quick retry:
✨ Finishing Touches🧪 Generate unit tests (beta)
Comment |
The legacy-setuptools retry only fired for requirements.txt projects, leaving pyproject.toml apps with no recovery path when their builds needed pkg_resources. The retry now drops out of uv sync into uv pip install with the project source (. for pyproject, -r requirements.txt otherwise) plus a setuptools<82 arg, so both kinds of project get the same fallback.
Removes the should_use_legacy_setuptools_pin predicate and the spawn_requirements_install helper — the call site in tower-runtime is now just 'if res != 0 { retry }', and the file-type branch lives inline where the args are built.
3e7358a to
659d756
Compare
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
The legacy-setuptools retry added in #270 only kicked in for
requirements.txtprojects — pyproject.toml apps that neededpkg_resources(setuptools<82) at install time had no recovery path and just failed.uv synccan't accept a CLI constraint, so the retry now drops out ofuv syncintouv pip installwith the project source (.for pyproject,-r requirements.txtotherwise) plus asetuptools<82arg. Both kinds of project get the same fallback.The call site in tower-runtime is now
if res != 0 { retry }— no file-type knowledge — and the file-type branch lives inline insync_with_legacy_setuptools_pinwhere the command args are built.should_use_legacy_setuptools_pinandspawn_requirements_installare gone; a smallrun_setup_childhelper dedupes the stdout/stderr drain + wait between the initial install and the retry.Test plan
cargo test -p tower-uv --test sync_test(7 tests, including two new pyproject ones)