Merge pull request #837 from lesteve/handle-python-release-candidates

Handle Python release candidates in PyPI solver

Author: maresb

conda_lock/pypi_solver.py

@@ -108,7 +108,16 @@ def __init__(
         if python_version is None:
             self._python_version = None
         else:
-            self._python_version = tuple(map(int, python_version.split(".")))
+            # Handle non released Python versions e.g. release candidates
+            version_match = re.match(r"(\d+)\.(\d+)\.?(\d+)?", python_version)
+            if version_match:
+                self._python_version = tuple(
+                    int(each) for each in version_match.groups() if each is not None
+                )
+            else:
+                raise ValueError(
+                    f"{python_version=} does not look like a valid Python version"
+                )
 
         if system == "osx":
             self._sys_platform = "darwin"

tests/test_conda_lock.py

@@ -3577,3 +3577,25 @@ def test_update_with_changed_channels_raises_error(
     assert "defaults" in error_msg
     assert "conda-forge" in error_msg
     assert "without the --update flag" in error_msg
+
+
+def test_conda_lock_python_release_candidate_with_pip_section(
+    tmp_path: Path, conda_exe: str
+) -> None:
+    # Create a simple environment file
+    environment_yml = tmp_path / "environment.yml"
+    environment_yml.write_text("""
+channels:
+  - conda-forge
+  - conda-forge/label/python_rc
+dependencies:
+  - python=3.14.0rc2
+  - pip
+  - pip:
+    - simplejson
+""")
+    run_lock(
+        [environment_yml],
+        conda_exe=conda_exe,
+        mapping_url=DEFAULT_MAPPING_URL,
+    )