mirror of
https://github.com/pypa/pip
synced 2023-12-13 21:30:23 +01:00
Merge pull request #4877 from edmorley/markers-ignore-loglevel
Use log level info when ignoring packages due to environment markers
This commit is contained in:
commit
1cb99c1a6a
1
news/4876.bugfix
Normal file
1
news/4876.bugfix
Normal file
|
@ -0,0 +1 @@
|
|||
Use log level `info` instead of `warning` when ignoring packages due to environment markers.
|
|
@ -59,16 +59,16 @@ class RequirementSet(object):
|
|||
already be added. Note that None implies that this is a user
|
||||
supplied requirement, vs an inferred one.
|
||||
:param extras_requested: an iterable of extras used to evaluate the
|
||||
environement markers.
|
||||
environment markers.
|
||||
:return: Additional requirements to scan. That is either [] if
|
||||
the requirement is not applicable, or [install_req] if the
|
||||
requirement is applicable and has just been added.
|
||||
"""
|
||||
name = install_req.name
|
||||
if not install_req.match_markers(extras_requested):
|
||||
logger.warning("Ignoring %s: markers '%s' don't match your "
|
||||
"environment", install_req.name,
|
||||
install_req.markers)
|
||||
logger.info("Ignoring %s: markers '%s' don't match your "
|
||||
"environment", install_req.name,
|
||||
install_req.markers)
|
||||
return []
|
||||
|
||||
# This check has to come after we filter requirements with the
|
||||
|
|
|
@ -1202,10 +1202,10 @@ def test_basic_install_environment_markers(script):
|
|||
)
|
||||
"""))
|
||||
|
||||
res = script.pip('install', '--no-index', pkga_path, expect_stderr=True)
|
||||
res = script.pip('install', '--no-index', pkga_path)
|
||||
# missing_pkg should be ignored
|
||||
assert ("Ignoring missing-pkg: markers 'python_version == \"1.0\"' don't "
|
||||
"match your environment") in res.stderr, str(res)
|
||||
"match your environment") in res.stdout, str(res)
|
||||
assert "Successfully installed pkga-0.1" in res.stdout, str(res)
|
||||
|
||||
|
||||
|
|
|
@ -484,11 +484,10 @@ def test_install_unsupported_wheel_link_with_marker(script):
|
|||
result = script.pip(
|
||||
'install', '-r', script.scratch_path / 'with-marker.txt',
|
||||
expect_error=False,
|
||||
expect_stderr=True,
|
||||
)
|
||||
|
||||
assert ("Ignoring asdf: markers 'sys_platform == \"xyz\"' don't match "
|
||||
"your environment") in result.stderr
|
||||
"your environment") in result.stdout
|
||||
assert len(result.files_created) == 0
|
||||
|
||||
|
||||
|
|
Loading…
Reference in a new issue