Skip to content

Commit d19c4f8

Browse files
committed
fixing liniting
1 parent a9ef2de commit d19c4f8

File tree

2 files changed

+63
-62
lines changed

2 files changed

+63
-62
lines changed

src/pip/_internal/resolution/resolvelib/factory.py

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -647,21 +647,6 @@ def get_installation_error(
647647
"#fixing-conflicting-dependencies"
648648
)
649649

650-
def get_backtracking_reason_message(self, backtracking_causes, constraints):
651-
requires_python_causes = self.extract_requires_python_causes(
652-
backtracking_causes
653-
)
654-
if requires_python_causes or len(backtracking_causes) == 1:
655-
# no message when python causes or a single failure, since this is probably a genuine problem
656-
return
657-
658-
# OK, we now have a list of requirements that can't all be
659-
# satisfied at once.
660-
661-
return self.triggers_message(backtracking_causes) + self.causes_message(
662-
constraints, backtracking_causes
663-
)
664-
665650
@staticmethod
666651
def causes_message(constraints, failure_causes):
667652
msg = "\nThe conflict is caused by:"
@@ -722,3 +707,18 @@ def extract_requires_python_causes(self, failure_causes):
722707
if isinstance(cause.requirement, RequiresPythonRequirement)
723708
and not cause.requirement.is_satisfied_by(self._python_candidate)
724709
]
710+
711+
def get_backtracking_reason_message(self, backtracking_causes, constraints):
712+
requires_python_causes = self.extract_requires_python_causes(
713+
backtracking_causes
714+
)
715+
if requires_python_causes or len(backtracking_causes) == 1:
716+
# no message when python causes or a single failure, since this is probably a genuine problem
717+
return
718+
719+
# OK, we now have a list of requirements that can't all be
720+
# satisfied at once.
721+
722+
return self.triggers_message(backtracking_causes) + self.causes_message(
723+
constraints, backtracking_causes
724+
)

tests/functional/test_new_resolver.py

Lines changed: 48 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@ def assert_editable(script, *args):
3737

3838
@pytest.fixture()
3939
def make_fake_wheel(script):
40+
4041
def _make_fake_wheel(name, version, wheel_tag):
4142
wheel_house = script.scratch_path.joinpath("wheelhouse")
4243
wheel_house.mkdir()
@@ -286,7 +287,7 @@ def test_new_resolver_no_dist_message(script):
286287
# ERROR: No matching distribution found for xxx
287288

288289
assert "Could not find a version that satisfies the requirement B" \
289-
in result.stderr, str(result)
290+
in result.stderr, str(result)
290291
assert "No matching distribution found for B" in result.stderr, str(result)
291292

292293

