McSinyx
/
pip
mirror of https://github.com/pypa/pip
1
1
Fork 0
Code Issues Releases Activity

Don't resolve inside WheelBuilder

This commit is contained in:
Pradyun S. Gedam 2017-05-31 23:38:20 +05:30
parent 4e70d96cd2
commit 60f4a9537b
No known key found for this signature in database
GPG Key ID: 55535BE71285F710
2 changed files with 7 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
pip/commands/install.py
View File

@ -255,13 +255,13 @@ class InstallCommand(RequirementCommand):
)
try:
if (not wheel or not options.cache_dir):
# on -d don't do complex things like building
# wheels, and don't try to build wheels when wheel is
# not installed.
resolver = self._build_resolver(options, finder)
resolver.resolve(requirement_set)
else:
resolver = self._build_resolver(options, finder)
resolver.resolve(requirement_set)
# on -d don't do complex things like building
# wheels, and don't try to build wheels when wheel is
# not installed.
if wheel and options.cache_dir:
# build wheels before install.
wb = WheelBuilder(
requirement_set,

3
pip/wheel.py
View File

@ -828,9 +828,6 @@ class WheelBuilder(object):
:return: True if all the wheels built correctly.
"""
assert self._wheel_dir or (autobuilding and self._cache_root)
# unpack sdists and constructs req set
self.requirement_set.prepare_files(self.finder)
reqset = self.requirement_set.requirements.values()
buildset = []