Skip to content

Commit

Permalink
don't use wheel_download_dir if pip is >=20.3
Browse files Browse the repository at this point in the history
  • Loading branch information
AndydeCleyre committed Nov 11, 2020
1 parent d928b2f commit bb2cea7
Showing 1 changed file with 11 additions and 5 deletions.
16 changes: 11 additions & 5 deletions piptools/repositories/pypi.py
Expand Up @@ -85,7 +85,8 @@ def __init__(self, pip_args, cache_dir):
self.freshen_build_caches()
self._cache_dir = normalize_path(cache_dir)
self._download_dir = fs_str(os.path.join(self._cache_dir, "pkgs"))
self._wheel_download_dir = fs_str(os.path.join(self._cache_dir, "wheels"))
if PIP_VERSION[:2] <= (20, 2):
self._wheel_download_dir = fs_str(os.path.join(self._cache_dir, "wheels"))

self._setup_logging()

Expand All @@ -107,7 +108,8 @@ def source_dir(self):

def clear_caches(self):
rmtree(self._download_dir, ignore_errors=True)
rmtree(self._wheel_download_dir, ignore_errors=True)
if PIP_VERSION[:2] <= (20, 2):
rmtree(self._wheel_download_dir, ignore_errors=True)

def find_all_candidates(self, req_name):
if req_name not in self._available_candidates_cache:
Expand Down Expand Up @@ -153,16 +155,18 @@ def resolve_reqs(self, download_dir, ireq, wheel_cache):
with get_requirement_tracker() as req_tracker, TempDirectory(
kind="resolver"
) as temp_dir, indent_log():
preparer = self.command.make_requirement_preparer(
preparer_kwargs = dict(
temp_build_dir=temp_dir,
options=self.options,
req_tracker=req_tracker,
session=self.session,
finder=self.finder,
use_user_site=False,
download_dir=download_dir,
wheel_download_dir=self._wheel_download_dir,
)
if PIP_VERSION[:2] <= (20, 2):
preparer_kwargs["wheel_download_dir"] = self._wheel_download_dir
preparer = self.command.make_requirement_preparer(**preparer_kwargs)

reqset = RequirementSet()
if PIP_VERSION[:2] <= (20, 1):
Expand Down Expand Up @@ -222,7 +226,9 @@ def get_dependencies(self, ireq):
download_dir = self._get_download_path(ireq)
if not os.path.isdir(download_dir):
os.makedirs(download_dir)
if not os.path.isdir(self._wheel_download_dir):
if PIP_VERSION[:2] <= (20, 2) and not os.path.isdir(
self._wheel_download_dir
):
os.makedirs(self._wheel_download_dir)

with global_tempdir_manager():
Expand Down

0 comments on commit bb2cea7

Please sign in to comment.