Skip to content

Commit

Permalink
Merge pull request #4877 from edmorley/markers-ignore-loglevel
Browse files Browse the repository at this point in the history
Use log level info when ignoring packages due to environment markers
  • Loading branch information
pfmoore authored Mar 1, 2018
2 parents 01a555e + 4b81388 commit 1cb99c1
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 8 deletions.
1 change: 1 addition & 0 deletions news/4876.bugfix
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Use log level `info` instead of `warning` when ignoring packages due to environment markers.
8 changes: 4 additions & 4 deletions src/pip/_internal/req/req_set.py
Original file line number Diff line number Diff line change
Expand Up @@ -59,16 +59,16 @@ def add_requirement(self, install_req, parent_req_name=None,
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
Expand Down
4 changes: 2 additions & 2 deletions tests/functional/test_install.py
Original file line number Diff line number Diff line change
Expand Up @@ -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)


Expand Down
3 changes: 1 addition & 2 deletions tests/functional/test_install_reqs.py
Original file line number Diff line number Diff line change
Expand Up @@ -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


Expand Down

0 comments on commit 1cb99c1

Please sign in to comment.