Skip to content

Commit 817dbe1

Browse files
Ashutosh0xAshutosh0x
committed
fix: linting and formatting for PR 13784
1 parent e9f8fcc commit 817dbe1

File tree

4 files changed

+36
-56
lines changed

4 files changed

+36
-56
lines changed

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

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -372,7 +372,6 @@ def is_pinned(specifier: SpecifierSet) -> bool:
372372
)
373373
yield ican.version, func
374374

375-
376375
return FoundCandidates(
377376
iter_index_candidate_infos,
378377
_get_installed_candidate(),
@@ -743,8 +742,7 @@ def _report_single_requirement_conflict(
743742
version_type = "final version"
744743

745744
logger.critical(
746-
"Could not find a %s that satisfies the requirement %s "
747-
"(from versions: %s)",
745+
"Could not find a %s that satisfies the requirement %s (from versions: %s)",
748746
version_type,
749747
req_disp,
750748
", ".join(versions) or "none",

‎tests/data/indexes/partial_yanked/simple/index.html‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
<!doctype html>
2-
<html>
3-
4-
<body>
5-
<a href="partial/">partial</a>
6-
</body>
7-
8-
</html>
1+
<!doctype html>
2+
<html>
3+
4+
<body>
5+
<a href="partial/">partial</a>
6+
</body>
7+
8+
</html>

‎tests/data/indexes/partial_yanked/simple/partial/index.html‎

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,18 @@
1-
<!doctype html>
2-
<html>
3-
4-
<body>
5-
<!-- Version 1.0: One file yanked, one not (file-level yanking) -->
6-
<a href="../../../packages/partial-1.0-py3-none-any.whl">partial-1.0-py3-none-any.whl</a>
7-
<a data-yanked="bad wheel" href="../../../packages/partial-1.0.tar.gz">partial-1.0.tar.gz</a>
8-
9-
<!-- Version 2.0: All files yanked (release-level yanking) -->
10-
<a data-yanked="security issue" href="../../../packages/partial-2.0-py3-none-any.whl">partial-2.0-py3-none-any.whl</a>
11-
<a data-yanked="security issue" href="../../../packages/partial-2.0.tar.gz">partial-2.0.tar.gz</a>
12-
13-
<!-- Version 3.0: No files yanked -->
14-
<a href="../../../packages/partial-3.0-py3-none-any.whl">partial-3.0-py3-none-any.whl</a>
15-
<a href="../../../packages/partial-3.0.tar.gz">partial-3.0.tar.gz</a>
16-
</body>
17-
18-
</html>
1+
<!doctype html>
2+
<html>
3+
4+
<body>
5+
<!-- Version 1.0: One file yanked, one not (file-level yanking) -->
6+
<a href="../../../packages/partial-1.0-py3-none-any.whl">partial-1.0-py3-none-any.whl</a>
7+
<a data-yanked="bad wheel" href="../../../packages/partial-1.0.tar.gz">partial-1.0.tar.gz</a>
8+
9+
<!-- Version 2.0: All files yanked (release-level yanking) -->
10+
<a data-yanked="security issue" href="../../../packages/partial-2.0-py3-none-any.whl">partial-2.0-py3-none-any.whl</a>
11+
<a data-yanked="security issue" href="../../../packages/partial-2.0.tar.gz">partial-2.0.tar.gz</a>
12+
13+
<!-- Version 3.0: No files yanked -->
14+
<a href="../../../packages/partial-3.0-py3-none-any.whl">partial-3.0-py3-none-any.whl</a>
15+
<a href="../../../packages/partial-3.0.tar.gz">partial-3.0.tar.gz</a>
16+
</body>
17+
18+
</html>

‎tests/unit/test_yanking.py‎

Lines changed: 9 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -36,12 +36,8 @@ def test_file_level_yanking_excludes_yanked_file(self) -> None:
3636
"""
3737
# Version 1.0 has two files: wheel (not yanked) and tarball (yanked)
3838
candidates = [
39-
make_test_candidate(
40-
"example", "1.0", "example-1.0-py3-none-any.whl", None
41-
),
42-
make_test_candidate(
43-
"example", "1.0", "example-1.0.tar.gz", "bad tarball"
44-
),
39+
make_test_candidate("example", "1.0", "example-1.0-py3-none-any.whl", None),
40+
make_test_candidate("example", "1.0", "example-1.0.tar.gz", "bad tarball"),
4541
]
4642

4743
# Group by version
@@ -139,26 +135,16 @@ def test_mixed_yanking_version_selection(self) -> None:
139135
"""
140136
candidates = [
141137
# Version 1.0: file-level yanking
142-
make_test_candidate(
143-
"example", "1.0", "example-1.0-py3-none-any.whl", None
144-
),
145-
make_test_candidate(
146-
"example", "1.0", "example-1.0.tar.gz", "bad tarball"
147-
),
138+
make_test_candidate("example", "1.0", "example-1.0-py3-none-any.whl", None),
139+
make_test_candidate("example", "1.0", "example-1.0.tar.gz", "bad tarball"),
148140
# Version 2.0: release-level yanking
149141
make_test_candidate(
150142
"example", "2.0", "example-2.0-py3-none-any.whl", "security"
151143
),
152-
make_test_candidate(
153-
"example", "2.0", "example-2.0.tar.gz", "security"
154-
),
144+
make_test_candidate("example", "2.0", "example-2.0.tar.gz", "security"),
155145
# Version 3.0: no yanking
156-
make_test_candidate(
157-
"example", "3.0", "example-3.0-py3-none-any.whl", None
158-
),
159-
make_test_candidate(
160-
"example", "3.0", "example-3.0.tar.gz", None
161-
),
146+
make_test_candidate("example", "3.0", "example-3.0-py3-none-any.whl", None),
147+
make_test_candidate("example", "3.0", "example-3.0.tar.gz", None),
162148
]
163149

164150
# Group by version
@@ -206,13 +192,9 @@ def test_all_versions_yanked_allows_pinned(self) -> None:
206192
"""
207193
candidates = [
208194
# Version 1.0: release-level yanking
209-
make_test_candidate(
210-
"example", "1.0", "example-1.0.tar.gz", "old version"
211-
),
195+
make_test_candidate("example", "1.0", "example-1.0.tar.gz", "old version"),
212196
# Version 2.0: release-level yanking
213-
make_test_candidate(
214-
"example", "2.0", "example-2.0.tar.gz", "has bug"
215-
),
197+
make_test_candidate("example", "2.0", "example-2.0.tar.gz", "has bug"),
216198
]
217199

218200
# Group by version

0 commit comments

Comments
 (0)