Skip to content

Commit ed30a0f

Browse files
committed
update logging style to rely on context
Now that we have the context handling for logging, we no longer need to prefix log messages with "{req.name}:".
1 parent 7f04e12 commit ed30a0f

1 file changed

Lines changed: 7 additions & 11 deletions

File tree

src/fromager/bootstrapper.py

Lines changed: 7 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -317,7 +317,7 @@ def _build_sdist(
317317
else:
318318
sdist_filename = find_sdist_result
319319
logger.info(
320-
f"{req.name} have sdist version {resolved_version}: {find_sdist_result}"
320+
f"have sdist version {resolved_version}: {find_sdist_result}"
321321
)
322322
except Exception as err:
323323
logger.warning(f"failed to build source distribution: {err}")
@@ -446,7 +446,7 @@ def _look_for_existing_wheel(
446446
pbi = self.ctx.package_build_info(req)
447447
expected_build_tag = pbi.build_tag(resolved_version)
448448
logger.info(
449-
f"{req.name}: looking for existing wheel for version {resolved_version} with build tag {expected_build_tag} in {search_in}"
449+
f"looking for existing wheel for version {resolved_version} with build tag {expected_build_tag} in {search_in}"
450450
)
451451
wheel_filename = finders.find_wheel(
452452
downloads_dir=search_in,
@@ -460,11 +460,11 @@ def _look_for_existing_wheel(
460460
_, _, build_tag, _ = wheels.extract_info_from_wheel_file(req, wheel_filename)
461461
if expected_build_tag and expected_build_tag != build_tag:
462462
logger.info(
463-
f"{req.name}: found wheel for {resolved_version} in {wheel_filename} but build tag does not match. Got {build_tag} but expected {expected_build_tag}"
463+
f"found wheel for {resolved_version} in {wheel_filename} but build tag does not match. Got {build_tag} but expected {expected_build_tag}"
464464
)
465465
return None, None
466466

467-
logger.info(f"{req.name}: found existing wheel {wheel_filename}")
467+
logger.info(f"found existing wheel {wheel_filename}")
468468
metadata_dir = self._unpack_metadata_from_wheel(
469469
req, resolved_version, wheel_filename
470470
)
@@ -546,17 +546,13 @@ def _unpack_metadata_from_wheel(
546546
)
547547
zipinfo.filename = filename
548548
output_file = archive.extract(zipinfo, output_dir)
549-
logger.info(f"{req.name}: extracted {output_file}")
549+
logger.info(f"extracted {output_file}")
550550

551-
logger.info(
552-
f"{req.name}: extracted build requirements from wheel into {output_dir}"
553-
)
551+
logger.info(f"extracted build requirements from wheel into {output_dir}")
554552
return output_dir
555553
except Exception as e:
556554
# implies that the wheel server hosted non-fromager built wheels
557-
logger.info(
558-
f"{req.name}: could not extract build requirements from wheel: {e}"
559-
)
555+
logger.info(f"could not extract build requirements from wheel: {e}")
560556
shutil.rmtree(output_dir)
561557
return None
562558

0 commit comments

Comments
 (0)