@@ -326,10 +327,10 @@ def test_new_resolver_installs_editable(script):
326327
],
327328
)
328329
def test_new_resolver_requires_python(
329-
script,
330-
requires_python,
331-
ignore_requires_python,
332-
dep_version,
330+
script,
331+
requires_python,
332+
ignore_requires_python,
333+
dep_version,
333334
):
334335
create_basic_wheel_for_package(
335336
script,
@@ -560,10 +561,10 @@ def test_new_resolver_force_reinstall(script):
560561
ids=["default", "exact-pre", "explicit-pre", "no-stable"],
561562
)
562563
def test_new_resolver_handles_prerelease(
563-
script,
564-
available_versions,
565-
pip_args,
566-
expected_version,
564+
script,
565+
available_versions,
566+
pip_args,
567+
expected_version,
567568
):
568569
for version in available_versions:
569570
create_basic_wheel_for_package(script, "pkg", version)
@@ -644,16 +645,16 @@ def test_new_resolver_constraint_no_specifier(script):
644645
"constraint, error",
645646
[
646647
(
647-
"dist.zip",
648-
"Unnamed requirements are not allowed as constraints",
648+
"dist.zip",
649+
"Unnamed requirements are not allowed as constraints",
649650
),
650651
(
651-
"-e git+https://example.com/dist.git#egg=req",
652-
"Editable requirements are not allowed as constraints",
652+
"-e git+https://example.com/dist.git#egg=req",
653+
"Editable requirements are not allowed as constraints",
653654
),
654655
(
655-
"pkg[extra]",
656-
"Constraints cannot have extras",
656+
"pkg[extra]",
657+
"Constraints cannot have extras",
657658
),
658659
],
659660
)
@@ -699,10 +700,10 @@ def test_new_resolver_constraint_on_dependency(script):
699700
],
700701
)
701702
def test_new_resolver_constraint_on_path_empty(
702-
script,
703-
constraint_version,
704-
expect_error,
705-
message,
703+
script,
704+
constraint_version,
705+
expect_error,
706+
message,
706707
):
707708
"""A path requirement can be filtered by a constraint.
708709
"""
@@ -886,7 +887,7 @@ def _wheel_from_index(script, name, version, requires, extras):
886887
],
887888
)
888889
def test_new_resolver_extra_merge_in_package(
889-
self, monkeypatch, script, pkg_builder,
890+
self, monkeypatch, script, pkg_builder,
890891
):
891892
create_basic_wheel_for_package(script, "depdev", "1.0.0")
892893
create_basic_wheel_for_package(
@@ -1045,7 +1046,7 @@ def test_new_resolver_prefers_installed_in_upgrade_if_latest(script):
10451046
@pytest.mark.parametrize("N", [2, 10, 20])
10461047
def test_new_resolver_presents_messages_when_backtracking_a_lot(script, N):
10471048
# Generate a set of wheels that will definitely cause backtracking.
1048-
for index in range(1, N + 1):
1049+
for index in range(1, N+1):
10491050
A_version = f"{index}.0.0"
10501051
B_version = f"{index}.0.0"
10511052
C_version = "{index_minus_one}.0.0".format(index_minus_one=index - 1)
@@ -1057,15 +1058,15 @@ def test_new_resolver_presents_messages_when_backtracking_a_lot(script, N):
10571058
print("A", A_version, "B", B_version, "C", C_version)
10581059
create_basic_wheel_for_package(script, "A", A_version, depends=depends)
10591060

1060-
for index in range(1, N + 1):
1061+
for index in range(1, N+1):
10611062
B_version = f"{index}.0.0"
10621063
C_version = f"{index}.0.0"
10631064
depends = ["C == " + C_version]
10641065

10651066
print("B", B_version, "C", C_version)
10661067
create_basic_wheel_for_package(script, "B", B_version, depends=depends)
10671068

1068-
for index in range(1, N + 1):
1069+
for index in range(1, N+1):
10691070
C_version = f"{index}.0.0"
10701071
print("C", C_version)
10711072
create_basic_wheel_for_package(script, "C", C_version)
@@ -1143,9 +1144,9 @@ def test_new_resolver_presents_messages_when_backtracking_starts(script):
11431144
ids=["file_dot", "file_underscore"],
11441145
)
11451146
def test_new_resolver_check_wheel_version_normalized(
1146-
script,
1147-
metadata_version,
1148-
filename_version,
1147+
script,
1148+
metadata_version,
1149+
filename_version,
11491150
):
11501151
filename = f"simple-{filename_version}-py2.py3-none-any.whl"
11511152

@@ -1245,8 +1246,8 @@ def test_new_resolver_skip_inconsistent_metadata(script):
12451246
)
12461247

12471248
assert (
1248-
" inconsistent version: filename has '3', but metadata has '2'"
1249-
) in result.stderr, str(result)
1249+
" inconsistent version: filename has '3', but metadata has '2'"
1250+
) in result.stderr, str(result)
12501251
assert_installed(script, a="1")
12511252

12521253

@@ -1464,7 +1465,7 @@ def test_new_resolver_prefers_url_constraint_on_update(script):
14641465

