Skip to content

A reactive notebook for Python — run reproducible experiments, query with SQL, execute as a script, deploy as an app, and version with git. Stored as pure Python. All in a modern, AI-native editor.

Fix group dependency upgrade (#7681)

Michael Deufel51da7e7872f7
diff --git a/frontend/src/components/app-config/optional-features.tsx b/frontend/src/components/app-config/optional-features.tsx
index 7ce94981d8..49d526e9d8 100644
--- a/frontend/src/components/app-config/optional-features.tsx
+++ b/frontend/src/components/app-config/optional-features.tsx
@@ -211,7 +211,7 @@ const InstallButton: React.FC<{
return pkg.name;
})
.join(" ");
- const response = await addPackage({ package: packageSpec, dev: true });
+ const response = await addPackage({ package: packageSpec, group: "dev" });
if (response.success) {
onSuccess();
toast({
diff --git a/frontend/src/components/editor/chrome/panels/packages-panel.tsx b/frontend/src/components/editor/chrome/panels/packages-panel.tsx
index 9de35c40bb..7aa0953b81 100644
--- a/frontend/src/components/editor/chrome/panels/packages-panel.tsx
+++ b/frontend/src/components/editor/chrome/panels/packages-panel.tsx
@@ -349,8 +349,9 @@ const PackagesList: React.FC<{
const UpgradeButton: React.FC<{
packageName: string;
+ tags?: { kind: string; value: string }[];
onSuccess: () => void;
-}> = ({ packageName, onSuccess }) => {
+}> = ({ packageName, tags, onSuccess }) => {
const [loading, setLoading] = React.useState(false);
const { addPackage } = useRequestClient();
@@ -362,9 +363,11 @@ const UpgradeButton: React.FC<{
const handleUpgradePackage = async () => {
try {
setLoading(true);
+ const group = tags?.find((tag) => tag.kind === "group")?.value;
const response = await addPackage({
package: packageName,
upgrade: true,
+ group,
});
if (response.success) {
onSuccess();
@@ -395,12 +398,10 @@ const RemoveButton: React.FC<{
const handleRemovePackage = async () => {
try {
setLoading(true);
- const isDev = tags?.some(
- (tag) => tag.kind === "group" && tag.value === "dev",
- );
+ const group = tags?.find((tag) => tag.kind === "group")?.value;
const response = await removePackage({
package: packageName,
- dev: isDev,
+ group,
});
if (response.success) {
onSuccess();
@@ -604,12 +605,14 @@ const DependencyTreeNode: React.FC<{
{/* Actions for top-level packages */}
{isTopLevel && (
<div className="flex gap-1 invisible group-hover:visible">
- <UpgradeButton packageName={node.name} onSuccess={onSuccess} />
+ <UpgradeButton
+ packageName={node.name}
+ tags={node.tags}
+ onSuccess={onSuccess}
+ />
+
<RemoveButton
packageName={node.name}
- // FIXME: Backend types are wrong/outdated.
- // tags actually have the shape: Array<{ kind: string; value: string }>
- // @ts-expect-error — backend tag types do not match frontend expectations yet
tags={node.tags}
onSuccess={onSuccess}
/>
diff --git a/marimo/_runtime/packages/conda_package_manager.py b/marimo/_runtime/packages/conda_package_manager.py
index d56e6990a6..ee5830ac77 100644
--- a/marimo/_runtime/packages/conda_package_manager.py
+++ b/marimo/_runtime/packages/conda_package_manager.py
@@ -1,6 +1,8 @@
# Copyright 2026 Marimo. All rights reserved.
from __future__ import annotations
+from typing import Optional
+
from marimo._runtime.packages.module_name_to_conda_name import (
module_name_to_conda_name,
)
@@ -23,19 +25,21 @@ class PixiPackageManager(CondaPackageManager):
name = "pixi"
def install_command(
- self, package: str, *, upgrade: bool, dev: bool
+ self, package: str, *, upgrade: bool, group: Optional[str] = None
) -> list[str]:
- # The `dev` parameter is accepted for interface compatibility, but is ignored.
- del dev
+ # The `group` parameter is accepted for interface compatibility, but is ignored.
+ del group
return [
"pixi",
"upgrade" if upgrade else "add",
*split_packages(package),
]
- async def uninstall(self, package: str, dev: bool = False) -> bool:
- # The `dev` parameter is accepted for interface compatibility, but is ignored.
- del dev
+ async def uninstall(
+ self, package: str, group: Optional[str] = None
+ ) -> bool:
+ # The `group` parameter is accepted for interface compatibility, but is ignored.
+ del group
return await self.run(
["pixi", "remove", *split_packages(package)], log_callback=None
)
diff --git a/marimo/_runtime/packages/package_manager.py b/marimo/_runtime/packages/package_manager.py
index 4e8ba40ab5..2aeaf9ef8b 100644
--- a/marimo/_runtime/packages/package_manager.py
+++ b/marimo/_runtime/packages/package_manager.py
@@ -61,7 +61,7 @@ class PackageManager(abc.ABC):
return False
def install_command(
- self, package: str, *, upgrade: bool, dev: bool
+ self, package: str, *, upgrade: bool, group: Optional[str] = None
) -> list[str]:
"""
Get the shell command to install a package (where applicable).
@@ -77,12 +77,12 @@ class PackageManager(abc.ABC):
package: str,
*,
upgrade: bool,
- dev: bool,
+ group: Optional[str] = None,
log_callback: Optional[LogCallback] = None,
) -> bool:
"""Installation logic."""
return await self.run(
- self.install_command(package, upgrade=upgrade, dev=dev),
+ self.install_command(package, upgrade=upgrade, group=group),
log_callback=log_callback,
)
@@ -91,7 +91,7 @@ class PackageManager(abc.ABC):
package: str,
version: Optional[str],
upgrade: bool = False,
- dev: bool = False,
+ group: Optional[str] = None,
log_callback: Optional[LogCallback] = None,
) -> bool:
"""Attempt to install a package that makes this module available.
@@ -100,7 +100,7 @@ class PackageManager(abc.ABC):
package: The package to install
version: Optional version specification
upgrade: Whether to upgrade the package if already installed
- dev: Whether to install as a dev dependency (for uv projects)
+ group: Dependency group (for uv projects)
log_callback: Optional callback to receive log output during installation
Returns True if installation succeeded, else False.
@@ -109,17 +109,19 @@ class PackageManager(abc.ABC):
return await self._install(
append_version(package, version),
upgrade=upgrade,
- dev=dev,
+ group=group,
log_callback=log_callback,
)
@abc.abstractmethod
- async def uninstall(self, package: str, dev: bool) -> bool:
+ async def uninstall(
+ self, package: str, group: Optional[str] = None
+ ) -> bool:
"""Attempt to uninstall a package
Args:
package: The package to uninstall
- dev: Whether this is a dev dependency
+ group: dependency group
Returns True if the package was uninstalled, else False.
"""
diff --git a/marimo/_runtime/packages/pypi_package_manager.py b/marimo/_runtime/packages/pypi_package_manager.py
index 55d3c9640c..d9d78754b7 100644
--- a/marimo/_runtime/packages/pypi_package_manager.py
+++ b/marimo/_runtime/packages/pypi_package_manager.py
@@ -121,10 +121,10 @@ class PipPackageManager(PypiPackageManager):
docs_url = "https://pip.pypa.io/"
def install_command(
- self, package: str, *, upgrade: bool, dev: bool
+ self, package: str, *, upgrade: bool, group: Optional[str] = None
) -> list[str]:
- # The `dev` parameter is accepted for interface compatibility, but is ignored.
- del dev
+ # The `group` parameter is accepted for interface compatibility, but is ignored.
+ del group
return [
"pip",
"--python",
@@ -134,9 +134,11 @@ class PipPackageManager(PypiPackageManager):
*split_packages(package),
]
- async def uninstall(self, package: str, dev: bool) -> bool:
- # The `dev` parameter is accepted for interface compatibility, but is ignored.
- del dev
+ async def uninstall(
+ self, package: str, group: Optional[str] = None
+ ) -> bool:
+ # The `group` parameter is accepted for interface compatibility, but is ignored.
+ del group
LOGGER.info(f"Uninstalling {package} with pip")
return await self.run(
[
@@ -178,11 +180,11 @@ class MicropipPackageManager(PypiPackageManager):
package: str,
*,
upgrade: bool,
- dev: bool,
+ group: Optional[str] = None,
log_callback: Optional[LogCallback] = None,
) -> bool:
- # The `dev` parameter is accepted for interface compatibility, but is ignored.
- del dev
+ # The `group` parameter is accepted for interface compatibility, but is ignored.
+ del group
assert is_pyodide()
import micropip # type: ignore
@@ -206,9 +208,11 @@ class MicropipPackageManager(PypiPackageManager):
log_callback(f"Failed to install {package}: {e}\n")
return False
- async def uninstall(self, package: str, dev: bool) -> bool:
- # The `dev` parameter is accepted for interface compatibility, but is ignored.
- del dev
+ async def uninstall(
+ self, package: str, group: Optional[str] = None
+ ) -> bool:
+ # The `group` parameter is accepted for interface compatibility, but is ignored.
+ del group
assert is_pyodide()
import micropip # type: ignore
@@ -259,13 +263,13 @@ class UvPackageManager(PypiPackageManager):
return self._uv_bin != "uv" or super().is_manager_installed()
def install_command(
- self, package: str, *, upgrade: bool, dev: bool = False
+ self, package: str, *, upgrade: bool, group: Optional[str] = None
) -> list[str]:
install_cmd: list[str]
if self.is_in_uv_project:
install_cmd = [self._uv_bin, "add"]
- if dev:
- install_cmd.append("--dev")
+ if group:
+ install_cmd.extend(["--group", group])
else:
install_cmd = [self._uv_bin, "pip", "install"]
@@ -290,7 +294,7 @@ class UvPackageManager(PypiPackageManager):
package: str,
*,
upgrade: bool,
- dev: bool,
+ group: Optional[str] = None,
log_callback: Optional[LogCallback] = None,
) -> bool:
"""Installation logic with fallback to --no-cache on cache write errors."""
@@ -303,12 +307,12 @@ class UvPackageManager(PypiPackageManager):
return await super()._install(
package,
upgrade=upgrade,
- dev=dev,
+ group=group,
log_callback=log_callback,
)
# For uv pip install, try with output capture to enable fallback
- cmd = self.install_command(package, upgrade=upgrade, dev=dev)
+ cmd = self.install_command(package, upgrade=upgrade, group=group)
LOGGER.info(f"Running command: {cmd}")
@@ -578,13 +582,15 @@ class UvPackageManager(PypiPackageManager):
pyproject_path = Path(venv_path).parent / "pyproject.toml"
return uv_lock_path.exists() and pyproject_path.exists()
- async def uninstall(self, package: str, dev: bool = False) -> bool:
+ async def uninstall(
+ self, package: str, group: Optional[str] = None
+ ) -> bool:
uninstall_cmd: list[str]
if self.is_in_uv_project:
LOGGER.info(f"Uninstalling {package} with 'uv remove'")
uninstall_cmd = [self._uv_bin, "remove"]
- if dev:
- uninstall_cmd.append("--dev")
+ if group:
+ uninstall_cmd.extend(["--group", group])
else:
LOGGER.info(f"Uninstalling {package} with 'uv pip uninstall'")
uninstall_cmd = [self._uv_bin, "pip", "uninstall"]
@@ -678,19 +684,21 @@ class RyePackageManager(PypiPackageManager):
docs_url = "https://rye.astral.sh/"
def install_command(
- self, package: str, *, upgrade: bool, dev: bool
+ self, package: str, *, upgrade: bool, group: Optional[str] = None
) -> list[str]:
- # The `dev` parameter is accepted for interface compatibility, but is ignored.
- del dev
+ # The `group` parameter is accepted for interface compatibility, but is ignored.
+ del group
return [
"rye",
*(["sync", "--update"] if upgrade else ["add"]),
*split_packages(package),
]
- async def uninstall(self, package: str, dev: bool) -> bool:
- # The `dev` parameter is accepted for interface compatibility, but is ignored.
- del dev
+ async def uninstall(
+ self, package: str, group: Optional[str] = None
+ ) -> bool:
+ # The `group` parameter is accepted for interface compatibility, but is ignored.
+ del group
return await self.run(
["rye", "remove", *split_packages(package)], log_callback=None
)
@@ -715,10 +723,10 @@ class PoetryPackageManager(PypiPackageManager):
return major
def install_command(
- self, package: str, *, upgrade: bool, dev: bool
+ self, package: str, *, upgrade: bool, group: Optional[str] = None
) -> list[str]:
- # The `dev` parameter is accepted for interface compatibility, but is ignored.
- del dev
+ # The `group` parameter is accepted for interface compatibility, but is ignored.
+ del group
return [
"poetry",
"update" if upgrade else "add",
@@ -726,9 +734,11 @@ class PoetryPackageManager(PypiPackageManager):
*split_packages(package),
]
- async def uninstall(self, package: str, dev: bool) -> bool:
- # The `dev` parameter is accepted for interface compatibility, but is ignored.
- del dev
+ async def uninstall(
+ self, package: str, group: Optional[str] = None
+ ) -> bool:
+ # The `group` parameter is accepted for interface compatibility, but is ignored.
+ del group
return await self.run(
["poetry", "remove", "--no-interaction", *split_packages(package)],
log_callback=None,
diff --git a/marimo/_server/api/dependency_tree.py b/marimo/_server/api/dependency_tree.py
index b0c2e2d641..2257b9ba87 100644
--- a/marimo/_server/api/dependency_tree.py
+++ b/marimo/_server/api/dependency_tree.py
@@ -1,7 +1,7 @@
# Copyright 2026 Marimo. All rights reserved.
from __future__ import annotations
-from marimo._utils.uv_tree import DependencyTreeNode
+from marimo._utils.uv_tree import DependencyTag, DependencyTreeNode
def parse_name_version(content: str) -> tuple[str, str | None]:
@@ -50,7 +50,7 @@ def parse_uv_tree(text: str) -> DependencyTreeNode:
content = content[:-3].strip()
# tags (extras/groups)
- tags: list[dict[str, str]] = []
+ tags: list[DependencyTag] = []
while "(extra:" in content or "(group:" in content:
start = (
content.rfind("(extra:")
@@ -65,14 +65,14 @@ def parse_uv_tree(text: str) -> DependencyTreeNode:
tag_text = content[start + 1 : end]
kind, value = tag_text.split(":", 1)
assert kind == "extra" or kind == "group"
- tags.append({"kind": kind, "value": value.strip()})
+ tags.append(DependencyTag(kind=kind, value=value.strip()))
content = content[:start].strip()
name, version = parse_name_version(content)
# Add cycle indicator as a special tag
if is_cycle:
- tags.append({"kind": "cycle", "value": "true"})
+ tags.append(DependencyTag(kind="cycle", value="true"))
node = DependencyTreeNode(
name=name,
diff --git a/marimo/_server/api/endpoints/packages.py b/marimo/_server/api/endpoints/packages.py
index e580ca7782..746f93df18 100644
--- a/marimo/_server/api/endpoints/packages.py
+++ b/marimo/_server/api/endpoints/packages.py
@@ -56,9 +56,9 @@ async def add_package(request: Request) -> PackageOperationResponse:
)
upgrade = body.upgrade or False
- dev = body.dev or False
+ group = body.group or None
success = await package_manager.install(
- body.package, version=None, upgrade=upgrade, dev=dev
+ body.package, version=None, upgrade=upgrade, group=group
)
# Update the script metadata
@@ -107,8 +107,8 @@ async def remove_package(request: Request) -> PackageOperationResponse:
f"Check out the docs for installation instructions: {package_manager.docs_url}" # noqa: E501
)
- dev = body.dev or False
- success = await package_manager.uninstall(body.package, dev=dev)
+ group = body.group or None
+ success = await package_manager.uninstall(body.package, group=group)
# Update the script metadata
filename = _get_filename(request)
diff --git a/marimo/_server/models/packages.py b/marimo/_server/models/packages.py
index 8e783db7e1..315a63d9c6 100644
--- a/marimo/_server/models/packages.py
+++ b/marimo/_server/models/packages.py
@@ -25,12 +25,12 @@ class AddPackageRequest(msgspec.Struct, rename="camel"):
package: str
upgrade: Optional[bool] = False
- dev: Optional[bool] = False
+ group: Optional[str] = None
class RemovePackageRequest(msgspec.Struct, rename="camel"):
package: str
- dev: Optional[bool] = False
+ group: Optional[str] = None
class ListPackagesResponse(msgspec.Struct, rename="camel"):
diff --git a/marimo/_utils/uv_tree.py b/marimo/_utils/uv_tree.py
index 5d75ac0978..c55eee1878 100644
--- a/marimo/_utils/uv_tree.py
+++ b/marimo/_utils/uv_tree.py
@@ -6,11 +6,16 @@ from typing import Optional
import msgspec
+class DependencyTag(msgspec.Struct, rename="camel"):
+ kind: str
+ value: str
+
+
class DependencyTreeNode(msgspec.Struct, rename="camel"):
name: str
version: Optional[str]
# List of {"kind": "extra"|"group", "value": str}
- tags: list[dict[str, str]]
+ tags: list[DependencyTag]
dependencies: list[DependencyTreeNode]
@@ -61,7 +66,8 @@ def parse_uv_tree(text: str) -> DependencyTreeNode:
content = content[:-3].strip()
# tags (extras/groups)
- tags: list[dict[str, str]] = []
+ tags: list[DependencyTag] = []
+
while "(extra:" in content or "(group:" in content:
start = (
content.rfind("(extra:")
@@ -76,14 +82,14 @@ def parse_uv_tree(text: str) -> DependencyTreeNode:
tag_text = content[start + 1 : end]
kind, value = tag_text.split(":", 1)
assert kind == "extra" or kind == "group"
- tags.append({"kind": kind, "value": value.strip()})
+ tags.append(DependencyTag(kind=kind, value=value.strip()))
content = content[:start].strip()
name, version = parse_name_version(content)
# Add cycle indicator as a special tag
if is_cycle:
- tags.append({"kind": "cycle", "value": "true"})
+ tags.append(DependencyTag(kind="cycle", value="true"))
node = DependencyTreeNode(
name=name,
diff --git a/packages/openapi/api.yaml b/packages/openapi/api.yaml
index 7f87dab51d..db31cefc49 100644
--- a/packages/openapi/api.yaml
+++ b/packages/openapi/api.yaml
@@ -19,11 +19,11 @@ components:
/example/foo-0.1.0-py3-none-any.whl'
properties:
- dev:
+ group:
anyOf:
- - type: boolean
+ - type: string
- type: 'null'
- default: false
+ default: null
package:
type: string
upgrade:
@@ -1239,6 +1239,17 @@ components:
- key
title: DeleteSecretRequest
type: object
+ DependencyTag:
+ properties:
+ kind:
+ type: string
+ value:
+ type: string
+ required:
+ - kind
+ - value
+ title: DependencyTag
+ type: object
DependencyTreeNode:
properties:
dependencies:
@@ -1249,9 +1260,7 @@ components:
type: string
tags:
items:
- additionalProperties:
- type: string
- type: object
+ $ref: '#/components/schemas/DependencyTag'
type: array
version:
anyOf:
@@ -3426,11 +3435,11 @@ components:
type: object
RemovePackageRequest:
properties:
- dev:
+ group:
anyOf:
- - type: boolean
+ - type: string
- type: 'null'
- default: false
+ default: null
package:
type: string
required:
diff --git a/packages/openapi/src/api.ts b/packages/openapi/src/api.ts
index 1c58317ba9..008c414e99 100644
--- a/packages/openapi/src/api.ts
+++ b/packages/openapi/src/api.ts
@@ -3060,8 +3060,8 @@ export interface components {
* /example/foo-0.1.0-py3-none-any.whl
*/
AddPackageRequest: {
- /** @default false */
- dev?: boolean | null;
+ /** @default null */
+ group?: string | null;
package: string;
/** @default false */
upgrade?: boolean | null;
@@ -3817,13 +3817,16 @@ export interface components {
DeleteSecretRequest: {
key: string;
};
+ /** DependencyTag */
+ DependencyTag: {
+ kind: string;
+ value: string;
+ };
/** DependencyTreeNode */
DependencyTreeNode: {
dependencies: components["schemas"]["DependencyTreeNode"][];
name: string;
- tags: {
- [key: string]: string;
- }[];
+ tags: components["schemas"]["DependencyTag"][];
version: string | null;
};
/** DependencyTreeResponse */
@@ -5119,8 +5122,8 @@ export interface components {
};
/** RemovePackageRequest */
RemovePackageRequest: {
- /** @default false */
- dev?: boolean | null;
+ /** @default null */
+ group?: string | null;
package: string;
};
/**
diff --git a/pyproject.toml b/pyproject.toml
index 22c5991b3a..fa36997cad 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -591,7 +591,7 @@ reportUnusedCallResult = false
[tool.pixi.workspace]
channels = ["conda-forge"]
-platforms = ["osx-arm64", "linux-64"]
+platforms = ["osx-arm64", "linux-64", "linux-aarch64"]
[tool.pixi.dependencies]
nodejs = "22.*"
@@ -605,3 +605,4 @@ pip = ">=25.0.1,<26"
[tool.pixi.pypi-dependencies]
marimo = {path = ".", editable = true}
+
diff --git a/tests/_runtime/packages/test_package_managers.py b/tests/_runtime/packages/test_package_managers.py
index 261082c428..ca766f713d 100644
--- a/tests/_runtime/packages/test_package_managers.py
+++ b/tests/_runtime/packages/test_package_managers.py
@@ -349,7 +349,7 @@ async def test_uv_pip_install() -> None:
mock_popen.side_effect = capture_command
pm = UvPackageManager()
- await pm._install("foo", upgrade=False, dev=False)
+ await pm._install("foo", upgrade=False, group=None)
assert runs_calls == [
["uv", "pip", "install", "foo", "-p", PY_EXE],
@@ -473,7 +473,7 @@ async def test_pip_install_with_log_callback() -> None:
pm = MockPipPackageManager()
result = await pm._install(
- "numpy", upgrade=False, dev=False, log_callback=log_callback
+ "numpy", upgrade=False, group=None, log_callback=log_callback
)
assert result is True
@@ -506,7 +506,7 @@ async def test_uv_install_with_log_callback() -> None:
pm = UvPackageManager()
result = await pm._install(
- "pandas", upgrade=False, dev=False, log_callback=log_callback
+ "pandas", upgrade=False, group=None, log_callback=log_callback
)
assert result is True
@@ -537,7 +537,7 @@ async def test_micropip_install_with_log_callback() -> None:
patch.dict(sys.modules, {"micropip": mock_micropip}),
):
result = await pm._install(
- "requests", upgrade=False, dev=False, log_callback=log_callback
+ "requests", upgrade=False, group=None, log_callback=log_callback
)
assert result is True
@@ -559,10 +559,10 @@ async def test_package_manager_install_method_with_callback() -> None:
package: str,
*,
upgrade: bool,
- dev: bool,
+ group: Optional[str] = None,
log_callback: Optional[LogCallback] = None,
) -> bool:
- del dev
+ del group
del upgrade
if log_callback:
log_callback(f"Installing {package}...\n")
diff --git a/tests/_runtime/packages/test_pypi_package_manager.py b/tests/_runtime/packages/test_pypi_package_manager.py
index 61c9e2ee37..d3cd986a20 100644
--- a/tests/_runtime/packages/test_pypi_package_manager.py
+++ b/tests/_runtime/packages/test_pypi_package_manager.py
@@ -53,7 +53,7 @@ async def test_install(mock_run: MagicMock):
with patch.object(manager, "is_manager_installed", return_value=True):
result = await manager._install(
- "package1 package2", upgrade=False, dev=False
+ "package1 package2", upgrade=False, group=None
)
mock_run.assert_called_once_with(
@@ -67,7 +67,7 @@ async def test_install_failure(mock_run: MagicMock):
mock_run.return_value = MagicMock(returncode=1)
result = await manager._install(
- "nonexistent-package", upgrade=False, dev=False
+ "nonexistent-package", upgrade=False, group=None
)
assert result is False
@@ -78,7 +78,7 @@ async def test_uninstall(mock_run: MagicMock):
mock_run.return_value = MagicMock(returncode=0)
with patch.object(manager, "is_manager_installed", return_value=True):
- result = await manager.uninstall("package1 package2", dev=False)
+ result = await manager.uninstall("package1 package2", group=None)
mock_run.assert_called_once_with(
[
@@ -301,7 +301,7 @@ async def test_uv_install_not_in_project(mock_popen: MagicMock):
mock_popen.return_value = mock_process
mgr = UvPackageManager()
- result = await mgr._install("package1 package2", upgrade=False, dev=False)
+ result = await mgr._install("package1 package2", upgrade=False, group=None)
mock_popen.assert_called_once_with(
[
@@ -336,7 +336,7 @@ async def test_uv_install_not_in_project_with_target(mock_popen: MagicMock):
import os
os.environ["MARIMO_UV_TARGET"] = "target_path"
- result = await mgr._install("package1 package2", upgrade=False, dev=False)
+ result = await mgr._install("package1 package2", upgrade=False, group=None)
del os.environ["MARIMO_UV_TARGET"]
mock_popen.assert_called_once_with(
@@ -365,7 +365,7 @@ async def test_uv_install_in_project(mock_run: MagicMock):
mock_run.return_value = MagicMock(returncode=0)
mgr = UvPackageManager()
- result = await mgr._install("package1 package2", upgrade=False, dev=False)
+ result = await mgr._install("package1 package2", upgrade=False, group=None)
mock_run.assert_called_once_with(
["uv", "add", "package1", "package2", "-p", PY_EXE],
@@ -380,13 +380,16 @@ async def test_uv_install_dev_dependency_in_project(mock_run: MagicMock):
mock_run.return_value = MagicMock(returncode=0)
mgr = UvPackageManager()
- result = await mgr._install("package1 package2", upgrade=False, dev=True)
+ result = await mgr._install(
+ "package1 package2", upgrade=False, group="dev"
+ )
mock_run.assert_called_once_with(
[
"uv",
"add",
- "--dev",
+ "--group",
+ "dev",
"package1",
"package2",
"-p",
@@ -396,6 +399,65 @@ async def test_uv_install_dev_dependency_in_project(mock_run: MagicMock):
assert result is True
+@patch("subprocess.run")
[email protected](UvPackageManager, "is_in_uv_project", True)
+async def test_uv_install_custom_group_in_project(mock_run: MagicMock):
+ """Test UV install uses --group flag with custom dependency group"""
+ mock_run.return_value = MagicMock(returncode=0)
+ mgr = UvPackageManager()
+
+ result = await mgr._install("sphinx", upgrade=False, group="docs")
+
+ mock_run.assert_called_once_with(
+ [
+ "uv",
+ "add",
+ "--group",
+ "docs",
+ "sphinx",
+ "-p",
+ PY_EXE,
+ ],
+ )
+ assert result is True
+
+
+@patch("subprocess.run")
[email protected](UvPackageManager, "is_in_uv_project", True)
+async def test_uv_install_no_group_in_project(mock_run: MagicMock):
+ """Test UV install without group doesn't pass --group flag"""
+ mock_run.return_value = MagicMock(returncode=0)
+ mgr = UvPackageManager()
+
+ result = await mgr._install("requests", upgrade=False, group=None)
+
+ mock_run.assert_called_once_with(
+ [
+ "uv",
+ "add",
+ "requests",
+ "-p",
+ PY_EXE,
+ ],
+ )
+ assert result is True
+
+
+@patch("subprocess.run")
[email protected](UvPackageManager, "is_in_uv_project", True)
+async def test_uv_uninstall_with_group_in_project(mock_run: MagicMock):
+ """Test UV uninstall uses --group flag with dependency group"""
+ mock_run.return_value = MagicMock(returncode=0)
+ mgr = UvPackageManager()
+
+ result = await mgr.uninstall("sphinx", group="docs")
+
+ mock_run.assert_called_once_with(
+ ["uv", "remove", "--group", "docs", "sphinx", "-p", PY_EXE],
+ )
+ assert result is True
+
+
@patch("subprocess.run")
@patch.object(UvPackageManager, "is_in_uv_project", False)
async def test_uv_uninstall_not_in_project(mock_run: MagicMock):
@@ -731,7 +793,7 @@ async def test_uv_install_cache_error_fallback(
mgr = UvPackageManager()
with patch.object(mgr, "is_manager_installed", return_value=True):
- result = await mgr._install("datamapplot", upgrade=False, dev=False)
+ result = await mgr._install("datamapplot", upgrade=False, group=None)
# First attempt should use Popen
mock_popen.assert_called_once_with(
@@ -785,7 +847,7 @@ async def test_uv_install_no_fallback_on_different_error(
mgr = UvPackageManager()
with patch.object(mgr, "is_manager_installed", return_value=True):
result = await mgr._install(
- "nonexistent-package", upgrade=False, dev=False
+ "nonexistent-package", upgrade=False, group=None
)
# Should only call Popen once (no retry)
@@ -802,7 +864,7 @@ async def test_uv_install_in_project_no_fallback(mock_run: MagicMock):
mock_run.return_value = MagicMock(returncode=1) # Failure
mgr = UvPackageManager()
- result = await mgr._install("package1", upgrade=False, dev=False)
+ result = await mgr._install("package1", upgrade=False, group=None)
# Should only call run once (no fallback for project mode)
mock_run.assert_called_once_with(
diff --git a/tests/_server/api/endpoints/test_packages.py b/tests/_server/api/endpoints/test_packages.py
index f1c1af8d2b..485ca1456b 100644
--- a/tests/_server/api/endpoints/test_packages.py
+++ b/tests/_server/api/endpoints/test_packages.py
@@ -52,7 +52,7 @@ def test_add_package(client: TestClient, mock_package_manager: Mock) -> None:
assert response.status_code == 200
assert response.json() == {"success": True, "error": None}
mock_package_manager.install.assert_called_once_with(
- "test-package", version=None, upgrade=False, dev=False
+ "test-package", version=None, upgrade=False, group=None
)
@@ -79,7 +79,7 @@ def test_remove_package(
assert response.status_code == 200
assert response.json() == {"success": True, "error": None}
mock_package_manager.uninstall.assert_called_once_with(
- "test-package", dev=False
+ "test-package", group=None
)
@@ -151,7 +151,7 @@ def test_add_package_with_upgrade(
assert response.status_code == 200
assert response.json() == {"success": True, "error": None}
mock_package_manager.install.assert_called_once_with(
- "test-package", version=None, upgrade=True, dev=False
+ "test-package", version=None, upgrade=True, group=None
)
@@ -167,7 +167,7 @@ def test_add_package_without_upgrade(
assert response.status_code == 200
assert response.json() == {"success": True, "error": None}
mock_package_manager.install.assert_called_once_with(
- "test-package", version=None, upgrade=False, dev=False
+ "test-package", version=None, upgrade=False, group=None
)
@@ -207,7 +207,7 @@ def test_remove_package_with_empty_string(
json={"package": ""},
)
assert response.status_code in [200, 400, 422]
- mock_package_manager.uninstall.assert_called_once_with("", dev=False)
+ mock_package_manager.uninstall.assert_called_once_with("", group=None)
@pytest.fixture
@@ -583,12 +583,12 @@ def test_add_package_with_dev_dependency(
response = client.post(
"/api/packages/add",
headers=HEADERS,
- json={"package": "test-package", "upgrade": True, "dev": True},
+ json={"package": "test-package", "upgrade": True, "group": "dev"},
)
assert response.status_code == 200
assert response.json() == {"success": True, "error": None}
mock_package_manager.install.assert_called_once_with(
- "test-package", version=None, upgrade=True, dev=True
+ "test-package", version=None, upgrade=True, group="dev"
)
@@ -600,12 +600,12 @@ def test_remove_package_with_dev_dependency(
response = client.post(
"/api/packages/remove",
headers=HEADERS,
- json={"package": "test-package", "dev": True},
+ json={"package": "test-package", "group": "dev"},
)
assert response.status_code == 200
assert response.json() == {"success": True, "error": None}
mock_package_manager.uninstall.assert_called_once_with(
- "test-package", dev=True
+ "test-package", group="dev"
)