Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Adjust the Fallback logic for obtaining the hashes from private indexes #5866

Merged
merged 7 commits into from
Aug 25, 2023
Merged

Adjust the Fallback logic for obtaining the hashes from private indexes #5866

Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
e2d2088
Adjust the Fallback logic for obtaining the hashes from private indexes
matteius Aug 25, 2023
9443d4f
Add news fragment
matteius Aug 25, 2023
8374c96
Raise an error if fetching the file is not actually succesful.
matteius Aug 25, 2023
a207c67
Dont raise exception since subpocess swallows it, skip file and alert…
matteius Aug 25, 2023
8dad455
Safer open_file for remote files and don't collect bad hashes
matteius Aug 25, 2023
ca4d65b
restore docstring
matteius Aug 25, 2023
bbf5282
Get the cache working for obtaining file hashes
matteius Aug 25, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
Adjust the Fallback logic for obtaining the hashes from private indexes
  • Loading branch information
@matteius
matteius committed Aug 25, 2023
commit e2d2088d4556eb5d397f9561cc8175acc615d7f8
5 changes: 2 additions & 3 deletions pipenv/project.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
from json.decoder import JSONDecodeError
from pathlib import Path
from urllib import parse
from urllib.parse import unquote
from urllib.parse import unquote, urljoin

from pipenv.utils.constants import VCS_LIST

Expand Down Expand Up @@ -315,8 +315,7 @@ def get_hashes_from_remote_index_urls(self, ireq, source):
if params_dict.get(FAVORITE_HASH):
collected_hashes.add(params_dict[FAVORITE_HASH][0])
else: # Fallback to downloading the file to obtain hash
if source["url"] not in package_url:
package_url = f"{source['url']}{package_url}"
package_url = urljoin(source["url"], package_url)
link = Link(package_url)
collected_hashes.add(self.get_file_hash(session, link))
return self.prepend_hash_types(collected_hashes, FAVORITE_HASH)
Expand Down