diff --git a/crates/uv-settings/src/lib.rs b/crates/uv-settings/src/lib.rs index 64f160aa3..ed226b549 100644 --- a/crates/uv-settings/src/lib.rs +++ b/crates/uv-settings/src/lib.rs @@ -211,8 +211,8 @@ fn validate_uv_toml(path: &Path, options: &Options) -> Result<(), Error> { override_dependencies: _, constraint_dependencies: _, build_constraint_dependencies: _, - environments: _, - required_environments: _, + environments, + required_environments, conflicts, workspace, sources, @@ -265,6 +265,19 @@ fn validate_uv_toml(path: &Path, options: &Options) -> Result<(), Error> { "build-backend", )); } + if environments.is_some() { + return Err(Error::PyprojectOnlyField( + path.to_path_buf(), + "environments", + )); + } + + if required_environments.is_some() { + return Err(Error::PyprojectOnlyField( + path.to_path_buf(), + "required-environments", + )); + } Ok(()) } @@ -336,8 +349,8 @@ fn warn_uv_toml_masked_fields(options: &Options) { override_dependencies, constraint_dependencies, build_constraint_dependencies, - environments, - required_environments, + environments: _, + required_environments: _, conflicts: _, workspace: _, sources: _, @@ -504,12 +517,6 @@ fn warn_uv_toml_masked_fields(options: &Options) { if build_constraint_dependencies.is_some() { masked_fields.push("build-constraint-dependencies"); } - if environments.is_some() { - masked_fields.push("environments"); - } - if required_environments.is_some() { - masked_fields.push("required-environments"); - } if !masked_fields.is_empty() { let field_listing = masked_fields.join("\n- "); warn_user!( diff --git a/crates/uv/tests/it/pip_compile.rs b/crates/uv/tests/it/pip_compile.rs index 8874949c2..34af0ed08 100644 --- a/crates/uv/tests/it/pip_compile.rs +++ b/crates/uv/tests/it/pip_compile.rs @@ -14266,8 +14266,6 @@ matplotlib fn importlib_metadata_not_repeated() -> Result<()> { let context = TestContext::new("3.12"); - let uv_toml = context.temp_dir.child("uv.toml"); - uv_toml.write_str(r#"environments = ["python_version >= '3.10'", "python_version >= '3.8' and python_version < '3.10'", "python_version < '3.8'"]"#)?; let requirements_in = context.temp_dir.child("requirements.in"); requirements_in.write_str("build")?;