fix handling of comments generated from PEP725 matching

conda · Jan 5, 2024 · 5fef7b0 · 5fef7b0
1 parent 0f448b5
commit 5fef7b0
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 9 deletions.
diff --git a/grayskull/strategy/py_base.py b/grayskull/strategy/py_base.py
@@ -546,10 +546,12 @@ def clean_list_pkg(pkg, list_pkgs):
         return [p for p in list_pkgs if pkg != p.strip().split(" ", 1)[0]]
 
     for pkg in requirements["host"]:
-        pkg_name = RE_DEPS_NAME.match(pkg).group(0)
-        if pkg_name in PIN_PKG_COMPILER.keys():
-            requirements["run"] = clean_list_pkg(pkg_name, requirements["run"])
-            requirements["run"].append(PIN_PKG_COMPILER[pkg_name])
+        pkg_name_match = RE_DEPS_NAME.match(pkg)
+        if pkg_name_match:
+            pkg_name = pkg_name_match.group(0)
+            if pkg_name in PIN_PKG_COMPILER.keys():
+                requirements["run"] = clean_list_pkg(pkg_name, requirements["run"])
+                requirements["run"].append(PIN_PKG_COMPILER[pkg_name])
 
 
 def discover_license(metadata: dict) -> List[ShortLicense]:
@@ -826,7 +828,8 @@ def split_deps(deps: str) -> List[str]:
 def ensure_pep440(pkg: str) -> str:
     if not pkg:
         return pkg
-    if pkg.strip().startswith("<{") or pkg.strip().startswith("{{"):
+    pkg = pkg.strip()
+    if any([pkg.startswith(pattern) for pattern in ("#", "<{", "{{")]):
         return pkg
     split_pkg = pkg.strip().split(" ")
     if len(split_pkg) <= 1:

diff --git a/grayskull/strategy/py_toml.py b/grayskull/strategy/py_toml.py
@@ -256,10 +256,10 @@ def get_pep725_mapping(purl: str):
     # taken from
 
     package_mapping = {
-        "virtual:compiler/c": '{{ compiler("c") }}',
-        "virtual:compiler/cpp": '{{ compiler("cxx") }}',
-        "virtual:compiler/fortran": '{{ compiler("fortran") }}',
-        "virtual:compiler/rust": '{{ compiler("rust") }}',
+        "virtual:compiler/c": "{{ compiler('c') }}",
+        "virtual:compiler/cpp": "{{ compiler('cxx') }}",
+        "virtual:compiler/fortran": "{{ compiler('fortran') }}",
+        "virtual:compiler/rust": "{{ compiler('rust') }}",
         "virtual:interface/blas": "{{ blas }}",
     }
     return (