fix: stricter input parsing and more lenient parsing of run exports f…

…rom other packages (#1271)

README.md

@@ -216,12 +216,12 @@ requirements:
   host:
     - pip
     - poetry-core >=1.0.0
-    - python 3.10
+    - python 3.10.*
   run:
     # sync with normalized deps from poetry-generated setup.py
     - markdown-it-py >=2.2.0
     - pygments >=2.13.0,<3.0.0
-    - python 3.10
+    - python 3.10.*
     - typing_extensions >=4.0.0,<5.0.0
 
 tests:

docs/index.md

@@ -238,12 +238,12 @@ requirements:
   host:
     - pip
     - poetry-core >=1.0.0
-    - python 3.10
+    - python 3.10.*
   run:
     # sync with normalized deps from poetry-generated setup.py
     - markdown-it-py >=2.2.0
     - pygments >=2.13.0,<3.0.0
-    - python 3.10
+    - python 3.10.*
     - typing_extensions >=4.0.0,<5.0.0
 
 tests:

examples/rich/recipe.yaml

@@ -23,12 +23,12 @@ requirements:
   host:
     - pip
     - poetry-core >=1.0.0
-    - python 3.10
+    - python 3.10.*
   run:
     # sync with normalized deps from poetry-generated setup.py
     - markdown-it-py >=2.2.0
     - pygments >=2.13.0,<3.0.0
-    - python 3.10
+    - python 3.10.*
     - typing_extensions >=4.0.0,<5.0.0
 
 tests:

src/build.rs

@@ -3,7 +3,7 @@
 use std::{path::PathBuf, vec};
 
 use miette::{Context, IntoDiagnostic};
-use rattler_conda_types::{Channel, MatchSpec, ParseStrictness};
+use rattler_conda_types::{Channel, MatchSpec};
 
 use crate::{
     metadata::{build_reindexed_channels, Output},
@@ -39,10 +39,8 @@ pub async fn skip_existing(
 
     let match_specs = outputs
         .iter()
-        .map(|o| {
-            MatchSpec::from_str(o.name().as_normalized(), ParseStrictness::Strict).into_diagnostic()
-        })
-        .collect::<Result<Vec<_>, _>>()?;
+        .map(|o| o.name().clone().into())
+        .collect::<Vec<MatchSpec>>();
 
     let channels = if only_local {
         vec![

src/package_test/run_test.rs

@@ -510,9 +510,9 @@ impl PythonTest {
 
         // Add `pip` if pip_check is set to true
         if self.pip_check {
-            dependencies_map.iter_mut().for_each(|(_, v)| {
-                v.push(MatchSpec::from_str("pip", ParseStrictness::Strict).unwrap())
-            });
+            dependencies_map
+                .iter_mut()
+                .for_each(|(_, v)| v.push("pip".parse().unwrap()));
         }
 
         // Run tests for each python version
@@ -613,10 +613,7 @@ impl PerlTest {
             ParseStrictness::Lenient,
         )?;
 
-        let dependencies = vec![
-            MatchSpec::from_str("perl", ParseStrictness::Strict).unwrap(),
-            match_spec,
-        ];
+        let dependencies = vec!["perl".parse().unwrap(), match_spec];
 
         create_environment(
             "test",

src/recipe/parser/requirements.rs

@@ -366,6 +366,32 @@ impl TryConvertNode<MatchSpec> for RenderedNode {
 
 impl TryConvertNode<MatchSpec> for RenderedScalarNode {
     fn try_convert(&self, _name: &str) -> Result<MatchSpec, Vec<PartialParsingError>> {
+        let string = self.as_str();
+
+        // if we have a matchspec that is only numbers, and ., we complain and ask the user to add a
+        // `.*` or `==` in front of it.
+        let split_string = string.split_whitespace().collect::<Vec<_>>();
+        if split_string.len() >= 2 {
+            if split_string[1].chars().all(|c| c.is_numeric() || c == '.') {
+                let name = split_string[0];
+                let version = split_string[1];
+                let rest = split_string[2..].join(" ");
+                let rest = if rest.is_empty() {
+                    "".to_string()
+                } else {
+                    format!(" {}", rest)
+                };
+
+                return Err(vec![_partialerror!(
+                    *self.span(),
+                    ErrorKind::Other,
+                    label = format!(
+                        "This match spec is ambiguous. Do you mean `{name} =={version}{rest}` or `{name} {version}.*{rest}`?"
+                    )
+                )]);
+            }
+        }
+
         MatchSpec::from_str(self.as_str(), ParseStrictness::Strict).map_err(|err| {
             let str = self.as_str();
             vec![_partialerror!(

src/render/run_exports.rs

@@ -45,7 +45,8 @@ impl IgnoreRunExports {
         let to_specs = |strings: &Vec<String>| -> Result<Vec<MatchSpec>, ParseMatchSpecError> {
             strings
                 .iter()
-                .map(|s| MatchSpec::from_str(s, ParseStrictness::Strict))
+                // We have to parse these as lenient as they come from packages
+                .map(|s| MatchSpec::from_str(s, ParseStrictness::Lenient))
                 .filter_map(|result| match result {
                     Ok(spec) => {
                         if spec

test-data/recipes/package-content-tests/rich-recipe.yaml

@@ -21,12 +21,12 @@ requirements:
   host:
     - pip
     - poetry-core >=1.0.0
-    - python 3.10
+    - python 3.10.*
   run:
     # sync with normalized deps from poetry-generated setup.py
     - markdown-it-py >=2.2.0
     - pygments >=2.13.0,<3.0.0
-    - python 3.10
+    - python 3.10.*
     - typing_extensions >=4.0.0,<5.0.0
 
 tests:

test-data/recipes/race-condition/recipe-python-min.yaml

@@ -4,12 +4,10 @@ package:
 
 requirements:
   host:
-    - python ${{ python_min }}
     - python >=${{ python_min }}
     - python ${{ python_min }}.*
     - python ${{ python_min ~ ".*,<4.0a0" }}
   run:
-    - python ${{ python_min }}
     - python >=${{ python_min }}
     - python ${{ python_min }}.*
     - python ${{ python_min ~ ".*,<4.0a0" }}

test-data/recipes/rich/recipe.yaml

@@ -21,12 +21,12 @@ requirements:
   host:
     - pip
     - poetry-core >=1.0.0
-    - python 3.10
+    - python 3.10.*
   run:
     # sync with normalized deps from poetry-generated setup.py
     - markdown-it-py >=2.2.0
     - pygments >=2.13.0,<3.0.0
-    - python 3.10
+    - python 3.10.*
     - typing_extensions >=4.0.0,<5.0.0
 
 tests:

test-data/recipes/toml/recipe.yaml

@@ -18,9 +18,9 @@ build:
 
 requirements:
   host:
-    - python 3.12.1
-    - pip 23.3.2
-    - setuptools 68
+    - python 3.12.1.*
+    - pip 23.3.2.*
+    - setuptools 68.*
   run:
     - python
 

test/end-to-end/__snapshots__/test_simple/test_python_min_render.json

@@ -1,12 +1,10 @@
 {
   "host": [
-    "python ==3.8.0",
     "python >=3.8.0",
     "python 3.8.0.*",
     "python 3.8.0.*,<4.0a0"
   ],
   "run": [
-    "python ==3.8.0",
     "python >=3.8.0",
     "python 3.8.0.*",
     "python 3.8.0.*,<4.0a0"