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

start_backtracking suggestion #81

Merged
merged 10 commits into from
Oct 11, 2021
Merged
Show file tree
Hide file tree
Changes from 1 commit
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
5 changes: 3 additions & 2 deletions src/resolvelib/reporters.py
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,9 @@ def adding_requirement(self, requirement, parent):
requirements passed in from ``Resolver.resolve()``.
"""

def start_backtracking(self, causes):
"""Called when backtracking started because of collision in requirements
def resolving_conflicts(self, causes):
"""Called when a collision in requirements was detected and
an attempt to resolve them was started
nadavwe marked this conversation as resolved.
Show resolved Hide resolved

:param causes: The information on the collision that caused the backtracking.
"""
Expand Down
2 changes: 1 addition & 1 deletion src/resolvelib/reporters.pyi
Original file line number Diff line number Diff line change
Expand Up @@ -7,5 +7,5 @@ class BaseReporter:
def ending(self, state: Any) -> Any: ...
def adding_requirement(self, requirement: Any, parent: Any) -> Any: ...
def backtracking(self, candidate: Any) -> Any: ...
def start_backtracking(self, causes: Any) -> Any: ...
def resolving_conflicts(self, causes: Any) -> Any: ...
def pinning(self, candidate: Any) -> Any: ...
2 changes: 1 addition & 1 deletion src/resolvelib/resolvers.py
Original file line number Diff line number Diff line change
Expand Up @@ -369,7 +369,7 @@ def resolve(self, requirements, max_rounds):
causes = [i for c in failure_causes for i in c.information]
# Backtrack if pinning fails. The backtrack process puts us in
# an unpinned state, so we can work on it in the next round.
self._r.start_backtracking(causes)
self._r.resolving_conflicts(causes)
nadavwe marked this conversation as resolved.
Show resolved Hide resolved
success = self._backtrack()

# Dead ends everywhere. Give up.
Expand Down
4 changes: 2 additions & 2 deletions tests/test_resolvers.py
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ def is_satisfied_by(self, requirement, candidate):
assert result.mapping["child"] == ("child", "1", [])


def test_start_backtracking():
def test_resolving_conflicts():
all_candidates = {
"a": [("a", 1, [("q", {1})]), ("a", 2, [("q", {2})])],
"b": [("b", 1, [("q", {1})])],
Expand All @@ -105,7 +105,7 @@ class Reporter(BaseReporter):
def __init__(self):
self.backtracking_causes = None

def start_backtracking(self, failure_causes):
def resolving_conflicts(self, failure_causes):
self.backtracking_causes = failure_causes

class Provider(AbstractProvider):
Expand Down