# This is a combination of 23 commits.

parent af71f3c author Damian <damian.peter.shaw@gmail.com> 1633755088 -0400 committer Damian <damian.peter.shaw@gmail.com> 1633755088 -0400 parent 02b4f86 author Damian <damian.peter.shaw@gmail.com> 1633754869 -0400 committer Damian <damian.peter.shaw@gmail.com> 1633754928 -0400 parent 02b4f86 author Damian <damian.peter.shaw@gmail.com> 1633754869 -0400 committer Damian <damian.peter.shaw@gmail.com> 1633754892 -0400 Return a better error message if a `file:` URL is not found (pypa#10263) Co-authored-by: Tzu-ping Chung <uranusjr@gmail.com> Co-authored-by: Pradyun Gedam <pradyunsg@gmail.com> Prefer failure causes when backtracking This fix is in the wrong PR confusing matters Change name to backtrack_causes Create is_backtrack_cause function Fix newlines Typo Fix in Comment Fix lint errors Add News Item Newline Better news. Fix known depths Fix known depths Fix known depths This fix is in the wrong PR confusing matters Change name to backtrack_causes Create is_backtrack_cause function Fix newlines Typo Fix in Comment Fix lint errors # This is the commit message pypa#22: Better news. # This is the commit message pypa#23: Update news/10479.feature.rst Co-authored-by: Pradyun Gedam <pradyunsg@gmail.com>
notatallshaw · Oct 9, 2021 · 3e47811 · 3e47811
1 parent af71f3c
commit 3e47811
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/news/10479.feature.rst b/news/10479.feature.rst
@@ -1 +1 @@
-New resolver: When backtracking prefer the dependencies which caused the most recent backtracking. In some cases this will significantly reduce the amount of backtracking required.
+When backtracking during dependency resolution, prefer the dependencies which are involved in the most recent conflict. This can significantly reduce the amount of backtracking required.
diff --git a/src/pip/_internal/resolution/resolvelib/provider.py b/src/pip/_internal/resolution/resolvelib/provider.py
@@ -205,8 +205,7 @@ def get_dependencies(self, candidate: Candidate) -> Sequence[Requirement]:
 
     @staticmethod
     def is_backtrack_cause(
-        identifier: str,
-        backtrack_causes: Sequence["RequirementInformation"]
+        identifier: str, backtrack_causes: Sequence["RequirementInformation"]
     ) -> bool:
         for backtrack_cause in backtrack_causes:
             if identifier == backtrack_cause.requirement.name:
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		New resolver: When backtracking prefer the dependencies which caused the most recent backtracking. In some cases this will significantly reduce the amount of backtracking required.
		When backtracking during dependency resolution, prefer the dependencies which are involved in the most recent conflict. This can significantly reduce the amount of backtracking required.