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

Move build options from WheelBuilder to build function

This commit is contained in:
Stéphane Bidoul (ACSONE) 2019-12-29 12:19:08 +01:00
parent b24a6d09fc
commit 3828699ddc
No known key found for this signature in database
GPG Key ID: BCAB2555446B5B92
5 changed files with 59 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/pip/_internal/commands/install.py
View File

@ -74,6 +74,9 @@ def build_wheels(
builder, # type: WheelBuilder
pep517_requirements, # type: List[InstallRequirement]
legacy_requirements, # type: List[InstallRequirement]
build_options, # type: List[str]
global_options, # type: List[str]
check_binary_allowed, # type: BinaryAllowedPredicate
):
# type: (...) -> List[InstallRequirement]
"""
@ -86,6 +89,9 @@ def build_wheels(
_, build_failures = builder.build(
pep517_requirements,
should_unpack=True,
build_options=build_options,
global_options=global_options,
check_binary_allowed=check_binary_allowed,
)
if should_build_legacy:
@ -95,6 +101,9 @@ def build_wheels(
builder.build(
legacy_requirements,
should_unpack=True,
build_options=build_options,
global_options=global_options,
check_binary_allowed=check_binary_allowed,
)
return build_failures
@ -396,16 +405,14 @@ class InstallCommand(RequirementCommand):
else:
legacy_requirements.append(req)
wheel_builder = WheelBuilder(
preparer, wheel_cache,
build_options=[], global_options=[],
check_binary_allowed=check_binary_allowed,
)
wheel_builder = WheelBuilder(preparer, wheel_cache)
build_failures = build_wheels(
builder=wheel_builder,
pep517_requirements=pep517_requirements,
legacy_requirements=legacy_requirements,
build_options=[],
global_options=[],
check_binary_allowed=check_binary_allowed,
)
# If we're using PEP 517, we cannot do a direct install

8
src/pip/_internal/commands/wheel.py
View File

@ -158,14 +158,12 @@ class WheelCommand(RequirementCommand):
resolver.resolve(requirement_set)
# build wheels
wb = WheelBuilder(
preparer, wheel_cache,
build_options=options.build_options or [],
global_options=options.global_options or [],
)
wb = WheelBuilder(preparer, wheel_cache)
build_successes, build_failures = wb.build(
requirement_set.requirements.values(),
should_unpack=False,
build_options=options.build_options or [],
global_options=options.global_options or [],
)
for req in build_successes:
assert req.link and req.link.is_wheel

46
src/pip/_internal/wheel_builder.py
View File

@ -167,26 +167,17 @@ class WheelBuilder(object):
self,
preparer, # type: RequirementPreparer
wheel_cache, # type: WheelCache
build_options=None, # type: Optional[List[str]]
global_options=None, # type: Optional[List[str]]
check_binary_allowed=None, # type: Optional[BinaryAllowedPredicate]
):
# type: (...) -> None
if check_binary_allowed is None:
# Binaries allowed by default.
check_binary_allowed = _always_true
self.preparer = preparer
self.wheel_cache = wheel_cache
self.build_options = build_options or []
self.global_options = global_options or []
self.check_binary_allowed = check_binary_allowed
def _build_one(
self,
req, # type: InstallRequirement
output_dir, # type: str
build_options, # type: List[str]
global_options, # type: List[str]
):
# type: (...) -> Optional[str]
"""Build one wheel.
@ -204,12 +195,16 @@ class WheelBuilder(object):
# Install build deps into temporary directory (PEP 518)
with req.build_env:
return self._build_one_inside_env(req, output_dir)
return self._build_one_inside_env(
req, output_dir, build_options, global_options
)
def _build_one_inside_env(
self,
req, # type: InstallRequirement
output_dir, # type: str
build_options, # type: List[str]
global_options, # type: List[str]
):
# type: (...) -> Optional[str]
with TempDirectory(kind="wheel") as temp_dir:
@ -218,7 +213,7 @@ class WheelBuilder(object):
name=req.name,
backend=req.pep517_backend,
metadata_directory=req.metadata_directory,
build_options=self.build_options,
build_options=build_options,
tempd=temp_dir.path,
)
else:
@ -226,8 +221,8 @@ class WheelBuilder(object):
name=req.name,
setup_py_path=req.setup_py_path,
source_dir=req.unpacked_source_directory,
global_options=self.global_options,
build_options=self.build_options,
global_options=global_options,
build_options=build_options,
tempd=temp_dir.path,
)
@ -249,14 +244,14 @@ class WheelBuilder(object):
req.name, e,
)
# Ignore return, we can't do anything else useful.
self._clean_one(req)
self._clean_one(req, global_options)
return None
def _clean_one(self, req):
# type: (InstallRequirement) -> bool
def _clean_one(self, req, global_options):
# type: (InstallRequirement, List[str]) -> bool
clean_args = make_setuptools_clean_args(
req.setup_py_path,
global_options=self.global_options,
global_options=global_options,
)
logger.info('Running setup.py clean for %s', req.name)
@ -271,6 +266,9 @@ class WheelBuilder(object):
self,
requirements, # type: Iterable[InstallRequirement]
should_unpack, # type: bool
build_options, # type: List[str]
global_options, # type: List[str]
check_binary_allowed=None, # type: Optional[BinaryAllowedPredicate]
):
# type: (...) -> BuildResult
"""Build wheels.
@ -281,10 +279,14 @@ class WheelBuilder(object):
:return: The list of InstallRequirement that succeeded to build and
the list of InstallRequirement that failed to build.
"""
if check_binary_allowed is None:
# Binaries allowed by default.
check_binary_allowed = _always_true
buildset = _collect_buildset(
requirements,
wheel_cache=self.wheel_cache,
check_binary_allowed=self.check_binary_allowed,
check_binary_allowed=check_binary_allowed,
need_wheel=not should_unpack,
)
if not buildset:
@ -302,7 +304,9 @@ class WheelBuilder(object):
with indent_log():
build_successes, build_failures = [], []
for req, cache_dir in buildset:
wheel_file = self._build_one(req, cache_dir)
wheel_file = self._build_one(
req, cache_dir, build_options, global_options
)
if wheel_file:
# Update the link for this.
req.link = Link(path_to_url(wheel_file))

