Revert "Update windows test wheels dockerfiles to use MSIX"

This reverts commit 6c57b1d.

Author: AlenkaF

ci/docker/python-free-threaded-wheel-windows-test-vs2022.dockerfile

@@ -0,0 +1,59 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+# NOTE: You must update PYTHON_WHEEL_WINDOWS_TEST_IMAGE_REVISION in .env
+# when you update this file.
+
+ARG base
+# https://github.com/hadolint/hadolint/wiki/DL3006
+# (Hadolint does not expand variables and thinks '${base}' is an untagged image)
+# hadolint ignore=DL3006
+FROM ${base}
+
+ARG python=3.13
+
+# hadolint ignore=SC1072
+RUN (if "%python%"=="3.13" setx PYTHON_VERSION "3.13.1") & \
+    (if "%python%"=="3.14" setx PYTHON_VERSION "3.14.0")
+
+SHELL ["powershell", "-NoProfile", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"]
+RUN $version = $env:PYTHON_VERSION; \
+    $filename = 'python-' + $version + '-amd64.exe'; \
+    $url = 'https://www.python.org/ftp/python/' + $version + '/' + $filename; \
+    Invoke-WebRequest -Uri $url -OutFile $filename; \
+    Start-Process -FilePath $filename -ArgumentList '/quiet', 'Include_freethreaded=1' -Wait
+
+ENV PYTHON_CMD="py -${python}t"
+
+SHELL ["cmd", "/S", "/C"]
+RUN %PYTHON_CMD% -m pip install -U pip setuptools & \
+    if "%python%"=="3.13" ( \
+        setx REQUIREMENTS_FILE "requirements-wheel-test-3.13t.txt" \
+    ) else ( \
+        setx REQUIREMENTS_FILE "requirements-wheel-test.txt" \
+    )
+
+COPY python/requirements-wheel-test-3.13t.txt python/requirements-wheel-test.txt C:/arrow/python/
+# Cython and Pandas wheels for free-threaded are not released yet
+RUN %PYTHON_CMD% -m pip install \
+    --extra-index-url https://pypi.anaconda.org/scientific-python-nightly-wheels/simple \
+    --pre \
+    --prefer-binary \
+    -r C:/arrow/python/%REQUIREMENTS_FILE%
+
+ENV PYTHON="${python}t"
+ENV PYTHON_GIL=0

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

@@ -34,24 +34,12 @@ RUN (if "%python%"=="3.10" setx PYTHON_VERSION "3.10.11" && setx PYTHON_CMD "py
     (if "%python%"=="3.13" setx PYTHON_VERSION "3.13.7" && setx PYTHON_CMD "py -3.13") & \
     (if "%python%"=="3.14" setx PYTHON_VERSION "3.14.0" && setx PYTHON_CMD "py -3.14")
 
-# 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% \
-    )
-
 # hadolint ignore=DL3059
-RUN %PYTHON_CMD% -m pip install -U pip setuptools & \
-    if "%python%"=="3.13" ( \
-        setx REQUIREMENTS_FILE "requirements-wheel-test-3.13t.txt" \
-    ) else ( \
-        setx REQUIREMENTS_FILE "requirements-wheel-test.txt" \
-    )
+RUN choco install -r -y --pre --no-progress --force python --version=%PYTHON_VERSION%
+# hadolint ignore=DL3059
+RUN %PYTHON_CMD% -m pip install -U pip setuptools
 
-COPY python/requirements-wheel-test-3.13t.txt python/requirements-wheel-test.txt C:/arrow/python/
-RUN %PYTHON_CMD% -m pip install -r C:/arrow/python/%REQUIREMENTS_FILE%
+COPY python/requirements-wheel-test.txt C:/arrow/python/
+RUN %PYTHON_CMD% -m pip install -r C:/arrow/python/requirements-wheel-test.txt
 
 ENV PYTHON=$python

compose.yaml

@@ -1445,7 +1445,6 @@ services:
       args:
         base: ${REPO}:python-wheel-windows-test-vs2022-base-${PYTHON_WHEEL_WINDOWS_TEST_IMAGE_REVISION}
         python: ${PYTHON}
-        freethreaded: 0
       context: .
       dockerfile: ci/docker/python-wheel-windows-test-vs2022.dockerfile
     volumes: *python-wheel-windows-vs2022-volumes
@@ -1457,9 +1456,8 @@ services:
       args:
         base: ${REPO}:python-wheel-windows-test-vs2022-base-${PYTHON_WHEEL_WINDOWS_TEST_IMAGE_REVISION}
         python: ${PYTHON}
-        freethreaded: 1
       context: .
-      dockerfile: ci/docker/python-wheel-windows-test-vs2022.dockerfile
+      dockerfile: ci/docker/python-free-threaded-wheel-windows-test-vs2022.dockerfile
     volumes: *python-wheel-windows-vs2022-volumes
     command: arrow\\ci\\scripts\\python_wheel_windows_test.bat