Fix issues around lower bounds

Author: nabobalis

spec0_action/__init__.py

@@ -108,6 +108,24 @@ def update_pyproject_dependencies(dependencies: list, schedule: Dict[str, str]):
         dependencies[i] = new_dep_str
 
 
+def iter_pep_dependency_lists(pyproject_data: dict, project_data: dict):
+    dependencies = project_data.get("dependencies")
+    if isinstance(dependencies, list):
+        yield dependencies
+
+    optional_dependencies = project_data.get("optional-dependencies", {})
+    if isinstance(optional_dependencies, dict):
+        for dependencies in optional_dependencies.values():
+            if isinstance(dependencies, list):
+                yield dependencies
+
+    dependency_groups = pyproject_data.get("dependency-groups", {})
+    if isinstance(dependency_groups, dict):
+        for dependencies in dependency_groups.values():
+            if isinstance(dependencies, list):
+                yield dependencies
+
+
 def update_dependency_table(dep_table: dict, new_versions: dict):
     for pkg, pkg_data in dep_table.items():
         schedule_key = canonicalize_name(pkg)
@@ -119,7 +137,10 @@ def update_dependency_table(dep_table: dict, new_versions: dict):
             if not is_url_spec(pkg_data):
                 spec = parse_version_spec(pkg_data)
                 new_lower_bound = Version(new_versions[schedule_key])
-                spec = tighten_lower_bound(spec, new_lower_bound)
+                try:
+                    spec = tighten_lower_bound(spec, new_lower_bound)
+                except ValueError:
+                    continue
                 dep_table[pkg] = repr_spec_set(spec)
             else:
                 # We don't do anything with url spec dependencies
@@ -131,7 +152,10 @@ def update_dependency_table(dep_table: dict, new_versions: dict):
                 continue
             spec = parse_version_spec(pkg_data["version"])
             new_lower_bound = Version(new_versions[schedule_key])
-            spec = tighten_lower_bound(spec, new_lower_bound)
+            try:
+                spec = tighten_lower_bound(spec, new_lower_bound)
+            except ValueError:
+                continue
             pkg_data["version"] = repr_spec_set(spec)
 
 
@@ -188,42 +212,25 @@ def update_pyproject_toml(
             python_spec = parse_version_spec(new_version["python"])
         project_data["requires-python"] = repr_spec_set(python_spec)
 
-    dependencies = project_data.get("dependencies")
-    if isinstance(dependencies, list):
+    for dependencies in iter_pep_dependency_lists(pyproject_data, project_data):
         update_pyproject_dependencies(dependencies, new_version)
 
-    optional_dependencies = project_data.get("optional-dependencies", {})
-    if isinstance(optional_dependencies, dict):
-        for dependencies in optional_dependencies.values():
-            if isinstance(dependencies, list):
-                update_pyproject_dependencies(dependencies, new_version)
-
-    dependency_groups = pyproject_data.get("dependency-groups", {})
-    if isinstance(dependency_groups, dict):
-        for dependencies in dependency_groups.values():
-            if isinstance(dependencies, list):
-                update_pyproject_dependencies(dependencies, new_version)
-
     if "tool" in pyproject_data and "pixi" in pyproject_data["tool"]:
         pixi_data = pyproject_data["tool"]["pixi"]
         update_pixi_dependencies(pixi_data, new_version)
     if update_all is not None:
-        deps = project_data.get("dependencies", [])
-        for i, dep_str in enumerate(deps):
-            if not isinstance(dep_str, str):
-                continue
-            pkg, extras, spec, env = parse_pep_dependency(dep_str)
-            if (
-                canonicalize_name(pkg) in new_version
-                or isinstance(spec, Url)
-                or spec is None
-            ):
-                continue
-            min_ver = _get_oldest_version_in_window(pkg, update_all)
-            if min_ver is None:
-                continue
-            try:
-                updated = tighten_lower_bound(spec, min_ver)
-                deps[i] = f"{pkg}{extras or ''}{repr_spec_set(updated)}{env or ''}"
-            except ValueError:
-                continue
+        for deps in iter_pep_dependency_lists(pyproject_data, project_data):
+            for i, dep_str in enumerate(deps):
+                if not isinstance(dep_str, str):
+                    continue
+                pkg, extras, spec, env = parse_pep_dependency(dep_str)
+                if canonicalize_name(pkg) in new_version or isinstance(spec, Url):
+                    continue
+                min_ver = _get_oldest_version_in_window(pkg, update_all)
+                if min_ver is None:
+                    continue
+                try:
+                    updated = tighten_lower_bound(spec or SpecifierSet(), min_ver)
+                    deps[i] = f"{pkg}{extras or ''}{repr_spec_set(updated)}{env or ''}"
+                except ValueError:
+                    continue

spec0_action/versions.py

@@ -5,6 +5,9 @@
 def tighten_lower_bound(
     spec_set: SpecifierSet, new_lower_bound: Version
 ) -> SpecifierSet:
+    if new_lower_bound not in spec_set:
+        raise ValueError(f"{new_lower_bound} does not satisfy {spec_set}")
+
     out = []
     contains_lower_bound = False
 

tests/test_data/pyproject_pixi_updated.toml

@@ -31,4 +31,4 @@ xarray = ">=2024.1.0"
 bar = ["foo"]
 
 [tool.pixi.dependencies]
-numpy = ">=2.0.0,<2"
+numpy = ">=1.10.0,<2"

tests/test_update_pyproject_toml.py

@@ -92,6 +92,30 @@ def test_update_all_noop_when_not_set(patch_datetime_now):
     mock_pypi.assert_not_called()
 
 
+def test_update_all_updates_optional_dependency_groups_and_unbounded(
+    patch_datetime_now,
+):
+    pyproject = _minimal_pyproject("requests")
+    pyproject["project"]["optional-dependencies"] = {
+        "test": ["idna>=3.0.0"],
+    }
+    pyproject["dependency-groups"] = {
+        "dev": ["charset-normalizer>=3.0.0", {"include-group": "test"}],
+    }
+    schedule = read_schedule("tests/test_data/test_schedule.json")
+    with patch.object(
+        spec0_action, "_get_oldest_version_in_window", return_value=Version("9.0.0")
+    ):
+        update_pyproject_toml(pyproject, schedule, update_all=2.0)
+
+    assert pyproject["project"]["dependencies"] == ["requests>=9.0.0"]
+    assert pyproject["project"]["optional-dependencies"]["test"] == ["idna>=9.0.0"]
+    assert pyproject["dependency-groups"]["dev"] == [
+        "charset-normalizer>=9.0.0",
+        {"include-group": "test"},
+    ]
+
+
 def test_requires_python_preserves_existing_restrictions(patch_datetime_now):
     pyproject = _minimal_pyproject()
     pyproject["project"]["requires-python"] = ">=3.9,<3.14,!=3.13.*"
@@ -104,6 +128,18 @@ def test_requires_python_preserves_existing_restrictions(patch_datetime_now):
     )
 
 
