Include python_variant suggestion

Author: AlenkaF

ci/docker/python-wheel-windows-vs2022.dockerfile

@@ -25,13 +25,9 @@ FROM ${base}
 ARG python=3.10
 
 # Use python_abi_tag env var to select regular or free-threaded Python
-ARG freethreaded=0
-ENV PYTHON_MODE=${freethreaded}
-RUN if "%PYTHON_MODE%"=="1" ( \
-        pymanager install --version %PYTHON_VERSION% --variant freethreaded \
-    ) else ( \
-        pymanager install --version %PYTHON_VERSION% \
-    )
+ARG python_variant=default
+ENV PYTHON_VARIANT=${python_variant}
+RUN pymanager install --version %PYTHON_VERSION% --variant %PYTHON_VARIANT%
 
 RUN %PYTHON_CMD% -m pip install -U pip setuptools
 

compose.yaml

@@ -1408,7 +1408,7 @@ services:
       args:
         base: ${REPO}:python-wheel-windows-vs2022-base-vcpkg-${VCPKG}-${PYTHON_WHEEL_WINDOWS_IMAGE_REVISION}
         python: ${PYTHON}
-        freethreaded: 0
+        python_variant: default
       context: .
       dockerfile: ci/docker/python-wheel-windows-vs2022.dockerfile
       # This should make the pushed images reusable, but the image gets rebuilt.
@@ -1425,7 +1425,7 @@ services:
       args:
         base: ${REPO}:python-wheel-windows-vs2022-base-vcpkg-${VCPKG}-${PYTHON_WHEEL_WINDOWS_IMAGE_REVISION}
         python: ${PYTHON}
-        freethreaded: 1
+        python_variant: freethreaded
       context: .
       dockerfile: ci/docker/python-wheel-windows-vs2022.dockerfile
       # This should make the pushed images reusable, but the image gets rebuilt.