Movatterモバイル変換

crates/uv/tests/it/common/mod.rs OutdatedShow resolvedHide resolved

zanieb reviewed

crates/uv/tests/it/python_pin.rs OutdatedShow resolvedHide resolved

zanieb reviewed

crates/uv/tests/it/python_pin.rs OutdatedShow resolvedHide resolved

zanieb reviewed

crates/uv/tests/it/python_pin.rs OutdatedShow resolvedHide resolved

zanieb reviewed

crates/uv/tests/it/tool_install.rs OutdatedShow resolvedHide resolved

zanieb reviewed

crates/uv/tests/it/tool_install.rs OutdatedShow resolvedHide resolved

zanieb reviewed

crates/uv/tests/it/tool_install.rs Outdated

Comment on lines 245 to 260

		insta::with_settings!({
		filters => context.filters(),
		}, {
		// We should have a tool receipt
		assert_snapshot!(fs_err::read_to_string(tool_dir.join("black").join("uv-receipt.toml")).unwrap(), @r###"
		[tool]
		requirements = [{ name = "black" }]
		entrypoints = [
		{ name = "black", install-path = "[TEMP_DIR]/bin/black" },
		{ name = "blackd", install-path = "[TEMP_DIR]/bin/blackd" },
		]

		[tool.options]
		exclude-newer = "2024-03-25T00:00:00Z"
		"###);
		});

Copy link

Member

zaniebMar 11, 2025

Choose a reason for hiding this comment

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

We don't capture the Python version in the receipt. This is actually relevant. What happens if the global Python version changes then you reinstall or upgrade? Test coverage for that would good. I think it's fine to respect the changed global default, personally.

Copy link

ContributorAuthor

jtfmummMar 12, 2025

Choose a reason for hiding this comment

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

I have a FIXME with some commented out new test code in this test for the reinstall case. This test code fails: currently uv doesn't respect the global on reinstall (and just uses the version originally used). Do we want this functionality for this PR?

Copy link

Member

zaniebMar 12, 2025•
edited
Loading

Choose a reason for hiding this comment

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

Ah okay, thanks for clarifying.

I would expect

If I requested a version explicitly, e.g.,uv tool install --python <version> I'd expect it to be recorded in the receipt and reused on reinstall
If I did not, I would expect the version to change on reinstall if the global default changed

However, I don't feel strongly about the latter point and if it's an entirely different model than what we're doing today then let's just leave it as-is and consider it separately (I'd open an issue to track it).

Either way, test coverage seems great.

zanieb reviewed

crates/uv-python/src/version_files.rsShow resolvedHide resolved

zanieb reviewed

crates/uv-cli/src/lib.rs OutdatedShow resolvedHide resolved

zanieb reviewed

crates/uv-python/src/version_files.rs

		return Ok(None);
		// Not found in directory or its ancestors. Looking in user-level config.
		return Ok(match user_uv_config_dir() {
		Some(user_dir) => Self::discover_user_config(user_dir, options)

Copy link

Member

zaniebMar 11, 2025•
edited
Loading

Choose a reason for hiding this comment

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

I wonder if we should co-locate this with theuv.toml? Like, if

uv/crates/uv-dirs/src/lib.rs

Line 140 inba74b9e

pubfnsystem_config_file() ->Option<PathBuf>{

exists and a user-level config does not should we prefer that? I'm leaning away from it right now, but wanted to put the idea out there. Maybe can can consider a--system flag separately in the future once we have more feedback.

Copy link

ContributorAuthor

jtfmummMar 12, 2025

Choose a reason for hiding this comment

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

That's an interesting question. But I agree we should consider it separately from this PR.

Copy link

Collaborator

samypr100 commentedMar 12, 2025•
edited
Loading

These changes add support for
uv python pin 3.12 --global
This adds the specified version to a.python-version file in the user-level config directory. uv will now use the user-level version as a fallback if no version is found in the project directory or its ancestors.
Open question: is--global the correct parameter here?--user is more precise, but might not communicate the intent as clearly.
TODO: User documentation.
Closes#4972

I do lean towards--global. For example, git uses--global,--local, and--system.

jtfmumm temporarily deployed to release

March 12, 2025 11:04

— with

GitHub Actions Inactive

jtfmumm temporarily deployed to release

March 12, 2025 11:04

— with

GitHub Actions Inactive

jtfmumm temporarily deployed to release

March 12, 2025 11:06

— with

GitHub Actions Inactive

jtfmumm temporarily deployed to release

March 12, 2025 11:06

— with

GitHub Actions Inactive

jtfmumm temporarily deployed to release

March 12, 2025 11:12

— with

GitHub Actions Inactive

jtfmumm temporarily deployed to release

March 12, 2025 11:12

— with

GitHub Actions Inactive

jtfmumm temporarily deployed to release

March 12, 2025 11:31

— with

GitHub Actions Inactive

jtfmumm temporarily deployed to release

March 12, 2025 11:31

— with

GitHub Actions Inactive

jtfmumm temporarily deployed to release

March 12, 2025 13:44

— with

GitHub Actions Inactive

jtfmumm temporarily deployed to release

March 12, 2025 13:45

— with

GitHub Actions Inactive

jtfmumm temporarily deployed to release

March 12, 2025 13:49

— with

GitHub Actions Inactive

jtfmumm temporarily deployed to release

March 12, 2025 13:49

— with

GitHub Actions Inactive

jtfmumm temporarily deployed to release

March 12, 2025 13:50

— with

GitHub Actions Inactive

jtfmumm temporarily deployed to release

March 12, 2025 13:50

— with

GitHub Actions Inactive

zanieb reviewed

crates/uv-cli/src/lib.rs OutdatedShow resolvedHide resolved

zanieb reviewed

crates/uv-cli/src/lib.rs OutdatedShow resolvedHide resolved

zanieb reviewed

crates/uv-cli/src/lib.rs OutdatedShow resolvedHide resolved

zanieb reviewed

crates/uv/tests/it/common/mod.rs OutdatedShow resolvedHide resolved

zanieb reviewed

crates/uv-static/src/env_vars.rsShow resolvedHide resolved

zanieb reviewed

crates/uv/tests/it/python_pin.rs OutdatedShow resolvedHide resolved

zanieb reviewed

crates/uv/tests/it/python_pin.rs OutdatedShow resolvedHide resolved

zanieb reviewed

crates/uv/tests/it/python_pin.rs

		}

		#[test]
		fn python_pin_global_use_local_if_available() -> Result<()> {

Copy link

Member

zaniebMar 12, 2025

Choose a reason for hiding this comment

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

I'd still just recommend combining this test with the one above and calling itpython_pin_global since we tend to discuss the specific behavior we are testing in a comment above each invocation. This isn't blocking feedback though

zanieb approved these changes