+def test_requires_python_keeps_incompatible_existing_restrictions(patch_datetime_now):
+    pyproject = _minimal_pyproject()
+    pyproject["project"]["requires-python"] = ">=3.9,<3.12"
+    schedule = read_schedule("tests/test_data/test_schedule.json")
+
+    update_pyproject_toml(pyproject, schedule)
+
+    assert SpecifierSet(pyproject["project"]["requires-python"]) == SpecifierSet(
+        ">=3.9,<3.12"
+    )
+
+
 def test_canonical_package_names_match_schedule(patch_datetime_now):
     pyproject = _minimal_pyproject("Numpy>=1.20", "scikit_learn>=1.0")
     schedule = read_schedule("tests/test_data/test_schedule.json")

tests/test_versions.py

@@ -1,6 +1,7 @@
 from packaging.version import Version
 from spec0_action.versions import repr_spec_set, tighten_lower_bound
 from packaging.specifiers import SpecifierSet
+import pytest
 
 
 def test_repr_specset():
@@ -16,14 +17,22 @@ def test_tighter_lower_bound_any():
 
 
 def test_tighter_lower_bound_leaves_other_restrictions():
-    spec = SpecifierSet("~= 0.9,>=1.0,!= 1.3.4.*,< 2.0")
-    lower_bound = Version("3.8.0")
+    spec = SpecifierSet(">=1.0,!= 1.3.4.*,< 2.0")
+    lower_bound = Version("1.4.0")
     tightened = tighten_lower_bound(spec, lower_bound)
-    assert tightened == SpecifierSet("~= 0.9,>=3.8.0,!=1.3.4.*,<2.0")
+    assert tightened == SpecifierSet(">=1.4.0,!=1.3.4.*,<2.0")
 
 
 def test_tighter_lower_bound_adds_lower_bound_if_not_present():
-    spec = SpecifierSet("~=0.9,!=1.3.4.*,<2.0")
-    lower_bound = Version("3.8.0")
+    spec = SpecifierSet("!=1.3.4.*,<2.0")
+    lower_bound = Version("1.4.0")
     tightened = tighten_lower_bound(spec, lower_bound)
-    assert tightened == SpecifierSet("~= 0.9,  != 1.3.4.*, < 2.0, >=3.8.0")
+    assert tightened == SpecifierSet("!=1.3.4.*,<2.0,>=1.4.0")
+
+
+def test_tighter_lower_bound_rejects_incompatible_restrictions():
+    spec = SpecifierSet(">=1.0,<2.0")
+    lower_bound = Version("2.0.0")
+
+    with pytest.raises(ValueError):
+        tighten_lower_bound(spec, lower_bound)