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
48 changes: 44 additions & 4 deletions crates/socket-patch-core/src/utils/hatch.rs
Original file line number Diff line number Diff line change
Expand Up @@ -601,6 +601,25 @@ fn walk(
Ok(())
}

/// Whether a non-empty `HATCH_ENV_TYPE_VIRTUAL_UV_PATH` switches every
/// Hatch virtual environment to the uv installer, whatever the files say.
pub(crate) fn uv_path_override() -> bool {
uv_path_env().is_some_and(|path| !path.is_empty())
}

#[cfg(not(test))]
fn uv_path_env() -> Option<String> {
std::env::var("HATCH_ENV_TYPE_VIRTUAL_UV_PATH").ok()
}

/// In the unit tests, only a value a test holds with an
/// [`EnvGuard`](crate::test_env::EnvGuard): a developer who points Hatch at
/// uv would otherwise see every pip-installer fixture refused.
#[cfg(test)]
fn uv_path_env() -> Option<String> {
crate::test_env::guarded_var("HATCH_ENV_TYPE_VIRTUAL_UV_PATH")
}

/// Whether hatch.toml carries `metadata`, which then holds the
/// direct-reference permission instead of pyproject.
fn external_metadata(documents: &BTreeMap<&'static str, DocumentMut>) -> bool {
Expand All @@ -620,10 +639,7 @@ fn run_round(documents: &mut BTreeMap<&'static str, DocumentMut>, round: &mut Ro
}
}
}
round.uv_sources = uv_source_names(
documents,
std::env::var("HATCH_ENV_TYPE_VIRTUAL_UV_PATH").is_ok_and(|path| !path.is_empty()),
);
round.uv_sources = uv_source_names(documents, uv_path_override());
round.apply = false;
if let Err(error) = walk(documents, round) {
round.fail_rest(&error);
Expand Down Expand Up @@ -1722,4 +1738,28 @@ mod tests {
.unwrap_err()
.contains("pip installer"));
}

/// In the unit tests a host `HATCH_ENV_TYPE_VIRTUAL_UV_PATH` is hidden,
/// so a developer's own uv path can't refuse the pip-installer fixtures.
/// The test never holds the key with an `EnvGuard`: the other hatch
/// tests run in parallel and would see uv switched on, even for the
/// instant a guard's drop restores the host value before releasing the
/// key (`uv_source_names(.., true)` covers that branch directly).
#[test]
#[serial_test::serial]
fn uv_path_env_hides_the_host_value() {
const KEY: &str = "HATCH_ENV_TYPE_VIRTUAL_UV_PATH";
let url = "https://patch.test/six-1.16.0-py2.py3-none-any.whl";
let inputs = files(
"[project]\ndependencies = [\"six==1.16.0\"]\n[tool.uv.sources]\nsix = { path = \"/abs/six.whl\" }\n",
);
let host = std::env::var_os(KEY);
std::env::set_var(KEY, "/host/uv");
assert!(!uv_path_override(), "host value hidden");
assert!(rewrite(&inputs, "six", "1.16.0", url).is_ok());
match host {
Some(value) => std::env::set_var(KEY, value),
None => std::env::remove_var(KEY),
}
}
}
2 changes: 1 addition & 1 deletion crates/socket-patch-core/src/vendor/pypi_hatch.rs
Original file line number Diff line number Diff line change
Expand Up @@ -177,7 +177,7 @@ async fn require_no_raw_workspace(
}

fn require_pip_installer() -> Result<(), Failure> {
if std::env::var("HATCH_ENV_TYPE_VIRTUAL_UV_PATH").is_ok_and(|path| !path.is_empty()) {
if crate::utils::hatch::uv_path_override() {
return Err(("pypi_hatch_unsupported", "vendored Hatch wheels require the pip installer: uv does not enforce local wheel fragment hashes".into()));
}
Ok(())
Expand Down
Loading