Skip to content

Commit 88183ff

Browse files
committed
Fix linting issues
1 parent 71d6a8c commit 88183ff

File tree

4 files changed

+18
-14
lines changed

4 files changed

+18
-14
lines changed

src/pip/_internal/index/collector.py

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -231,8 +231,9 @@ def parse_links(page: IndexContent) -> Iterable[Link]:
231231
if content_type_l.startswith("application/vnd.pypi.simple.v1+json"):
232232
data = json.loads(page.content)
233233
project_track_urls = set(data.get("meta", {}).get("tracks", []))
234+
# repo_alt_urls = set(data.get("alternate-locations", []))
235+
# repo_alt_urls.add(page.url)
234236
repo_alt_urls = set(data.get("alternate-locations", []))
235-
repo_alt_urls.add(page.url)
236237
for file in data.get("files", []):
237238
link = Link.from_json(
238239
file,
@@ -251,8 +252,9 @@ def parse_links(page: IndexContent) -> Iterable[Link]:
251252

252253
base_url = parser.base_url or url
253254
for anchor in parser.anchors:
255+
# repo_alt_urls = parser.repo_alt_urls or set()
256+
# repo_alt_urls.add(page.url)
254257
repo_alt_urls = parser.repo_alt_urls or set()
255-
repo_alt_urls.add(page.url)
256258
link = Link.from_element(
257259
anchor,
258260
page_url=url,

src/pip/_internal/index/package_finder.py

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1276,7 +1276,7 @@ def check_multiple_remote_repositories(
12761276
# between all locations where that project is
12771277
# found as to what the alternate
12781278
# locations are.
1279-
# Only validate alternate locations if any
1279+
# Only validate alternate locations if any
12801280
# candidate actually declares alternate locations.
12811281
all_explicit_alt_urls = [
12821282
rc.alternate_location_urls - ({rc.url} if rc.url else set())
@@ -1344,7 +1344,9 @@ def check_multiple_remote_repositories(
13441344
single_origin = len({rc.url for rc in remote_candidates}) == 1
13451345

13461346
if not single_origin:
1347-
if track_repo not in {_repo_base(u) for u in known_owner_repo_urls}:
1347+
if track_repo not in {
1348+
_repo_base(u) for u in known_owner_repo_urls if u is not None
1349+
}:
13481350
raise InvalidTracksUrl(
13491351
package=project_name,
13501352
remote_repositories=(

src/pip/_internal/models/candidate.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -85,8 +85,8 @@ def project_track_urls(self) -> set[str]:
8585
def alternate_location_urls(self) -> set[str]:
8686
"""Remote repository urls from Alternate Locations metadata."""
8787
urls: set[str] = set()
88-
if self.url:
89-
urls.add(self.url)
88+
# if self.url:
89+
# urls.add(self.url)
9090
link = self._link
9191
if link and link.repo_alt_urls:
9292
urls.update({i for i in link.repo_alt_urls if i})

tests/unit/test_index.py

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
from __future__ import annotations
22

33
import logging
4-
from typing import Optional
4+
from typing import Set
55

66
import pytest
77

@@ -916,11 +916,11 @@ def test_extract_version_from_fragment(
916916

917917

918918
def _make_mock_candidate_check_remote_repo(
919-
candidate_name: Optional[str] = None,
920-
version: Optional[str] = None,
921-
comes_from_url: Optional[str] = None,
922-
project_track_urls: Optional[Set[str]] = None,
923-
repo_alt_urls: Optional[Set[str]] = None,
919+
candidate_name: str | None = None,
920+
version: str | None = None,
921+
comes_from_url: str | None = None,
922+
project_track_urls: Set[str] | None = None,
923+
repo_alt_urls: Set[str] | None = None,
924924
) -> InstallationCandidate:
925925
if candidate_name is None:
926926
candidate_name = "mypackage"
@@ -1089,10 +1089,10 @@ def _make_mock_candidate_check_remote_repo(
10891089
)
10901090
def test_check_multiple_remote_repositories(
10911091
caplog, candidates: list[InstallationCandidate], project_name: str, expected
1092-
):
1092+
) -> None:
10931093
caplog.set_level(logging.DEBUG)
10941094
if expected:
10951095
with pytest.raises(expected):
10961096
check_multiple_remote_repositories(candidates, project_name)
10971097
else:
1098-
assert check_multiple_remote_repositories(candidates, project_name) is None
1098+
check_multiple_remote_repositories(candidates, project_name)

0 commit comments

Comments
 (0)