File tree Expand file tree Collapse file tree 3 files changed +6
-9
lines changed
Expand file tree Collapse file tree 3 files changed +6
-9
lines changed Original file line number Diff line number Diff line change @@ -231,9 +231,8 @@ 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)
236234 repo_alt_urls = set (data .get ("alternate-locations" , []))
235+ repo_alt_urls .add (page .url )
237236 for file in data .get ("files" , []):
238237 link = Link .from_json (
239238 file ,
@@ -252,9 +251,8 @@ def parse_links(page: IndexContent) -> Iterable[Link]:
252251
253252 base_url = parser .base_url or url
254253 for anchor in parser .anchors :
255- # repo_alt_urls = parser.repo_alt_urls or set()
256- # repo_alt_urls.add(page.url)
257254 repo_alt_urls = parser .repo_alt_urls or set ()
255+ repo_alt_urls .add (page .url )
258256 link = Link .from_element (
259257 anchor ,
260258 page_url = url ,
Original file line number Diff line number Diff line change @@ -1385,7 +1385,7 @@ def check_multiple_remote_repositories(
13851385 if not any (ns & other for j , other in enumerate (namespaces ) if i != j ):
13861386 raise UnsafeMultipleRemoteRepositories (
13871387 package = project_name ,
1388- remote_repositories = ns ,
1388+ remote_repositories = { u for u in ns if u is not None } ,
13891389 )
13901390
13911391 all_declared_sources = set ().union (* namespaces )
@@ -1394,7 +1394,7 @@ def check_multiple_remote_repositories(
13941394 if invalid_sources :
13951395 raise UnsafeMultipleRemoteRepositories (
13961396 package = project_name ,
1397- remote_repositories = invalid_sources ,
1397+ remote_repositories = { u for u in invalid_sources if u is not None } ,
13981398 )
13991399
14001400 return None
Original file line number Diff line number Diff line change 11from __future__ import annotations
22
33import logging
4- from typing import Set
54
65import pytest
76
@@ -919,8 +918,8 @@ def _make_mock_candidate_check_remote_repo(
919918 candidate_name : str | None = None ,
920919 version : str | None = None ,
921920 comes_from_url : str | None = None ,
922- project_track_urls : Set [str ] | None = None ,
923- repo_alt_urls : Set [str ] | None = None ,
921+ project_track_urls : set [str ] | None = None ,
922+ repo_alt_urls : set [str ] | None = None ,
924923) -> InstallationCandidate :
925924 if candidate_name is None :
926925 candidate_name = "mypackage"
You can’t perform that action at this time.
0 commit comments