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 bugs where VCS dev-dependencies are poetry install/show even in --no-dev #996

Closed
wants to merge 2 commits into from
Closed
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 poetry/packages/package.py
Original file line number Diff line number Diff line change
Expand Up @@ -298,6 +298,7 @@ def add_dependency(
tag=constraint.get("tag", None),
rev=constraint.get("rev", None),
optional=optional,
category=category,
)
elif "file" in constraint:
file_path = Path(constraint["file"])
Expand Down
12 changes: 10 additions & 2 deletions poetry/packages/vcs_dependency.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,15 @@ class VCSDependency(Dependency):
"""

def __init__(
self, name, vcs, source, branch=None, tag=None, rev=None, optional=False
self,
name,
vcs,
source,
branch=None,
tag=None,
rev=None,
optional=False,
**kwargs
):
self._vcs = vcs
self._source = source
Expand All @@ -21,7 +29,7 @@ def __init__(
self._rev = rev

super(VCSDependency, self).__init__(
name, "*", optional=optional, allows_prereleases=True
name, "*", optional=optional, allows_prereleases=True, **kwargs
)

@property
Expand Down
24 changes: 24 additions & 0 deletions tests/puzzle/test_solver.py
Original file line number Diff line number Diff line change
Expand Up @@ -986,6 +986,30 @@ def test_solver_can_resolve_git_dependencies_with_ref(solver, repo, package, ref
assert op.package.source_reference.startswith("9cf87a2")


def test_solver_marks_git_dev_dependencies_as_dev(solver, repo, package):
pendulum = get_package("pendulum", "2.0.3")
cleo = get_package("cleo", "1.0.0")
repo.add_package(pendulum)
repo.add_package(cleo)

package.add_dependency(
"demo", {"git": "https://github.com/demo/demo.git"}, category="dev"
)

ops = solver.solve()

check_solver_result(
ops,
[
{"job": "install", "package": pendulum},
{"job": "install", "package": get_package("demo", "0.1.2")},
],
)

assert ops[0].package.category == "dev"
assert ops[1].package.category == "dev"


def test_solver_does_not_trigger_conflict_for_python_constraint_if_python_requirement_is_compatible(
solver, repo, package
):
Expand Down