23
tests/unit/test_command_install.py
View File

@ -1,7 +1,7 @@
import errno
import pytest
from mock import Mock, call, patch
from mock import Mock, patch
from pip._vendor.packaging.requirements import Requirement
from pip._internal.commands.install import (
@ -24,8 +24,11 @@ class TestWheelCache:
"""
Return: (mock_calls, return_value).
"""
built_reqs = []
def build(reqs, **kwargs):
# Fail the first requirement.
built_reqs.append(reqs)
return ([], [reqs[0]])
builder = Mock()
@ -35,24 +38,24 @@ class TestWheelCache:
builder=builder,
pep517_requirements=pep517_requirements,
legacy_requirements=legacy_requirements,
build_options=[],
global_options=[],
check_binary_allowed=None,
)
return (builder.build.mock_calls, build_failures)
return (built_reqs, build_failures)
@patch('pip._internal.commands.install.is_wheel_installed')
def test_build_wheels__wheel_installed(self, is_wheel_installed):
is_wheel_installed.return_value = True
mock_calls, build_failures = self.check_build_wheels(
built_reqs, build_failures = self.check_build_wheels(
pep517_requirements=['a', 'b'],
legacy_requirements=['c', 'd'],
)
# Legacy requirements were built.
assert mock_calls == [
call(['a', 'b'], should_unpack=True),
call(['c', 'd'], should_unpack=True),
]
assert built_reqs == [['a', 'b'], ['c', 'd']]
# Legacy build failures are not included in the return value.
assert build_failures == ['a']
@ -61,15 +64,13 @@ class TestWheelCache:
def test_build_wheels__wheel_not_installed(self, is_wheel_installed):
is_wheel_installed.return_value = False
mock_calls, build_failures = self.check_build_wheels(
built_reqs, build_failures = self.check_build_wheels(
pep517_requirements=['a', 'b'],
legacy_requirements=['c', 'd'],
)
# Legacy requirements were not built.
assert mock_calls == [
call(['a', 'b'], should_unpack=True),
]
assert built_reqs == [['a', 'b']]
assert build_failures == ['a']

7
tests/unit/test_wheel_builder.py
View File

@ -194,7 +194,12 @@ class TestWheelBuilder(object):
wheel_req = Mock(is_wheel=True, editable=False, constraint=False)
with caplog.at_level(logging.INFO):
wb.build([wheel_req], should_unpack=False)
wb.build(
[wheel_req],
should_unpack=False,
build_options=[],
global_options=[],
)
assert "due to already being wheel" in caplog.text
assert mock_build_one.mock_calls == []