Improve build backend excludes #9281

konstin · 2024-11-20T16:39:02Z

This PR contains three smaller improvements:

Improve the include/exclude logging. We're still showing the current directory as empty backticks, not sure what to do about that
Add early stopping to license file globbing, so we don't traverse the whole directory recursively when license files can only be in few places
Support explicit wheel excludes. These are still not entirely right, but at least we're correctly excluding compiled python files now. The next step is to make sure that the wheel excludes contain all pattern from source dist excludes, to make sure source tree -> wheel can't have more files than source tree -> source dist -> wheel.

BurntSushi · 2024-11-20T16:54:29Z

crates/uv-build-backend/src/lib.rs

+            trace!(
+                "Including {} at `{}` with `{}`",
+                globs_field,
+                src.user_display(),


Is this the thing that will emit an empty string for the CWD? Can we make it emit ./ instead for that case?

I have an idea, but it affects more places so I'll follow up

BurntSushi · 2024-11-20T16:55:05Z

crates/uv-build-backend/src/lib.rs

@@ -318,6 +318,20 @@ pub fn build_wheel(
    debug!("Writing wheel at {}", wheel_path.user_display());
    let mut wheel_writer = ZipDirectoryWriter::new_wheel(File::create(&wheel_path)?);

+    // Wheel excludes
+    // TODO(konstin): The must be stronger than the source dist excludes, otherwise we can get more
+    // files in source tree -> wheel than for source tree -> source dist -> wheel.


Can you say why you don't want to get more files in source tree -> wheel versus source tree -> source dist -> wheel?

Imagine we exclude src/a/b.py in source dist, but not in wheel. That means in source dist -> wheel, src/a/b.py is part of the final packages, but we remove it in source tree -> source dist, so the source dist -> wheel step can't include it (the file doesn't exist in the .tar.gz), so src/a/b.py isn't part of the final package.

This MR contains the following updates: | Package | Update | Change | |---|---|---| | [astral-sh/uv](https://github.com/astral-sh/uv) | patch | `0.5.4` -> `0.5.5` | MR created with the help of [el-capitano/tools/renovate-bot](https://gitlab.com/el-capitano/tools/renovate-bot). **Proposed changes to behavior should be submitted there as MRs.** --- ### Release Notes <details> <summary>astral-sh/uv (astral-sh/uv)</summary> ### [`v0.5.5`](https://github.com/astral-sh/uv/blob/HEAD/CHANGELOG.md#055) [Compare Source](astral-sh/uv@0.5.4...0.5.5) ##### Enhancements - Add aliases for build backend requests ([#9294](astral-sh/uv#9294)) - Avoid displaying empty paths ([#9312](astral-sh/uv#9312)) - Allow constraints in `uv tool upgrade` ([#9375](astral-sh/uv#9375)) - Remove conflict between `--no-sync` and `--frozen` in `uv run` ([#9400](astral-sh/uv#9400)) - Respect dependency sources in overrides and constraints ([#9455](astral-sh/uv#9455)) - Show an interpreter-focused message for `--target` and `--prefix` ([#9373](astral-sh/uv#9373)) - Add `--no-extra` flag and setting ([#9387](astral-sh/uv#9387)) - Add `uv export --prune` ([#9389](astral-sh/uv#9389)) - Add dedicated error message for musl install attempts ([#9430](astral-sh/uv#9430)) - Add various grammar changes to conflict error messages ([#9369](astral-sh/uv#9369)) - Annotate default groups in conflict error messages ([#9368](astral-sh/uv#9368)) - Report marker diagnostics during parsing, rather than evaluation ([#9338](astral-sh/uv#9338)) - Use consistent formatting for build system errors ([#9340](astral-sh/uv#9340)) - Use rich diagnostics for build failures ([#9335](astral-sh/uv#9335)) ##### Preview features - Improve build backend excludes ([#9281](astral-sh/uv#9281)) - Include PEP 639 `license-files` metadata during `uv publish` ([#9442](astral-sh/uv#9442)) ##### Performance - Initialize rayon lazily ([#9435](astral-sh/uv#9435)) - Migrate to PubGrub's arena for package names ([#9448](astral-sh/uv#9448)) ##### Bug fixes - Allow dependency groups to include the containing package ([#9385](astral-sh/uv#9385)) - Allow syncing to empty virtual environment directories ([#9427](astral-sh/uv#9427)) - Allow system Python discovery with `--target` and `--prefix` ([#9371](astral-sh/uv#9371)) - Don't warn when `--output-file` is empty ([#9417](astral-sh/uv#9417)) - Fix Python interpreter discovery on non-glibc hosts ([#9005](astral-sh/uv#9005)) - Fix `tool.uv.dependency-metadata.[].version` schema ([#9468](astral-sh/uv#9468)) - Only respect preferences across the same indexes ([#9302](astral-sh/uv#9302)) - Re-compile when `--compile` is passed to an install operation ([#9378](astral-sh/uv#9378)) - Remove `--upgrade`, `--no-upgrade`, and `--upgrade-package` from `uv tool upgrade` ([#9318](astral-sh/uv#9318)) - Remove dev dependencies in `--all-groups --no-dev` ([#9300](astral-sh/uv#9300)) - Surface extras and group conflicts in `uv export` ([#9365](astral-sh/uv#9365)) - Treat deprecated aliases as equivalent in marker algebra ([#9342](astral-sh/uv#9342)) - Treat less compatible tags as lower priority in resolver ([#9339](astral-sh/uv#9339)) ##### Documentation - Avoid referencing `scikit-build` (instead of `scikit-build-core`) ([#9320](astral-sh/uv#9320)) - Expand entry points documentation ([#9329](astral-sh/uv#9329)) - Fix example `pyproject.toml` in project concept documentation ([#9298](astral-sh/uv#9298)) - Fix header level of "Conflicting dependencies" page ([#9330](astral-sh/uv#9330)) - Touch-up the extension module guide ([#9293](astral-sh/uv#9293)) - Update the dependencies documentation ([#9359](astral-sh/uv#9359)) - Reference `--no-progress` option in related environment variable ([#9357](astral-sh/uv#9357)) </details> --- ### Configuration 📅 **Schedule**: Branch creation - At any time (no schedule defined), Automerge - At any time (no schedule defined). 🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied. ♻ **Rebasing**: Whenever MR becomes conflicted, or you tick the rebase/retry checkbox. 🔕 **Ignore**: Close this MR and you won't be reminded about this update again. --- - [ ] If you want to rebase/retry this MR, check this box --- This MR has been generated by [Renovate Bot](https://github.com/renovatebot/renovate).

konstin added 3 commits November 20, 2024 17:34

Fix license file globbing early stop

4c027bc

Improve logging

95c3bd6

Add wheel excludes

9819996

konstin added the preview Experimental behavior label Nov 20, 2024

konstin requested a review from BurntSushi November 20, 2024 16:39

BurntSushi approved these changes Nov 20, 2024

View reviewed changes

konstin merged commit e49ecd8 into main Nov 21, 2024
64 checks passed

konstin deleted the konsti/build-backend-fixes branch November 21, 2024 11:20

BrewTestBot mentioned this pull request Nov 27, 2024

uv 0.5.5 Homebrew/homebrew-core#199291

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Improve build backend excludes #9281

Improve build backend excludes #9281

konstin commented Nov 20, 2024

BurntSushi Nov 20, 2024

konstin Nov 21, 2024

BurntSushi Nov 20, 2024

konstin Nov 21, 2024

Improve build backend excludes #9281

Improve build backend excludes #9281

Conversation

konstin commented Nov 20, 2024

BurntSushi Nov 20, 2024

Choose a reason for hiding this comment

konstin Nov 21, 2024

Choose a reason for hiding this comment

BurntSushi Nov 20, 2024

Choose a reason for hiding this comment

konstin Nov 21, 2024

Choose a reason for hiding this comment