Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 1 addition & 5 deletions crates/uv-virtualenv/src/virtualenv.rs
Original file line number Diff line number Diff line change
Expand Up @@ -528,11 +528,7 @@ pub(crate) fn create(
("uv".to_string(), version().to_string()),
(
"version_info".to_string(),
if using_minor_version_link {
interpreter.python_minor_version().to_string()
} else {
interpreter.markers().python_full_version().string.clone()
},
interpreter.markers().python_full_version().string.clone(),
),
(
"include-system-site-packages".to_string(),
Expand Down
84 changes: 1 addition & 83 deletions crates/uv/tests/python/python_upgrade.rs
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ use anyhow::Result;
use assert_cmd::assert::OutputAssertExt;
use assert_fs::fixture::{FileTouch, FileWriteStr};
use assert_fs::prelude::PathChild;
use insta::assert_snapshot;
use uv_python::managed::platform_key_from_env;
use uv_static::EnvVars;
use uv_test::{LATEST_PYTHON_3_12, uv_snapshot};
Expand Down Expand Up @@ -840,73 +839,6 @@ fn python_upgrade_build_version() {
");
}

// A project environment should survive a transparent Python patch upgrade.
#[test]
fn python_sync_transparent_patch_upgrade_reuses_environment() -> Result<()> {
let context = uv_test::test_context_with_versions!(&[])
.with_python_download_cache()
.with_filtered_python_keys()
.with_filtered_exe_suffix()
.with_managed_python_dirs()
.with_filtered_latest_python_versions()
.with_pyvenv_cfg_filters();

context.temp_dir.child("pyproject.toml").write_str(
r#"
[project]
name = "project"
version = "0.1.0"
requires-python = ">=3.10"
"#,
)?;

context.python_install().arg("3.10.17").assert().success();
context
.sync()
.arg("--python")
.arg("3.10")
.assert()
.success();

// The minor-only `version_info` allows compatibility checks to accept a newer patch.
let pyvenv_cfg = fs_err::read_to_string(context.venv.child("pyvenv.cfg"))?;
insta::with_settings!({ filters => context.filters() }, {
assert_snapshot!(pyvenv_cfg, @r"
home = [PYTHON_HOME]
implementation = CPython
uv = [UV_VERSION]
version_info = 3.10
include-system-site-packages = false
prompt = project
");
});

context.python_upgrade().arg("3.10").assert().success();

// The sync should not report removing or creating the environment.
uv_snapshot!(context.filters(), context.sync().arg("--python").arg("3.10"), @r"
success: true
exit_code: 0
----- stdout -----

----- stderr -----
Resolved 1 package in [TIME]
Checked in [TIME]
");

// The reused environment should run the upgraded Python patch.
uv_snapshot!(context.filters(), context.python_command().arg("--version"), @r"
success: true
exit_code: 0
----- stdout -----
Python 3.10.[LATEST]

----- stderr -----
");

Ok(())
}

// Regression test for <https://github.com/astral-sh/uv/issues/19100>.
//
// A virtual environment created by `uv sync` should pin to a patch version
Expand All @@ -920,8 +852,7 @@ fn python_sync_honors_pinned_patch_version() -> Result<()> {
.with_filtered_python_keys()
.with_filtered_exe_suffix()
.with_managed_python_dirs()
.with_filtered_latest_python_versions()
.with_pyvenv_cfg_filters();
.with_filtered_latest_python_versions();

let pyproject_toml = context.temp_dir.child("pyproject.toml");
pyproject_toml.write_str(
Expand Down Expand Up @@ -967,19 +898,6 @@ fn python_sync_honors_pinned_patch_version() -> Result<()> {
Checked in [TIME]
");

// An exact-patch environment must retain the patch in `version_info`.
let pyvenv_cfg = fs_err::read_to_string(context.venv.child("pyvenv.cfg"))?;
insta::with_settings!({ filters => context.filters() }, {
assert_snapshot!(pyvenv_cfg, @r"
home = [PYTHON_HOME]
implementation = CPython
uv = [UV_VERSION]
version_info = 3.10.17
include-system-site-packages = false
prompt = project
");
});

// Install a newer patch version, which moves the mutable `cpython-3.10`
// minor-version link to the newer release.
uv_snapshot!(context.filters(), context.python_upgrade().arg("3.10"), @r"
Expand Down
Loading