14651466
@pytest.mark.parametrize("version_option", ["--constraint", "--requirement"])
14661467
def test_new_resolver_fails_with_url_constraint_and_incompatible_version(
1467-
script, version_option,
1468+
script, version_option,
14681469
):
14691470
not_installed_path = create_basic_wheel_for_package(
14701471
script,
@@ -1495,8 +1496,8 @@ def test_new_resolver_fails_with_url_constraint_and_incompatible_version(
14951496

14961497
assert "Cannot install test_pkg" in result.stderr, str(result)
14971498
assert (
1498-
"because these package versions have conflicting dependencies."
1499-
) in result.stderr, str(result)
1499+
"because these package versions have conflicting dependencies."
1500+
) in result.stderr, str(result)
15001501

15011502
assert_not_installed(script, "test_pkg")
15021503

@@ -1577,9 +1578,9 @@ def test_new_resolver_fails_on_needed_conflicting_constraints(script):
15771578
)
15781579

15791580
assert (
1580-
"Cannot install test_pkg because these package versions have conflicting "
1581-
"dependencies."
1582-
) in result.stderr, str(result)
1581+
"Cannot install test_pkg because these package versions have conflicting "
1582+
"dependencies."
1583+
) in result.stderr, str(result)
15831584

15841585
assert_not_installed(script, "test_pkg")
15851586

@@ -1618,8 +1619,8 @@ def test_new_resolver_fails_on_conflicting_constraint_and_requirement(script):
16181619

16191620
assert "Cannot install test-pkg 0.2.0" in result.stderr, str(result)
16201621
assert (
1621-
"because these package versions have conflicting dependencies."
1622-
) in result.stderr, str(result)
1622+
"because these package versions have conflicting dependencies."
1623+
) in result.stderr, str(result)
16231624

16241625
assert_not_installed(script, "test_pkg")
16251626

@@ -1702,7 +1703,7 @@ def test_new_resolver_applies_url_constraint_to_dep(script):
17021703

17031704

17041705
def test_new_resolver_handles_compatible_wheel_tags_in_constraint_url(
1705-
script, make_fake_wheel
1706+
script, make_fake_wheel
17061707
):
17071708
initial_path = make_fake_wheel("base", "0.1.0", "fakepy1-fakeabi-fakeplat")
17081709

@@ -1734,7 +1735,7 @@ def test_new_resolver_handles_compatible_wheel_tags_in_constraint_url(
17341735

17351736

17361737
def test_new_resolver_handles_incompatible_wheel_tags_in_constraint_url(
1737-
script, make_fake_wheel
1738+
script, make_fake_wheel
17381739
):
17391740
initial_path = make_fake_wheel("base", "0.1.0", "fakepy1-fakeabi-fakeplat")
17401741

@@ -1757,15 +1758,15 @@ def test_new_resolver_handles_incompatible_wheel_tags_in_constraint_url(
17571758
)
17581759

17591760
assert (
1760-
"Cannot install base because these package versions have conflicting "
1761-
"dependencies."
1762-
) in result.stderr, str(result)
1761+
"Cannot install base because these package versions have conflicting "
1762+
"dependencies."
1763+
) in result.stderr, str(result)
17631764

17641765
assert_not_installed(script, "base")
17651766

17661767

17671768
def test_new_resolver_avoids_incompatible_wheel_tags_in_constraint_url(
1768-
script, make_fake_wheel
1769+
script, make_fake_wheel
17691770
):
17701771
initial_path = make_fake_wheel("dep", "0.1.0", "fakepy1-fakeabi-fakeplat")
17711772

@@ -1861,11 +1862,11 @@ def test_new_resolver_avoids_incompatible_wheel_tags_in_constraint_url(
18611862
],
18621863
)
18631864
def test_new_resolver_direct_url_equivalent(
1864-
tmp_path,
1865-
script,
1866-
suffixes_equivalent,
1867-
depend_suffix,
1868-
request_suffix,
1865+
tmp_path,
1866+
script,
1867+
suffixes_equivalent,
1868+
depend_suffix,
1869+
request_suffix,
18691870
):
18701871
pkga = create_basic_wheel_for_package(script, name="pkga", version="1")
18711872
pkgb = create_basic_wheel_for_package(

0 commit comments

Comments
 (0)