Proposed fix for #474: enables parsing of requirements.txt during locking

conda_lock/src_parser/environment_yaml.py

@@ -1,18 +1,15 @@
 import pathlib
 import re
-import sys
-
+import tempfile
 from typing import List, Tuple
 
 import yaml
 
 from conda_lock.models.lock_spec import Dependency, LockSpecification
 from conda_lock.src_parser.conda_common import conda_spec_to_versioned_dep
+from conda_lock.src_parser.requirements_txt import parse_requirements_txt, parse_one_requirement
 from conda_lock.src_parser.selectors import filter_platform_selectors
 
-from .pyproject_toml import parse_python_requirement
-
-
 _whitespace = re.compile(r"\s+")
 _conda_package_pattern = re.compile(r"^(?P<name>[A-Za-z0-9_-]+)\s?(?P<version>.*)?$")
 
@@ -29,6 +26,7 @@ def _parse_environment_file_for_platform(
     content: str,
     category: str,
     platform: str,
+    source_path: pathlib.Path,
 ) -> List[Dependency]:
     """
     Parse dependencies from a conda environment specification for an
@@ -55,28 +53,18 @@ def _parse_environment_file_for_platform(
 
     for mapping_spec in mapping_specs:
         if "pip" in mapping_spec:
-            for spec in mapping_spec["pip"]:
-                if re.match(r"^-e .*$", spec):
-                    print(
-                        (
-                            f"Warning: editable pip dep '{spec}' will not be included in the lock file. "
-                            "You will need to install it separately."
-                        ),
-                        file=sys.stderr,
-                    )
-                    continue
-
-                dependencies.append(
-                    parse_python_requirement(
-                        spec,
-                        manager="pip",
-                        category=category,
-                        normalize_name=False,
-                    )
-                )
+            # Generate the temporary requirements file
+            yaml_dir = source_path.parent
+            with tempfile.NamedTemporaryFile(dir=yaml_dir, suffix="requirements.txt", mode='w', encoding='utf-8') as requirements:
+                requirements.writelines(mapping_spec["pip"])
+                requirements.write("\n")  # Trailing newline
+                requirements.file.close()
+
+                dependencies.extend(parse_requirements_txt(requirements.name, category))
 
             # ensure pip is in target env
-            dependencies.append(parse_python_requirement("pip", manager="conda"))
+            if 'pip' not in {d.name for d in dependencies}:
+                dependencies.append(parse_one_requirement("pip", category))
 
     return dependencies
 
@@ -125,7 +113,7 @@ def parse_environment_file(
 
     # Parse with selectors for each target platform
     dep_map = {
-        platform: _parse_environment_file_for_platform(content, category, platform)
+        platform: _parse_environment_file_for_platform(content, category, platform, environment_file)
         for platform in platforms
     }
 

conda_lock/src_parser/requirements_txt.py

@@ -0,0 +1,48 @@
+"""
+Parses pip requirements from a requirements file
+"""
+from packaging._parser import parse_requirement
+from pip._internal.network.session import PipSession
+from pip._internal.req.req_file import parse_requirements
+
+from conda_lock.models.lock_spec import VersionedDependency, VCSDependency, URLDependency, Dependency
+from conda_lock.src_parser.pyproject_toml import unpack_git_url
+
+
+def parse_requirements_txt(file_path, category=None) -> Dependency:
+    session = PipSession()
+    for req in filter(None, parse_requirements(file_path, session)):
+        yield parse_one_requirement(req.requirement, category=category)
+
+
+def parse_one_requirement(req_string: str, category=None) -> Dependency:
+    parsed_req = parse_requirement(req_string)
+
+    if parsed_req.url and parsed_req.url.startswith("git+"):
+        url, rev = unpack_git_url(parsed_req.url)
+        return VCSDependency(
+            name=parsed_req.name,
+            source=url,
+            manager='pip',
+            vcs="git",
+            rev=rev,
+        )
+    elif parsed_req.url:  # type: ignore[attr-defined]
+        assert parsed_req.specifier in {"", "*", None}
+        url, frag = urldefrag(parsed_req.url)  # type: ignore[attr-defined]
+        return URLDependency(
+            name=parsed_req.name,
+            manager='pip',
+            category=category,
+            extras=parsed_req.extras,
+            url=url,
+            hashes=[frag.replace("=", ":")],
+        )
+    else:
+        return VersionedDependency(
+            name=parsed_req.name,
+            version=parsed_req.specifier or "*",
+            manager='pip',
+            category=category,
+            extras=parsed_req.extras,
+        )

pyproject.toml

@@ -36,6 +36,7 @@ dependencies = [
     "pyyaml >= 5.1",
     'tomli; python_version<"3.11"',
     "typing-extensions",
+    "pip",
     # conda dependencies
     "ruamel.yaml",
     "toolz >=0.12.0,<1.0.0",