From c20f778899e635d81d85c9d2126913c955f9c0b1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Bidoul?= Date: Fri, 1 May 2020 09:50:27 +0200 Subject: [PATCH 1/4] Do not unncessarily warn about wheel being absent Do not warn about the wheel package being absent if wheel building would have been skipped for another reason. --- src/pip/_internal/wheel_builder.py | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/src/pip/_internal/wheel_builder.py b/src/pip/_internal/wheel_builder.py index 6d1022d56..12ee3ab90 100644 --- a/src/pip/_internal/wheel_builder.py +++ b/src/pip/_internal/wheel_builder.py @@ -69,14 +69,6 @@ def _should_build( # From this point, this concerns the pip install command only # (need_wheel=False). - if not req.use_pep517 and not is_wheel_installed(): - # we don't build legacy requirements if wheel is not installed - logger.info( - "Could not build wheels for %s, " - "since package 'wheel' is not installed.", req.name, - ) - return False - if req.editable or not req.source_dir: return False @@ -87,6 +79,14 @@ def _should_build( ) return False + if not req.use_pep517 and not is_wheel_installed(): + # we don't build legacy requirements if wheel is not installed + logger.info( + "Could not build wheels for %s, " + "since package 'wheel' is not installed.", req.name, + ) + return False + return True From d8c14d4006987190030afac33efba2d5c6a0219f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Bidoul?= Date: Fri, 1 May 2020 09:54:20 +0200 Subject: [PATCH 2/4] Clarify message when wheel is not installed --- src/pip/_internal/wheel_builder.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pip/_internal/wheel_builder.py b/src/pip/_internal/wheel_builder.py index 12ee3ab90..fcaeeb6c3 100644 --- a/src/pip/_internal/wheel_builder.py +++ b/src/pip/_internal/wheel_builder.py @@ -82,7 +82,7 @@ def _should_build( if not req.use_pep517 and not is_wheel_installed(): # we don't build legacy requirements if wheel is not installed logger.info( - "Could not build wheels for %s, " + "Using legacy setup.py install for %s, " "since package 'wheel' is not installed.", req.name, ) return False From 430ca847f39906a7080628f30165860e92adfc74 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Bidoul?= Date: Fri, 1 May 2020 09:56:28 +0200 Subject: [PATCH 3/4] Add news --- news/8178.bugfix | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 news/8178.bugfix diff --git a/news/8178.bugfix b/news/8178.bugfix new file mode 100644 index 000000000..b68f477a2 --- /dev/null +++ b/news/8178.bugfix @@ -0,0 +1,2 @@ +Avoid unncessary message about the wheel package not being installed +when a wheel would not have been built. Additionally, clarify the message. From 55d602298998f933b65a1b16096ecf4c9a9e657a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Bidoul?= Date: Fri, 1 May 2020 21:36:02 +0200 Subject: [PATCH 4/4] Update news/8178.bugfix Co-authored-by: Xavier Fernandez --- news/8178.bugfix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/news/8178.bugfix b/news/8178.bugfix index b68f477a2..6960053ed 100644 --- a/news/8178.bugfix +++ b/news/8178.bugfix @@ -1,2 +1,2 @@ -Avoid unncessary message about the wheel package not being installed +Avoid unnecessary message about the wheel package not being installed when a wheel would not have been built. Additionally, clarify the message.