chore: simplify pinned image lookup (#2897)
Replace the explicit if/else used to resolve pinned container images with pinned_images.get(config_value, config_value) in the manylinux and musllinux loops inside _compute_build_options. This keeps behavior identical while reducing duplication and simplifying the code in cibuildwheel/options.py.
This commit is contained in:
+2
-10
@@ -880,11 +880,7 @@ class Options:
|
|||||||
f"manylinux-{build_platform}-image", ignore_empty=True
|
f"manylinux-{build_platform}-image", ignore_empty=True
|
||||||
)
|
)
|
||||||
self._check_pinned_image(config_value, pinned_images)
|
self._check_pinned_image(config_value, pinned_images)
|
||||||
if config_value in pinned_images:
|
manylinux_images[build_platform] = pinned_images.get(config_value, config_value)
|
||||||
image = pinned_images[config_value]
|
|
||||||
else:
|
|
||||||
image = config_value
|
|
||||||
manylinux_images[build_platform] = image
|
|
||||||
|
|
||||||
for build_platform in MUSLLINUX_ARCHS:
|
for build_platform in MUSLLINUX_ARCHS:
|
||||||
pinned_images = all_pinned_container_images[build_platform]
|
pinned_images = all_pinned_container_images[build_platform]
|
||||||
@@ -892,11 +888,7 @@ class Options:
|
|||||||
f"musllinux-{build_platform}-image", ignore_empty=True
|
f"musllinux-{build_platform}-image", ignore_empty=True
|
||||||
)
|
)
|
||||||
self._check_pinned_image(config_value, pinned_images)
|
self._check_pinned_image(config_value, pinned_images)
|
||||||
if config_value in pinned_images:
|
musllinux_images[build_platform] = pinned_images.get(config_value, config_value)
|
||||||
image = pinned_images[config_value]
|
|
||||||
else:
|
|
||||||
image = config_value
|
|
||||||
musllinux_images[build_platform] = image
|
|
||||||
|
|
||||||
container_engine_str = self.reader.get(
|
container_engine_str = self.reader.get(
|
||||||
"container-engine",
|
"container-engine",
|
||||||
|
|||||||
Reference in New Issue
Block a user