Merge pull request #7341 from hallazzang/master

Fix typo in warning message
This commit is contained in:
Christopher Hunt 2019-11-13 02:10:53 +08:00 committed by GitHub
commit 44db4d81b2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 6 additions and 4 deletions

2
news/7340.bugfix Normal file
View File

@ -0,0 +1,2 @@
Fix typo in warning message when any of ``--build-option``, ``--global-option``
and ``--install-option`` is used in requirements.txt

View File

@ -83,8 +83,8 @@ def check_install_build_global(options, check_options=None):
control = options.format_control
control.disallow_binaries()
warnings.warn(
'Disabling all use of wheels due to the use of --build-options '
'/ --global-options / --install-options.', stacklevel=2,
'Disabling all use of wheels due to the use of --build-option '
'/ --global-option / --install-option.', stacklevel=2,
)

View File

@ -345,7 +345,7 @@ class WheelBuilder(object):
if self.build_options:
# PEP 517 does not support --build-options
logger.error('Cannot build wheel for %s using PEP 517 when '
'--build-options is present' % (req.name,))
'--build-option is present' % (req.name,))
return None
try:
logger.debug('Destination directory: %s', tempd)

View File

@ -214,4 +214,4 @@ def test_pep517_and_build_options(script, tmpdir, data, common_wheels):
expect_error=True
)
assert 'Cannot build wheel' in result.stderr
assert 'when --build-options is present' in result.stderr
assert 'when --build-option is present' in result.stderr