Skip to content

Commit 405ddd5

Browse files
authored
fix: pyodide missing some logging (#2477)
Signed-off-by: Henry Schreiner <henryschreineriii@gmail.com>
1 parent 34b4f1e commit 405ddd5

File tree

3 files changed

+9
-5
lines changed

3 files changed

+9
-5
lines changed

.github/workflows/test.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ concurrency:
3434

3535
jobs:
3636
lint:
37-
name: Linters (mypy, flake8, etc.)
37+
name: Linters (mypy, ruff, etc.)
3838
runs-on: ubuntu-latest
3939
steps:
4040
- uses: actions/checkout@v4

cibuildwheel/logger.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
import re
44
import sys
55
import time
6-
from typing import IO, AnyStr, Final
6+
from typing import IO, AnyStr, Final, Literal
77

88
from .ci import CIProvider, detect_ci_provider
99

@@ -70,7 +70,7 @@ def __init__(self, *, unicode: bool) -> None:
7070

7171

7272
class Logger:
73-
fold_mode: str
73+
fold_mode: Literal["azure", "github", "travis", "disabled"]
7474
colors_enabled: bool
7575
unicode_enabled: bool
7676
active_build_identifier: str | None = None

cibuildwheel/platforms/pyodide.py

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
import json
44
import os
55
import shutil
6+
import subprocess
67
import sys
78
import tomllib
89
import typing
@@ -445,6 +446,7 @@ def build(options: Options, tmp_path: Path) -> None:
445446
dest_dir=repaired_wheel_dir,
446447
)
447448
shell(repair_command_prepared, env=env)
449+
log.step_end()
448450
else:
449451
shutil.move(str(built_wheel), repaired_wheel_dir)
450452

@@ -546,6 +548,8 @@ def build(options: Options, tmp_path: Path) -> None:
546548
f"{repaired_wheel} was moved to {moved_wheel} instead of {output_wheel}"
547549
)
548550
built_wheels.append(output_wheel)
551+
log.build_end()
549552

550-
finally:
551-
pass
553+
except subprocess.CalledProcessError as error:
554+
msg = f"Command {error.cmd} failed with code {error.returncode}. {error.stdout or ''}"
555+
raise errors.FatalError(msg) from error

0 commit comments

Comments
 (0)