Skip to content

Commit

Permalink
Do not fetch VCS deps when reference didn't change (#6131)
Browse files Browse the repository at this point in the history
* Do not fetch VCS deps when reference didn't change
* test(solver): test that solver does not update the resolved reference of a locked vcs package if not requested
* test(solver): test that vcs package with locked ref is not refetched

Co-authored-by: Randy Döring <30527984+radoering@users.noreply.github.com>
  • Loading branch information
maksbotan and radoering committed Sep 5, 2022
1 parent aa591ec commit dc9d84c
Show file tree
Hide file tree
Showing 2 changed files with 99 additions and 0 deletions.
6 changes: 6 additions & 0 deletions src/poetry/puzzle/provider.py
Expand Up @@ -581,6 +581,12 @@ def complete_package(
# Retrieving constraints for deferred dependencies
for r in requires:
if r.is_direct_origin():
locked = self.get_locked(r)
# If lock file contains exactly the same URL and reference
# (commit hash) of dependency as is requested,
# do not analyze it again: nothing could have changed.
if locked is not None and locked.package.is_same_package_as(r):
continue
self.search_for_direct_origin_dependency(r)

optional_dependencies = []
Expand Down
93 changes: 93 additions & 0 deletions tests/puzzle/test_solver.py
Expand Up @@ -34,6 +34,8 @@
if TYPE_CHECKING:
import httpretty

from pytest_mock import MockerFixture

from poetry.installation.operations.operation import Operation
from poetry.puzzle.provider import Provider
from poetry.puzzle.transaction import Transaction
Expand Down Expand Up @@ -3454,6 +3456,97 @@ def test_solver_keeps_multiple_locked_dependencies_for_same_package(
)


@pytest.mark.parametrize("is_locked", [False, True])
def test_solver_does_not_update_ref_of_locked_vcs_package(
package: ProjectPackage,
repo: Repository,
pool: Pool,
io: NullIO,
is_locked: bool,
):
locked_ref = "123456"
latest_ref = "9cf87a285a2d3fbb0b9fa621997b3acc3631ed24"
demo_locked = Package(
"demo",
"0.1.2",
source_type="git",
source_url="https://github.com/demo/demo.git",
source_reference=DEFAULT_SOURCE_REF,
source_resolved_reference=locked_ref,
)
demo_locked.add_dependency(Factory.create_dependency("pendulum", "*"))
demo_latest = Package(
"demo",
"0.1.2",
source_type="git",
source_url="https://github.com/demo/demo.git",
source_reference=DEFAULT_SOURCE_REF,
source_resolved_reference=latest_ref,
)
locked = [demo_locked] if is_locked else []

package.add_dependency(
Factory.create_dependency("demo", {"git": "https://github.com/demo/demo.git"})
)

# transient dependencies of demo
pendulum = get_package("pendulum", "2.0.3")
repo.add_package(pendulum)

solver = Solver(package, pool, [], locked, io)
transaction = solver.solve()

ops = check_solver_result(
transaction,
[
{"job": "install", "package": pendulum},
{"job": "install", "package": demo_locked if is_locked else demo_latest},
],
)

op = ops[1]

assert op.package.source_type == "git"
assert op.package.source_reference == DEFAULT_SOURCE_REF
assert (
op.package.source_resolved_reference == locked_ref if is_locked else latest_ref
)


def test_solver_does_not_fetch_locked_vcs_package_with_ref(
package: ProjectPackage,
repo: Repository,
pool: Pool,
io: NullIO,
mocker: MockerFixture,
):
locked_ref = "123456"
demo_locked = Package(
"demo",
"0.1.2",
source_type="git",
source_url="https://github.com/demo/demo.git",
source_reference=DEFAULT_SOURCE_REF,
source_resolved_reference=locked_ref,
)
demo_locked.add_dependency(Factory.create_dependency("pendulum", "*"))

package.add_dependency(
Factory.create_dependency("demo", {"git": "https://github.com/demo/demo.git"})
)

# transient dependencies of demo
pendulum = get_package("pendulum", "2.0.3")
repo.add_package(pendulum)

solver = Solver(package, pool, [], [demo_locked], io)
spy = mocker.spy(solver._provider, "_search_for_vcs")

solver.solve()

spy.assert_not_called()


def test_solver_direct_origin_dependency_with_extras_requested_by_other_package(
solver: Solver, repo: Repository, package: ProjectPackage
):
Expand Down

0 comments on commit dc9d84c

Please sign in to comment.