@@ -37,6 +37,7 @@ def assert_editable(script, *args):
37
37
38
38
@pytest .fixture ()
39
39
def make_fake_wheel (script ):
40
+
40
41
def _make_fake_wheel (name , version , wheel_tag ):
41
42
wheel_house = script .scratch_path .joinpath ("wheelhouse" )
42
43
wheel_house .mkdir ()
@@ -286,7 +287,7 @@ def test_new_resolver_no_dist_message(script):
286
287
# ERROR: No matching distribution found for xxx
287
288
288
289
assert "Could not find a version that satisfies the requirement B" \
289
- in result .stderr , str (result )
290
+ in result .stderr , str (result )
290
291
assert "No matching distribution found for B" in result .stderr , str (result )
291
292
292
293
@@ -326,10 +327,10 @@ def test_new_resolver_installs_editable(script):
326
327
],
327
328
)
328
329
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 ,
333
334
):
334
335
create_basic_wheel_for_package (
335
336
script ,
@@ -560,10 +561,10 @@ def test_new_resolver_force_reinstall(script):
560
561
ids = ["default" , "exact-pre" , "explicit-pre" , "no-stable" ],
561
562
)
562
563
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 ,
567
568
):
568
569
for version in available_versions :
569
570
create_basic_wheel_for_package (script , "pkg" , version )
@@ -644,16 +645,16 @@ def test_new_resolver_constraint_no_specifier(script):
644
645
"constraint, error" ,
645
646
[
646
647
(
647
- "dist.zip" ,
648
- "Unnamed requirements are not allowed as constraints" ,
648
+ "dist.zip" ,
649
+ "Unnamed requirements are not allowed as constraints" ,
649
650
),
650
651
(
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" ,
653
654
),
654
655
(
655
- "pkg[extra]" ,
656
- "Constraints cannot have extras" ,
656
+ "pkg[extra]" ,
657
+ "Constraints cannot have extras" ,
657
658
),
658
659
],
659
660
)
@@ -699,10 +700,10 @@ def test_new_resolver_constraint_on_dependency(script):
699
700
],
700
701
)
701
702
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 ,
706
707
):
707
708
"""A path requirement can be filtered by a constraint.
708
709
"""
@@ -886,7 +887,7 @@ def _wheel_from_index(script, name, version, requires, extras):
886
887
],
887
888
)
888
889
def test_new_resolver_extra_merge_in_package (
889
- self , monkeypatch , script , pkg_builder ,
890
+ self , monkeypatch , script , pkg_builder ,
890
891
):
891
892
create_basic_wheel_for_package (script , "depdev" , "1.0.0" )
892
893
create_basic_wheel_for_package (
@@ -1045,7 +1046,7 @@ def test_new_resolver_prefers_installed_in_upgrade_if_latest(script):
1045
1046
@pytest .mark .parametrize ("N" , [2 , 10 , 20 ])
1046
1047
def test_new_resolver_presents_messages_when_backtracking_a_lot (script , N ):
1047
1048
# 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 ):
1049
1050
A_version = f"{ index } .0.0"
1050
1051
B_version = f"{ index } .0.0"
1051
1052
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):
1057
1058
print ("A" , A_version , "B" , B_version , "C" , C_version )
1058
1059
create_basic_wheel_for_package (script , "A" , A_version , depends = depends )
1059
1060
1060
- for index in range (1 , N + 1 ):
1061
+ for index in range (1 , N + 1 ):
1061
1062
B_version = f"{ index } .0.0"
1062
1063
C_version = f"{ index } .0.0"
1063
1064
depends = ["C == " + C_version ]
1064
1065
1065
1066
print ("B" , B_version , "C" , C_version )
1066
1067
create_basic_wheel_for_package (script , "B" , B_version , depends = depends )
1067
1068
1068
- for index in range (1 , N + 1 ):
1069
+ for index in range (1 , N + 1 ):
1069
1070
C_version = f"{ index } .0.0"
1070
1071
print ("C" , C_version )
1071
1072
create_basic_wheel_for_package (script , "C" , C_version )
@@ -1143,9 +1144,9 @@ def test_new_resolver_presents_messages_when_backtracking_starts(script):
1143
1144
ids = ["file_dot" , "file_underscore" ],
1144
1145
)
1145
1146
def test_new_resolver_check_wheel_version_normalized (
1146
- script ,
1147
- metadata_version ,
1148
- filename_version ,
1147
+ script ,
1148
+ metadata_version ,
1149
+ filename_version ,
1149
1150
):
1150
1151
filename = f"simple-{ filename_version } -py2.py3-none-any.whl"
1151
1152
@@ -1245,8 +1246,8 @@ def test_new_resolver_skip_inconsistent_metadata(script):
1245
1246
)
1246
1247
1247
1248
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 )
1250
1251
assert_installed (script , a = "1" )
1251
1252
1252
1253
@@ -1464,7 +1465,7 @@ def test_new_resolver_prefers_url_constraint_on_update(script):
1464
1465
1465
1466
@pytest .mark .parametrize ("version_option" , ["--constraint" , "--requirement" ])
1466
1467
def test_new_resolver_fails_with_url_constraint_and_incompatible_version (
1467
- script , version_option ,
1468
+ script , version_option ,
1468
1469
):
1469
1470
not_installed_path = create_basic_wheel_for_package (
1470
1471
script ,
@@ -1495,8 +1496,8 @@ def test_new_resolver_fails_with_url_constraint_and_incompatible_version(
1495
1496
1496
1497
assert "Cannot install test_pkg" in result .stderr , str (result )
1497
1498
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 )
1500
1501
1501
1502
assert_not_installed (script , "test_pkg" )
1502
1503
@@ -1577,9 +1578,9 @@ def test_new_resolver_fails_on_needed_conflicting_constraints(script):
1577
1578
)
1578
1579
1579
1580
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 )
1583
1584
1584
1585
assert_not_installed (script , "test_pkg" )
1585
1586
@@ -1618,8 +1619,8 @@ def test_new_resolver_fails_on_conflicting_constraint_and_requirement(script):
1618
1619
1619
1620
assert "Cannot install test-pkg 0.2.0" in result .stderr , str (result )
1620
1621
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 )
1623
1624
1624
1625
assert_not_installed (script , "test_pkg" )
1625
1626
@@ -1702,7 +1703,7 @@ def test_new_resolver_applies_url_constraint_to_dep(script):
1702
1703
1703
1704
1704
1705
def test_new_resolver_handles_compatible_wheel_tags_in_constraint_url (
1705
- script , make_fake_wheel
1706
+ script , make_fake_wheel
1706
1707
):
1707
1708
initial_path = make_fake_wheel ("base" , "0.1.0" , "fakepy1-fakeabi-fakeplat" )
1708
1709
@@ -1734,7 +1735,7 @@ def test_new_resolver_handles_compatible_wheel_tags_in_constraint_url(
1734
1735
1735
1736
1736
1737
def test_new_resolver_handles_incompatible_wheel_tags_in_constraint_url (
1737
- script , make_fake_wheel
1738
+ script , make_fake_wheel
1738
1739
):
1739
1740
initial_path = make_fake_wheel ("base" , "0.1.0" , "fakepy1-fakeabi-fakeplat" )
1740
1741
@@ -1757,15 +1758,15 @@ def test_new_resolver_handles_incompatible_wheel_tags_in_constraint_url(
1757
1758
)
1758
1759
1759
1760
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 )
1763
1764
1764
1765
assert_not_installed (script , "base" )
1765
1766
1766
1767
1767
1768
def test_new_resolver_avoids_incompatible_wheel_tags_in_constraint_url (
1768
- script , make_fake_wheel
1769
+ script , make_fake_wheel
1769
1770
):
1770
1771
initial_path = make_fake_wheel ("dep" , "0.1.0" , "fakepy1-fakeabi-fakeplat" )
1771
1772
@@ -1861,11 +1862,11 @@ def test_new_resolver_avoids_incompatible_wheel_tags_in_constraint_url(
1861
1862
],
1862
1863
)
1863
1864
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 ,
1869
1870
):
1870
1871
pkga = create_basic_wheel_for_package (script , name = "pkga" , version = "1" )
1871
1872
pkgb = create_basic_wheel_for_package (
0 commit comments