Skip to content

fix: minor 4.0 issues in Android validation, docs, and docstring#2891

Merged
henryiii merged 3 commits into
pypa:mainfrom
henryiii:fix-4.0-minor-issues
Jun 3, 2026
Merged

fix: minor 4.0 issues in Android validation, docs, and docstring#2891
henryiii merged 3 commits into
pypa:mainfrom
henryiii:fix-4.0-minor-issues

Conversation

@henryiii
Copy link
Copy Markdown
Contributor

@henryiii henryiii commented Jun 2, 2026

🤖 AI text below 🤖

A few small fixes found while reviewing for the 4.0 release.

  • Android: ANDROID_API_LEVEL is consumed via int(...) in localized_vars. If a user sets it to a non-integer through the environment option, that previously surfaced as an uncaught ValueError deep in the build. Now setup_env validates it right after applying the user environment and raises a clear FatalError.
  • Docs: Added a note to repair-wheel-command explaining that delvewheel is the default on Windows since 4.0, and that a platform-tagged wheel with no extension module may need repair-wheel-command = "". Also updated the now-outdated FAQ wording ("if you're using delvewheel" → "uses delvewheel by default since 4.0").
  • venv: Corrected the _parse_pip_constraint_for_virtualenv docstring — when marker_env is None, marker-bearing constraints are evaluated against the host's default environment, not skipped.

prek -a passes clean.

- android: raise a clear FatalError when ANDROID_API_LEVEL is not an
  integer, instead of an uncaught ValueError deep in localized_vars
- docs: note that delvewheel is the default Windows repair-wheel-command
  since 4.0 and how to skip it for platform-tagged wheels with no
  extension module; update the now-outdated FAQ wording
- venv: fix _parse_pip_constraint_for_virtualenv docstring to say
  marker-bearing constraints are evaluated against the host's default
  environment (not skipped) when marker_env is None

Assisted-by: ClaudeCode:claude-opus-4.8
@henryiii henryiii requested a review from mhsmith as a code owner June 2, 2026 04:40
Comment thread cibuildwheel/platforms/android.py Outdated
henryiii added 2 commits June 2, 2026 13:58
Handle ANDROID_API_LEVEL validation via try/except around int() so the
original exception message is surfaced, and so non-ASCII Unicode digits
(which isdigit() accepts but int() may reject) are handled correctly.

Assisted-by: ClaudeCode:claude-opus-4.8
Assisted-by: ClaudeCode:claude-opus-4.8
Signed-off-by: Henry Schreiner <henryfs@princeton.edu>
@henryiii henryiii merged commit 2f49f9a into pypa:main Jun 3, 2026
45 checks passed
@henryiii henryiii deleted the fix-4.0-minor-issues branch June 3, 2026 19:23
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants