- Notifications
You must be signed in to change notification settings - Fork1.3k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to ourterms of service andprivacy statement. We’ll occasionally send you account related emails.
Already on GitHub?Sign in to your account
Display path separators as backslashes on Windows#11667
Conversation
a79f5b8
to1c2a07b
CompareWhat's the root cause of this? Is this because they're stored with Unix-style paths in the tool receipt? Lines 289 to 293 inc30f53b
Should we just deserialize these into the appropriate platform-specific type? Or perhaps we should implement Otherwise, I feel like we'll just be playing whack-a-mole with places these are displayed. |
ffc5d72
toddc6c23
Compare
Yeah, implementing |
crates/uv/tests/it/common/mod.rs Outdated
@@ -250,6 +250,16 @@ impl TestContext { | |||
self | |||
} | |||
/// Add a filter that ignores temporary directory in path. | |||
pub fn with_filtered_temp_dir(mut self) -> Self { |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others.Learn more.
We should use this innew_with_versions
too
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others.Learn more.
You mean remove the existing temp dir filter fromnew_with_versions
and close the method with:
let context = Self { root: ChildPath::new(root.path()), temp_dir, cache_dir, python_dir, home_dir, bin_dir, venv, workspace_root, python_version, python_versions, filters, extra_env: vec![], _root: root, }; context.with_filtered_temp_dir()
?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others.Learn more.
I did mean that, but hm, that could break the ordering.
We might need to move all of the filters out into utilities like this so we can do so without changing our default ordering. I think it's fine to pursue separately — can you open an issue to track? No need to block this pull request on it.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others.Learn more.
Turns out this needs to be specialized for Windows. I've updated and renamed towith_filtered_windows_temp_dir()
2333349
to6517839
Compare86b07e2
tocfa07b7
Comparecf5b1bd
to0e2e7a7
CompareThis MR contains the following updates:| Package | Update | Change ||---|---|---|| [astral-sh/uv](https://github.com/astral-sh/uv) | patch | `0.6.0` -> `0.6.3` |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.6.3`](https://github.com/astral-sh/uv/blob/HEAD/CHANGELOG.md#063)[Compare Source](astral-sh/uv@0.6.2...0.6.3)##### Enhancements- Allow quotes around command-line options in `requirement.txt files` ([#​11644](astral-sh/uv#11644))- Initialize PEP 723 script in `uv lock --script` ([#​11717](astral-sh/uv#11717))##### Configuration- Accept multiple `.env` files in `UV_ENV_FILE` ([#​11665](astral-sh/uv#11665))##### Performance- Reduce overhead in converting resolutions ([#​11660](astral-sh/uv#11660))- Use `SmallString` on `Hashes` ([#​11756](astral-sh/uv#11756))- Use a `Box` for `Yanked` on `File` ([#​11755](astral-sh/uv#11755))- Use a `SmallString` for the `Yanked` enum ([#​11715](astral-sh/uv#11715))- Use boxed slices for hash vector ([#​11714](astral-sh/uv#11714))- Use install concurrency for bytecode compilation too ([#​11615](astral-sh/uv#11615))##### Bug fixes- Avoid installing duplicate dependencies across conflicting groups ([#​11653](astral-sh/uv#11653))- Check subdirectory existence after cache heal ([#​11719](astral-sh/uv#11719))- Include uppercase platforms for Windows wheels ([#​11681](astral-sh/uv#11681))- Respect existing PEP 723 script settings in `uv add` ([#​11716](astral-sh/uv#11716))- Reuse refined interpreter to create tool environment ([#​11680](astral-sh/uv#11680))- Skip removed directories during bytecode compilation ([#​11633](astral-sh/uv#11633))- Support conflict markers in `uv export` ([#​11643](astral-sh/uv#11643))- Treat lockfile as outdated if (empty) extras are added ([#​11702](astral-sh/uv#11702))- Display path separators as backslashes on Windows ([#​11667](astral-sh/uv#11667))- Display the built file name instead of the canonicalized name in `uv build` ([#​11593](astral-sh/uv#11593))- Fix message when there are no buildable packages ([#​11722](astral-sh/uv#11722))- Re-allow HTTP schemes for Git dependencies ([#​11687](astral-sh/uv#11687))##### Documentation- Add anchor links to arguments and options in the CLI reference ([#​11754](astral-sh/uv#11754))- Add link to environment marker specification ([#​11748](astral-sh/uv#11748))- Fix missing a closing bracket in the `cache-keys` setting ([#​11669](astral-sh/uv#11669))- Remove the last edited date from documentation pages ([#​11753](astral-sh/uv#11753))- Fix readme typo ([#​11742](astral-sh/uv#11742))### [`v0.6.2`](https://github.com/astral-sh/uv/blob/HEAD/CHANGELOG.md#062)[Compare Source](astral-sh/uv@0.6.1...0.6.2)##### Enhancements- Add support for constraining build dependencies with `tool.uv.build-constraint-dependencies` ([#​11585](astral-sh/uv#11585))- Sort dependency group keys when adding new group ([#​11591](astral-sh/uv#11591))##### Performance- Use an `Arc` for index URLs ([#​11586](astral-sh/uv#11586))##### Bug fixes- Allow use of x86-64 Python on ARM Windows ([#​11625](astral-sh/uv#11625))- Fix an issue where conflict markers could instigate a very large lock file ([#​11293](astral-sh/uv#11293))- Fix duplicate packages with multiple conflicting extras declared ([#​11513](astral-sh/uv#11513))- Respect color settings for log messages ([#​11604](astral-sh/uv#11604))- Eagerly reject unsupported Git schemes ([#​11514](astral-sh/uv#11514))##### Documentation- Add documentation for specifying Python versions in tool commands ([#​11598](astral-sh/uv#11598))### [`v0.6.1`](https://github.com/astral-sh/uv/blob/HEAD/CHANGELOG.md#061)[Compare Source](astral-sh/uv@0.6.0...0.6.1)##### Enhancements- Allow users to mark platforms as "required" for wheel coverage ([#​10067](astral-sh/uv#10067))- Warn for builds in non-build and workspace root pyproject.toml ([#​11394](astral-sh/uv#11394))##### Bug fixes- Add `--all` to `uvx --reinstall` message ([#​11535](astral-sh/uv#11535))- Fallback to `GET` on HTTP 400 when attempting to use range requests for wheel download ([#​11539](astral-sh/uv#11539))- Prefer local variants in preference selection ([#​11546](astral-sh/uv#11546))- Respect verbatim executable name in `uvx` ([#​11524](astral-sh/uv#11524))##### Documentation- Add documentation for required environments ([#​11542](astral-sh/uv#11542))- Note that `main.py` used to be `hello.py` ([#​11519](astral-sh/uv#11519))</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.--- - [ ] <!-- rebase-check -->If you want to rebase/retry this MR, check this box---This MR has been generated by [Renovate Bot](https://github.com/renovatebot/renovate).<!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiIzOS4xNzEuMiIsInVwZGF0ZWRJblZlciI6IjM5LjE3OS4wIiwidGFyZ2V0QnJhbmNoIjoibWFpbiIsImxhYmVscyI6WyJSZW5vdmF0ZSBCb3QiXX0=-->
Currently, `uv tool list --show-paths` will show backslashes as pathseparators for packages but not entrypoints. This PR changes this to beconsistent.Closesastral-sh#10426.
Currently,
uv tool list --show-paths
will show backslashes as path separators for packages but not entrypoints. This PR changes this to be consistent.Closes#10426.