fix: image deprecation warning (#2314)

This commit is contained in:
Matthieu Darbois
2025-03-15 17:54:37 +00:00
committed by Joe Rickerby
parent a880bf5105
commit c25fe60385
2 changed files with 50 additions and 19 deletions
+17 -19
View File
@@ -567,7 +567,7 @@ class Options:
self.command_line_arguments = command_line_arguments
self.env = env
self._defaults = defaults
self._image_warnings = set[str]()
self._image_warnings: set[str] = set()
self.reader = OptionsReader(
None if defaults else self.config_file_path,
@@ -689,6 +689,20 @@ class Options:
allow_empty=allow_empty,
)
def _check_pinned_image(self, value: str, pinned_images: Mapping[str, str]) -> None:
if (
value in {"manylinux1", "manylinux2010", "manylinux_2_24", "musllinux_1_1"}
and value not in self._image_warnings
):
self._image_warnings.add(value)
msg = (
f"Deprecated image {value!r}. This value will not work"
" in a future version of cibuildwheel. Either upgrade to a supported"
" image or continue using the deprecated image by pinning directly"
f" to {pinned_images[value]!r}."
)
log.warning(msg)
def build_options(self, identifier: str | None) -> BuildOptions:
"""
Compute BuildOptions for a single run configuration.
@@ -786,24 +800,7 @@ class Options:
# default to manylinux2014
image = pinned_images["manylinux2014"]
elif config_value in pinned_images:
if (
config_value
in {
"manylinux1",
"manylinux2010",
"manylinux_2_24",
"musllinux_1_1",
}
and config_value not in self._image_warnings
):
self._image_warnings.add(config_value)
msg = (
f"Deprecated image {config_value!r}. This value will not work"
" in a future version of cibuildwheel. Either upgrade to a supported"
" image or continue using the deprecated image by pinning directly"
f" to {pinned_images[config_value]!r}."
)
log.warning(msg)
self._check_pinned_image(config_value, pinned_images)
image = pinned_images[config_value]
else:
image = config_value
@@ -818,6 +815,7 @@ class Options:
if not config_value:
image = pinned_images["musllinux_1_2"]
elif config_value in pinned_images:
self._check_pinned_image(config_value, pinned_images)
image = pinned_images[config_value]
else:
image = config_value