From 7c36cb21910b415e0eb171d0f6c4dbf72382fdaf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Tue, 10 Mar 2020 11:03:22 +0100 Subject: [PATCH] Don't warn the user about pip._internal.main() entrypoint In Fedora, we use that in ensurepip and users cannot do anything about it, this warning is juts moot. Also, the warning breaks CPython test suite. --- src/pip/_internal/__init__.py | 2 +- src/pip/_internal/utils/entrypoints.py | 19 ++++++++++--------- tests/functional/test_cli.py | 3 ++- 3 files changed, 13 insertions(+), 11 deletions(-) diff --git a/src/pip/_internal/__init__.py b/src/pip/_internal/__init__.py index 3aa8a46..0ec017b 100755 --- a/src/pip/_internal/__init__.py +++ b/src/pip/_internal/__init__.py @@ -15,4 +15,4 @@ def main(args=None): """ from pip._internal.utils.entrypoints import _wrapper - return _wrapper(args) + return _wrapper(args, _nowarn=True) diff --git a/src/pip/_internal/utils/entrypoints.py b/src/pip/_internal/utils/entrypoints.py index befd01c..d6f3632 100644 --- a/src/pip/_internal/utils/entrypoints.py +++ b/src/pip/_internal/utils/entrypoints.py @@ -7,7 +7,7 @@ if MYPY_CHECK_RUNNING: from typing import Optional, List -def _wrapper(args=None): +def _wrapper(args=None, _nowarn=False): # type: (Optional[List[str]]) -> int """Central wrapper for all old entrypoints. @@ -20,12 +20,13 @@ def _wrapper(args=None): directing them to an appropriate place for help, we now define all of our old entrypoints as wrappers for the current one. """ - sys.stderr.write( - "WARNING: pip is being invoked by an old script wrapper. This will " - "fail in a future version of pip.\n" - "Please see https://github.com/pypa/pip/issues/5599 for advice on " - "fixing the underlying issue.\n" - "To avoid this problem you can invoke Python with '-m pip' instead of " - "running pip directly.\n" - ) + if not _nowarn: + sys.stderr.write( + "WARNING: pip is being invoked by an old script wrapper. This will " + "fail in a future version of pip.\n" + "Please see https://github.com/pypa/pip/issues/5599 for advice on " + "fixing the underlying issue.\n" + "To avoid this problem you can invoke Python with '-m pip' instead of " + "running pip directly.\n" + ) return main(args) diff --git a/tests/functional/test_cli.py b/tests/functional/test_cli.py index e416315..7f57f67 100644 --- a/tests/functional/test_cli.py +++ b/tests/functional/test_cli.py @@ -31,4 +31,5 @@ def test_entrypoints_work(entrypoint, script): result = script.pip("-V") result2 = script.run("fake_pip", "-V", allow_stderr_warning=True) assert result.stdout == result2.stdout - assert "old script wrapper" in result2.stderr + if entrypoint[0] != "fake_pip = pip._internal:main": + assert "old script wrapper" in result2.stderr -- 2.24.1