Skip to content

Commit 5101a51

Browse files
authored
Merge branch 'main' into fix-bash-windows-env-activate
2 parents ce23789 + d8bc361 commit 5101a51

File tree

3 files changed

+49
-2
lines changed

3 files changed

+49
-2
lines changed

src/poetry/installation/executor.py

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@
3434
from poetry.utils.helpers import remove_directory
3535
from poetry.utils.isolated_build import IsolatedBuildBackendError
3636
from poetry.utils.isolated_build import IsolatedBuildInstallError
37+
from poetry.utils.log_utils import format_build_wheel_log
3738
from poetry.vcs.git import Git
3839

3940

@@ -633,7 +634,7 @@ def _prepare_archive(
633634

634635
message = (
635636
f" <fg=blue;options=bold>-</> {operation_message}:"
636-
" <info>Preparing...</info>"
637+
f"{format_build_wheel_log(package, self._env)}"
637638
)
638639
self._write(operation, message)
639640

@@ -756,7 +757,7 @@ def _download_link(self, operation: Install | Update, link: Link) -> Path:
756757
if archive.suffix != ".whl":
757758
message = (
758759
f" <fg=blue;options=bold>-</> {self.get_operation_message(operation)}:"
759-
" <info>Preparing...</info>"
760+
f"{format_build_wheel_log(package, self._env)}"
760761
)
761762
self._write(operation, message)
762763

src/poetry/utils/log_utils.py

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
from __future__ import annotations
2+
3+
from typing import TYPE_CHECKING
4+
5+
6+
if TYPE_CHECKING:
7+
from poetry.core.packages.package import Package
8+
9+
from poetry.utils.env import Env
10+
11+
12+
def format_build_wheel_log(package: Package, env: Env) -> str:
13+
"""Format a log message indicating
14+
that a wheel is being built for the given package and environment."""
15+
marker_env = env.marker_env
16+
17+
python_version_info = marker_env.get(
18+
"version_info", ("<unknown>", "<unknown>", "<unknown>")
19+
)
20+
python_version = (
21+
f"{python_version_info[0]}.{python_version_info[1]}.{python_version_info[2]}"
22+
)
23+
platform = marker_env.get("sys_platform", "<unknown-platform>")
24+
architecture = marker_env.get("platform_machine", "<unknown-arch>")
25+
26+
message = (
27+
f" <info>Building a wheel file for {package.pretty_name} "
28+
f"for Python {python_version} on {platform}-{architecture}</info>"
29+
)
30+
return message

tests/utils/test_log_utils.py

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
from __future__ import annotations
2+
3+
from poetry.core.packages.package import Package
4+
5+
from poetry.utils.env.mock_env import MockEnv
6+
from poetry.utils.log_utils import format_build_wheel_log
7+
8+
9+
def test_format_build_wheel_log() -> None:
10+
env = MockEnv(version_info=(3, 13, 1), platform="win32", platform_machine="AMD64")
11+
package = Package(name="demo", version="1.2.3")
12+
result = format_build_wheel_log(package, env)
13+
expected = (
14+
" <info>Building a wheel file for demo for Python 3.13.1 on win32-AMD64</info>"
15+
)
16+
assert result == expected

0 commit comments

Comments
 (0)