Fix bug in add_deps_to_group and test (#218)

nathanjmcdougall · web-flow · commit c9d753c36226 · 2025-01-17T23:40:54.000+13:00
diff --git a/src/usethis/_integrations/uv/deps.py b/src/usethis/_integrations/uv/deps.py
@@ -37,51 +37,50 @@ def get_deps_from_group(group: str) -> list[str]:
         return []
 
 
-def add_deps_to_group(pypi_names: list[str], group: str) -> None:
+def add_deps_to_group(deps: list[str], group: str) -> None:
     """Add a package as a non-build dependency using PEP 735 dependency groups."""
     existing_group = get_deps_from_group(group)
 
-    deps = [dep for dep in pypi_names if _strip_extras(dep) not in existing_group]
+    _deps = [dep for dep in deps if _strip_extras(dep) not in existing_group]
 
-    if not deps:
+    if not _deps:
         return
 
-    deps_str = ", ".join([f"'{_strip_extras(dep)}'" for dep in deps])
-    ies = "y" if len(deps) == 1 else "ies"
+    deps_str = ", ".join([f"'{_strip_extras(dep)}'" for dep in _deps])
+    ies = "y" if len(_deps) == 1 else "ies"
     tick_print(
         f"Adding dependenc{ies} {deps_str} to the '{group}' group in 'pyproject.toml'."
     )
 
-    for dep in deps:
+    for dep in _deps:
         try:
-            se_dep = _strip_extras(dep)
             if not usethis_config.offline:
-                call_uv_subprocess(["add", "--group", group, "--quiet", se_dep])
+                call_uv_subprocess(["add", "--group", group, "--quiet", dep])
             else:
                 call_uv_subprocess(
-                    ["add", "--group", group, "--quiet", "--offline", se_dep]
+                    ["add", "--group", group, "--quiet", "--offline", dep]
                 )
         except UVSubprocessFailedError as err:
             msg = f"Failed to add '{dep}' to the '{group}' dependency group:\n{err}"
             raise UVDepGroupError(msg) from None
 
 
-def remove_deps_from_group(pypi_names: list[str], group: str) -> None:
+def remove_deps_from_group(deps: list[str], group: str) -> None:
     """Remove the tool's development dependencies, if present."""
     existing_group = get_deps_from_group(group)
 
-    deps = [dep for dep in pypi_names if _strip_extras(dep) in existing_group]
+    _deps = [dep for dep in deps if _strip_extras(dep) in existing_group]
 
-    if not deps:
+    if not _deps:
         return
 
-    deps_str = ", ".join([f"'{_strip_extras(dep)}'" for dep in deps])
-    ies = "y" if len(deps) == 1 else "ies"
+    deps_str = ", ".join([f"'{_strip_extras(dep)}'" for dep in _deps])
+    ies = "y" if len(_deps) == 1 else "ies"
     tick_print(
         f"Removing dependenc{ies} {deps_str} from the '{group}' group in 'pyproject.toml'."
     )
 
-    for dep in deps:
+    for dep in _deps:
         try:
             se_dep = _strip_extras(dep)
             if not usethis_config.offline:
diff --git a/tests/usethis/_integrations/uv/test_deps.py b/tests/usethis/_integrations/uv/test_deps.py
@@ -10,6 +10,7 @@
     is_dep_in_any_group,
     remove_deps_from_group,
 )
+from usethis._integrations.uv.errors import UVDepGroupError
 from usethis._test import change_cwd
 
 
@@ -140,13 +141,32 @@ def test_extras(self, uv_init_dir: Path, capfd: pytest.CaptureFixture[str]):
 
             # Assert
             assert "pytest" in get_deps_from_group("test")
+            content = (uv_init_dir / "pyproject.toml").read_text()
+            assert "pytest[extra]" in content
             out, err = capfd.readouterr()
             assert not err
             assert (
                 out
                 == "✔ Adding dependency 'pytest' to the 'test' group in 'pyproject.toml'.\n"
             )
 
+    @pytest.mark.usefixtures("_vary_network_conn")
+    def test_empty_deps(self, uv_init_dir: Path, capfd: pytest.CaptureFixture[str]):
+        with change_cwd(uv_init_dir):
+            # Act
+            add_deps_to_group([], "test")
+
+            # Assert
+            assert not get_deps_from_group("test")
+            out, err = capfd.readouterr()
+            assert not err
+            assert not out
+
+    @pytest.mark.usefixtures("_vary_network_conn")
+    def test_bad_dep_string(self, uv_init_dir: Path, capfd: pytest.CaptureFixture[str]):
+        with change_cwd(uv_init_dir), pytest.raises(UVDepGroupError):
+            add_deps_to_group(["pytest[extra"], "test")
+
 
 class TestRemoveDepsFromGroup:
     @pytest.mark.usefixtures("_vary_network_conn")
