Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: ensure dev-dependencies are added to the correct group #3393

Merged
merged 4 commits into from
Feb 13, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions news/3392.bugfix.md
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Ensure dev-dependencies are added to the correct group when the `tool.pdm.dev-dependencies` table has groups.
7 changes: 4 additions & 3 deletions src/pdm/project/core.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
import re
import shutil
import sys
from copy import deepcopy
from functools import cached_property, reduce
from pathlib import Path
from typing import TYPE_CHECKING, Any, Callable, Iterable, Mapping, Sequence, cast
Expand Down Expand Up @@ -669,9 +670,9 @@ def update_dev_dependencies(deps: list[str]) -> None:
metadata, settings = self.pyproject.metadata, self.pyproject.settings
if group == "default":
return metadata.get("dependencies", tomlkit.array()), lambda x: metadata.__setitem__("dependencies", x)
dev_dependencies = self.pyproject._data.get("dependency-groups", {})
for group, items in self.pyproject.settings.get("dev-dependencies", {}).items():
dev_dependencies.setdefault(group, []).extend(items)
dev_dependencies = deepcopy(self.pyproject._data.get("dependency-groups", {}))
for dev_group, items in self.pyproject.settings.get("dev-dependencies", {}).items():
dev_dependencies.setdefault(dev_group, []).extend(items)
deps_setter = [
(
metadata.get("optional-dependencies", {}),
Expand Down
19 changes: 19 additions & 0 deletions tests/cli/test_add.py
Original file line number Diff line number Diff line change
Expand Up @@ -108,6 +108,25 @@ def test_add_editable_normal_dev_dependency(project, pdm):
assert pep735_group == ["urllib3>=1.22", "idna>=2.7"]


@pytest.mark.usefixtures("working_set", "vcs")
def test_add_dev_dependency_with_existing_editables_group(project, pdm):
project.environment.python_requires = PySpecSet(">=3.6")
url = "git+https://github.com/test-root/demo.git#egg=demo"
pdm(["add", "-dG", "editables", "-e", url], obj=project, strict=True)
pdm(["add", "-d", "urllib3"], obj=project, strict=True)
pdm(["add", "-dG", "named", "idna"], obj=project, strict=True)
assert "editables" in project.pyproject.settings["dev-dependencies"]
assert "dev" in project.pyproject.dependency_groups
assert "named" in project.pyproject.dependency_groups
editables_group = project.pyproject.settings["dev-dependencies"]["editables"]
pep735_group = project.pyproject.dependency_groups["dev"]
pep735_named_group = project.pyproject.dependency_groups["named"]
assert editables_group == ["-e git+https://github.com/test-root/demo.git#egg=demo"]
assert "editables" not in project.pyproject.dependency_groups
assert pep735_group == ["urllib3>=1.22"]
assert pep735_named_group == ["idna>=2.7"]


@pytest.mark.usefixtures("working_set")
def test_add_remote_package_url(project, dev_option, pdm):
project.environment.python_requires = PySpecSet(">=3.6")
Expand Down
Loading