Update tests

charliermarsh · charliermarsh · commit e8aeb1993f7c · 2024-03-15T20:37:26.000-04:00
diff --git a/crates/pep440-rs/src/lib.rs b/crates/pep440-rs/src/lib.rs
@@ -41,7 +41,10 @@ pub use {
         LocalSegment, Operator, OperatorParseError, PreRelease, PreReleaseKind, Version,
         VersionParseError, VersionPattern, VersionPatternParseError, MIN_VERSION,
     },
-    version_specifier::{VersionSpecifier, VersionSpecifiers, VersionSpecifiersParseError},
+    version_specifier::{
+        VersionSpecifier, VersionSpecifierBuildError, VersionSpecifiers,
+        VersionSpecifiersParseError,
+    },
 };
 
 mod version;
diff --git a/crates/pep440-rs/src/version_specifier.rs b/crates/pep440-rs/src/version_specifier.rs
@@ -340,15 +340,6 @@ impl Serialize for VersionSpecifier {
 }
 
 impl VersionSpecifier {
-    /// Create a new version specifier from an operator and a version.
-    ///
-    /// Warning: This function is not recommended for general use. It is intended for use in
-    /// situations where the operator and version are known to be valid. For general use, prefer
-    /// [`VersionSpecifier::from_pattern`].
-    pub fn new(operator: Operator, version: Version) -> Self {
-        Self { operator, version }
-    }
-
     /// Build from parts, validating that the operator is allowed with that version. The last
     /// parameter indicates a trailing `.*`, to differentiate between `1.1.*` and `1.1`
     pub fn from_pattern(
@@ -357,10 +348,6 @@ impl VersionSpecifier {
     ) -> Result<Self, VersionSpecifierBuildError> {
         let star = version_pattern.is_wildcard();
         let version = version_pattern.into_version();
-        // "Local version identifiers are NOT permitted in this version specifier."
-        if version.is_local() && !operator.is_local_compatible() {
-            return Err(BuildErrorKind::OperatorLocalCombo { operator, version }.into());
-        }
 
         // Check if there are star versions and if so, switch operator to star version
         let operator = if star {
@@ -374,6 +361,19 @@ impl VersionSpecifier {
             operator
         };
 
+        Self::from_version(operator, version)
+    }
+
+    /// Create a new version specifier from an operator and a version.
+    pub fn from_version(
+        operator: Operator,
+        version: Version,
+    ) -> Result<Self, VersionSpecifierBuildError> {
+        // "Local version identifiers are NOT permitted in this version specifier."
+        if version.is_local() && !operator.is_local_compatible() {
+            return Err(BuildErrorKind::OperatorLocalCombo { operator, version }.into());
+        }
+
         if operator == Operator::TildeEqual && version.release().len() < 2 {
             return Err(BuildErrorKind::CompatibleRelease.into());
         }
diff --git a/crates/uv-resolver/src/error.rs b/crates/uv-resolver/src/error.rs
@@ -84,6 +84,9 @@ pub enum ResolveError {
         version: Box<Version>,
     },
 
+    #[error("Attempted to construct an invalid version specifier")]
+    InvalidVersion(#[from] pep440_rs::VersionSpecifierBuildError),
+
     /// Something unexpected happened.
     #[error("{0}")]
     Failure(String),
diff --git a/crates/uv-resolver/src/pubgrub/dependencies.rs b/crates/uv-resolver/src/pubgrub/dependencies.rs
@@ -146,8 +146,11 @@ fn to_pubgrub(
             let version = if let Some(expected) = locals.get(&requirement.name) {
                 specifiers
                     .iter()
-                    .map(|specifier| Locals::map(expected, specifier))
-                    .map(|specifier| PubGrubSpecifier::try_from(&specifier))
+                    .map(|specifier| {
+                        Locals::map(expected, specifier)
+                            .map_err(ResolveError::InvalidVersion)
+                            .and_then(|specifier| PubGrubSpecifier::try_from(&specifier))
+                    })
                     .fold_ok(Range::full(), |range, specifier| {
                         range.intersection(&specifier.into())
                     })?
diff --git a/crates/uv-resolver/src/resolver/locals.rs b/crates/uv-resolver/src/resolver/locals.rs
@@ -1,6 +1,6 @@
 use rustc_hash::FxHashMap;
 
-use pep440_rs::{Operator, Version, VersionSpecifier};
+use pep440_rs::{Operator, Version, VersionSpecifier, VersionSpecifierBuildError};
 use pep508_rs::{MarkerEnvironment, VersionOrUrl};
 use uv_normalize::PackageName;
 
@@ -63,63 +63,71 @@ impl Locals {
 
     /// Given a specifier that may include the version _without_ a local segment, return a specifier
     /// that includes the local segment from the expected version.
-    pub(crate) fn map(local: &Version, specifier: &VersionSpecifier) -> VersionSpecifier {
+    pub(crate) fn map(
+        local: &Version,
+        specifier: &VersionSpecifier,
+    ) -> Result<VersionSpecifier, VersionSpecifierBuildError> {
         match specifier.operator() {
             Operator::Equal | Operator::EqualStar => {
                 // Given `foo==1.0.0`, if the local version is `1.0.0+local`, map to
-                // `foo==1.0.0+local`. This has the intended effect of allowing `1.0.0+local`.
+                // `foo==1.0.0+local`.
+                //
+                // This has the intended effect of allowing `1.0.0+local`.
                 if is_compatible(local, specifier.version()) {
-                    VersionSpecifier::new(Operator::Equal, local.clone())
+                    VersionSpecifier::from_version(Operator::Equal, local.clone())
                 } else {
-                    specifier.clone()
+                    Ok(specifier.clone())
                 }
             }
             Operator::NotEqual | Operator::NotEqualStar => {
                 // Given `foo!=1.0.0`, if the local version is `1.0.0+local`, map to
-                // `foo!=1.0.0+local`. This has the intended effect of disallowing `1.0.0+local`.
-                // There's no risk of including `foo @ 1.0.0` in the resolution, since we _know_
-                // `foo @ 1.0.0+local` is required and would conflict.
+                // `foo!=1.0.0+local`.
+                //
+                // This has the intended effect of disallowing `1.0.0+local`.
+                //
+                // There's no risk of accidentally including `foo @ 1.0.0` in the resolution, since
+                // we _know_ `foo @ 1.0.0+local` is required and would therefore conflict.
                 if is_compatible(local, specifier.version()) {
-                    VersionSpecifier::new(Operator::NotEqual, local.clone())
+                    VersionSpecifier::from_version(Operator::NotEqual, local.clone())
                 } else {
-                    specifier.clone()
+                    Ok(specifier.clone())
                 }
             }
             Operator::LessThanEqual => {
                 // Given `foo<=1.0.0`, if the local version is `1.0.0+local`, map to
-                // `foo<=1.0.0+local`. This has the intended effect of allowing `1.0.0+local`.
-                // There's no risk of including `foo @ 1.0.0.post1` in the resolution, since we
-                // _know_ `foo @ 1.0.0+local` is required and would conflict.
+                // `foo==1.0.0+local`.
+                //
+                // This has the intended effect of allowing `1.0.0+local`.
+                //
+                // Since `foo==1.0.0+local` is already required, we know that to satisfy
+                // `foo<=1.0.0`, we _must_ satisfy `foo==1.0.0+local`. We _could_ map to
+                // `foo<=1.0.0+local`, but local versions are _not_ allowed in exclusive ordered
+                // specifiers, so introducing `foo<=1.0.0+local` would risk breaking invariants.
                 if is_compatible(local, specifier.version()) {
-                    VersionSpecifier::new(Operator::LessThanEqual, local.clone())
+                    VersionSpecifier::from_version(Operator::Equal, local.clone())
                 } else {
-                    specifier.clone()
+                    Ok(specifier.clone())
                 }
             }
             Operator::GreaterThan => {
-                // Given `foo>1.0.0`, if the local version is `1.0.0+local`, map to
-                // `foo>1.0.0+local`. This has the intended effect of disallowing `1.0.0+local`.
-                if is_compatible(local, specifier.version()) {
-                    VersionSpecifier::new(Operator::GreaterThan, local.clone())
-                } else {
-                    specifier.clone()
-                }
+                // Given `foo>1.0.0`, `foo @ 1.0.0+local` is already (correctly) disallowed.
+                Ok(specifier.clone())
             }
             Operator::ExactEqual => {
-                // Given `foo===1.0.0`, `1.0.0+local` is already disallowed.
-                specifier.clone()
+                // Given `foo===1.0.0`, `1.0.0+local` is already (correctly) disallowed.
+                Ok(specifier.clone())
             }
             Operator::TildeEqual => {
-                // Given `foo~=1.0.0`, `foo~=1.0.0+local` is already allowed.
-                specifier.clone()
+                // Given `foo~=1.0.0`, `foo~=1.0.0+local` is already (correctly) allowed.
+                Ok(specifier.clone())
             }
             Operator::LessThan => {
-                // Given `foo<1.0.0`, `1.0.0+local` is already disallowed.
-                specifier.clone()
+                // Given `foo<1.0.0`, `1.0.0+local` is already (correctly) disallowed.
+                Ok(specifier.clone())
             }
             Operator::GreaterThanEqual => {
-                // Given `foo>=1.0.0`, `foo>1.0.0+local` is already allowed.
-                specifier.clone()
+                // Given `foo>=1.0.0`, `foo @ 1.0.0+local` is already (correctly) allowed.
+                Ok(specifier.clone())
             }
         }
     }
diff --git a/crates/uv/tests/pip_compile.rs b/crates/uv/tests/pip_compile.rs
@@ -1501,22 +1501,11 @@ fn disallowed_transitive_url_dependency() -> Result<()> {
         .arg("requirements.in")
         .env("HATCHLING", hatchling_path.as_os_str()), @r###"
     success: false
-    exit_code: 1
+    exit_code: 2
     ----- stdout -----
 
     ----- stderr -----
-      × No solution found when resolving dependencies:
-      ╰─▶ Because only hatchling-editable==0.1.0 is available and
-          hatchling-editable==0.1.0 is unusable because its dependencies are
-          unusable because package `iniconfig` attempted to resolve via URL:
-          git+https://github.com/pytest-dev/iniconfig@9cae43103df70bac6fde7b9f35ad11a9f1be0cb4.
-          URL dependencies must be expressed as direct
-          requirements or constraints. Consider adding `iniconfig @
-          git+https://github.com/pytest-dev/iniconfig@9cae43103df70bac6fde7b9f35ad11a9f1be0cb4`
-          to your dependencies or constraints file., we can conclude that all
-          versions of hatchling-editable cannot be used.
-          And because you require hatchling-editable, we can conclude that the
-          requirements are unsatisfiable.
+    error: Package `iniconfig` attempted to resolve via URL: git+https://github.com/pytest-dev/iniconfig@9cae43103df70bac6fde7b9f35ad11a9f1be0cb4. URL dependencies must be expressed as direct requirements or constraints. Consider adding `iniconfig @ git+https://github.com/pytest-dev/iniconfig@9cae43103df70bac6fde7b9f35ad11a9f1be0cb4` to your dependencies or constraints file.
     "###
     );
 
diff --git a/crates/uv/tests/pip_compile_scenarios.rs b/crates/uv/tests/pip_compile_scenarios.rs
@@ -75,8 +75,18 @@ fn incompatible_python_compatible_override() -> Result<()> {
 
     let output = uv_snapshot!(filters, command(&context, python_versions)
         .arg("--python-version=3.11")
-        , @r###"<snapshot>
-    "###
+        , @r###"
+                 success: true
+                 exit_code: 0
+                 ----- stdout -----
+                 # This file was autogenerated by uv via the following command:
+                 #    uv pip compile requirements.in --cache-dir [CACHE_DIR] --python-version=3.11
+                 package-a==1.0.0
+
+                 ----- stderr -----
+                 warning: The requested Python version 3.11 is not available; 3.9.18 will be used to build dependencies instead.
+                 Resolved 1 package in [TIME]
+                 "###
     );
 
     output.assert().success().stdout(predicate::str::contains(
@@ -114,8 +124,17 @@ fn compatible_python_incompatible_override() -> Result<()> {
 
     let output = uv_snapshot!(filters, command(&context, python_versions)
         .arg("--python-version=3.9")
-        , @r###"<snapshot>
-    "###
+        , @r###"
+                 success: false
+                 exit_code: 1
+                 ----- stdout -----
+
+                 ----- stderr -----
+                 warning: The requested Python version 3.9 is not available; 3.11.7 will be used to build dependencies instead.
+                   × No solution found when resolving dependencies:
+                   ╰─▶ Because the requested Python version (3.9) does not satisfy Python>=3.10 and package-a==1.0.0 depends on Python>=3.10, we can conclude that package-a==1.0.0 cannot be used.
+                       And because you require package-a==1.0.0, we can conclude that the requirements are unsatisfiable.
+                 "###
     );
 
     output.assert().failure();
@@ -159,8 +178,17 @@ fn incompatible_python_compatible_override_unavailable_no_wheels() -> Result<()>
     // dependencies.
     let output = uv_snapshot!(filters, command(&context, python_versions)
         .arg("--python-version=3.11")
-        , @r###"<snapshot>
-    "###
+        , @r###"
+                 success: false
+                 exit_code: 1
+                 ----- stdout -----
+
+                 ----- stderr -----
+                 warning: The requested Python version 3.11 is not available; 3.9.18 will be used to build dependencies instead.
+                   × No solution found when resolving dependencies:
+                   ╰─▶ Because the current Python version (3.9.18) does not satisfy Python>=3.10 and package-a==1.0.0 depends on Python>=3.10, we can conclude that package-a==1.0.0 cannot be used.
+                       And because you require package-a==1.0.0, we can conclude that the requirements are unsatisfiable.
+                 "###
     );
 
     output.assert().failure();
@@ -205,8 +233,17 @@ fn incompatible_python_compatible_override_available_no_wheels() -> Result<()> {
     // used to build the source distributions.
     let output = uv_snapshot!(filters, command(&context, python_versions)
         .arg("--python-version=3.11")
-        , @r###"<snapshot>
-    "###
+        , @r###"
+                 success: true
+                 exit_code: 0
+                 ----- stdout -----
+                 # This file was autogenerated by uv via the following command:
+                 #    uv pip compile requirements.in --cache-dir [CACHE_DIR] --python-version=3.11
+                 package-a==1.0.0
+
+                 ----- stderr -----
+                 Resolved 1 package in [TIME]
+                 "###
     );
 
     output.assert().success().stdout(predicate::str::contains(
@@ -252,8 +289,17 @@ fn incompatible_python_compatible_override_no_compatible_wheels() -> Result<()>
     // determine its dependencies.
     let output = uv_snapshot!(filters, command(&context, python_versions)
         .arg("--python-version=3.11")
-        , @r###"<snapshot>
-    "###
+        , @r###"
+                 success: false
+                 exit_code: 1
+                 ----- stdout -----
+
+                 ----- stderr -----
+                 warning: The requested Python version 3.11 is not available; 3.9.18 will be used to build dependencies instead.
+                   × No solution found when resolving dependencies:
+                   ╰─▶ Because the current Python version (3.9.18) does not satisfy Python>=3.10 and package-a==1.0.0 depends on Python>=3.10, we can conclude that package-a==1.0.0 cannot be used.
+                       And because you require package-a==1.0.0, we can conclude that the requirements are unsatisfiable.
+                 "###
     );
 
     output.assert().failure();
@@ -301,8 +347,24 @@ fn incompatible_python_compatible_override_other_wheel() -> Result<()> {
     // available, but is not compatible with the target version and cannot be used.
     let output = uv_snapshot!(filters, command(&context, python_versions)
         .arg("--python-version=3.11")
-        , @r###"<snapshot>
-    "###
+        , @r###"
+                 success: false
+                 exit_code: 1
+                 ----- stdout -----
+
+                 ----- stderr -----
+                 warning: The requested Python version 3.11 is not available; 3.9.18 will be used to build dependencies instead.
+                   × No solution found when resolving dependencies:
+                   ╰─▶ Because the current Python version (3.9.18) does not satisfy Python>=3.10 and package-a==1.0.0 depends on Python>=3.10, we can conclude that package-a==1.0.0 cannot be used.
+                       And because only the following versions of package-a are available:
+                           package-a==1.0.0
+                           package-a==2.0.0
+                       we can conclude that package-a<2.0.0 cannot be used. (1)
+
+                       Because the requested Python version (3.11) does not satisfy Python>=3.12 and package-a==2.0.0 depends on Python>=3.12, we can conclude that package-a==2.0.0 cannot be used.
+                       And because we know from (1) that package-a<2.0.0 cannot be used, we can conclude that all versions of package-a cannot be used.
+                       And because you require package-a, we can conclude that the requirements are unsatisfiable.
+                 "###
     );
 
     output.assert().failure();
@@ -340,8 +402,16 @@ fn python_patch_override_no_patch() -> Result<()> {
     // requirement is treated as 3.8.0.
     let output = uv_snapshot!(filters, command(&context, python_versions)
         .arg("--python-version=3.8")
-        , @r###"<snapshot>
-    "###
+        , @r###"
+                 success: false
+                 exit_code: 1
+                 ----- stdout -----
+
+                 ----- stderr -----
+                   × No solution found when resolving dependencies:
+                   ╰─▶ Because the requested Python version (3.8) does not satisfy Python>=3.8.4 and package-a==1.0.0 depends on Python>=3.8.4, we can conclude that package-a==1.0.0 cannot be used.
+                       And because you require package-a==1.0.0, we can conclude that the requirements are unsatisfiable.
+                 "###
     );
 
     output.assert().failure();
@@ -377,8 +447,18 @@ fn python_patch_override_patch_compatible() -> Result<()> {
 
     let output = uv_snapshot!(filters, command(&context, python_versions)
         .arg("--python-version=3.8.0")
-        , @r###"<snapshot>
-    "###
+        , @r###"
+                 success: true
+                 exit_code: 0
+                 ----- stdout -----
+                 # This file was autogenerated by uv via the following command:
+                 #    uv pip compile requirements.in --cache-dir [CACHE_DIR] --python-version=3.8.0
+                 package-a==1.0.0
+
+                 ----- stderr -----
+                 warning: The requested Python version 3.8.0 is not available; 3.8.18 will be used to build dependencies instead.
+                 Resolved 1 package in [TIME]
+                 "###
     );
 
     output.assert().success().stdout(predicate::str::contains(
diff --git a/crates/uv/tests/pip_install_scenarios.rs b/crates/uv/tests/pip_install_scenarios.rs
