McSinyx/pip
1
1
Fork 0
mirror of https://github.com/pypa/pip synced 2023-12-13 21:30:23 +01:00
Code Issues Releases Activity

Don't create delete marker file in unpack_url (#6987)

Browse source
This commit is contained in:
Pradyun Gedam 2019-09-07 13:17:12 +05:30 committed by GitHub
parent 9300fe640a 997c9b71b3
commit 0bb585d5f0
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 23 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/pip/_internal/download.py
View file

@ -36,7 +36,6 @@ from pip._internal.utils.compat import HAS_TLS, ipaddress, ssl
from pip._internal.utils.encoding import auto_decode
from pip._internal.utils.filesystem import check_path_owner, copy2_fixed
from pip._internal.utils.glibc import libc_ver
from pip._internal.utils.marker_files import write_delete_marker_file
from pip._internal.utils.misc import (
ARCHIVE_EXTENSIONS,
ask,
@ -1213,7 +1212,6 @@ def unpack_url(
link, # type: Link
location, # type: str
download_dir=None, # type: Optional[str]
only_download=False, # type: bool
session=None, # type: Optional[PipSession]
hashes=None, # type: Optional[Hashes]
progress_bar="on" # type: str
@ -1254,8 +1252,6 @@ def unpack_url(
hashes=hashes,
progress_bar=progress_bar
)
if only_download:
write_delete_marker_file(location)
def sanitize_content_filename(filename):

41
src/pip/_internal/operations/prepare.py
View file

@ -29,6 +29,7 @@ from pip._internal.exceptions import (
from pip._internal.utils.compat import expanduser
from pip._internal.utils.hashes import MissingHashes
from pip._internal.utils.logging import indent_log
from pip._internal.utils.marker_files import write_delete_marker_file
from pip._internal.utils.misc import display_path, normalize_path
from pip._internal.utils.typing import MYPY_CHECK_RUNNING
@ -184,26 +185,15 @@ class RequirementPreparer(object):
# showing the user what the hash should be.
hashes = MissingHashes()
download_dir = self.download_dir
if link.is_wheel and self.wheel_download_dir:
# when doing 'pip wheel` we download wheels to a
# dedicated dir.
download_dir = self.wheel_download_dir
try:
download_dir = self.download_dir
# We always delete unpacked sdists after pip ran.
autodelete_unpacked = True
if link.is_wheel and self.wheel_download_dir:
# when doing 'pip wheel` we download wheels to a
# dedicated dir.
download_dir = self.wheel_download_dir
if link.is_wheel:
if download_dir:
# When downloading, we only unpack wheels to get
# metadata.
autodelete_unpacked = True
else:
# When installing a wheel, we use the unpacked
# wheel.
autodelete_unpacked = False
unpack_url(
link, req.source_dir,
download_dir, autodelete_unpacked,
link, req.source_dir, download_dir,
session=session, hashes=hashes,
progress_bar=self.progress_bar
)
@ -219,6 +209,21 @@ class RequirementPreparer(object):
(req, exc, link)
)
if link.is_wheel:
if download_dir:
# When downloading, we only unpack wheels to get
# metadata.
autodelete_unpacked = True
else:
# When installing a wheel, we use the unpacked
# wheel.
autodelete_unpacked = False
else:
# We always delete unpacked sdists after pip runs.
autodelete_unpacked = True
if autodelete_unpacked:
write_delete_marker_file(req.source_dir)
abstract_dist = _get_prepared_distribution(
req, self.req_tracker, finder, self.build_isolation,
)