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

Nicer Resolver output -- Try 1 #8861

Merged
merged 5 commits into from
Sep 17, 2020
Merged

Nicer Resolver output -- Try 1 #8861

Changes from 4 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
c07ef58
Factor out logger.into into a single call
pradyunsg Sep 10, 2020
963e390
Improve how cached wheels are presented
pradyunsg Sep 10, 2020
3d32960
Only Print "Collecting ..." when the requirement changes
pradyunsg Sep 10, 2020
cc472fd
Use a symmetric type and make mypy happy
pradyunsg Sep 10, 2020
0fc1044
:newspaper:
pradyunsg Sep 16, 2020
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
22 changes: 17 additions & 5 deletions src/pip/_internal/operations/prepare.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -357,6 +357,9 @@ def __init__(
# Memoized downloaded files, as mapping of url: (path, mime type)
self._downloaded = {} # type: Dict[str, Tuple[str, str]]

# Previous "header" printed for a link-based InstallRequirement
self._previous_requirement_header = ("", "")

@property
def _download_should_save(self):
# type: () -> bool
Expand All @@ -373,12 +376,21 @@ def _download_should_save(self):

def _log_preparing_link(self, req):
# type: (InstallRequirement) -> None
"""Log the way the link prepared."""
if req.link.is_file:
path = req.link.file_path
logger.info('Processing %s', display_path(path))
"""Provide context for the requirement being prepared."""
if req.link.is_file and not req.original_link_is_in_wheel_cache:
message = "Processing %s"
information = str(display_path(req.link.file_path))
else:
logger.info('Collecting %s', req.req or req)
message = "Collecting %s"
information = str(req.req or req)

if (message, information) != self._previous_requirement_header:
self._previous_requirement_header = (message, information)
logger.info(message, information)

if req.original_link_is_in_wheel_cache:
with indent_log():
logger.info("Using cached %s", req.link.filename)

def _get_download_dir(self, link):
# type: (Link) -> Optional[str]
Expand Down