CI Remove Windows 32 bit support (#24627)

thomasjpfan · web-flow · commit 16f4fb86bd01 · 2022-10-13T12:12:52.000+02:00
diff --git a/.github/workflows/wheels.yml b/.github/workflows/wheels.yml
@@ -68,16 +68,6 @@ jobs:
             bitness: 64
             platform_id: win_amd64
 
-          # Window 32 bit
-          - os: windows-latest
-            python: 38
-            bitness: 32
-            platform_id: win32
-          - os: windows-latest
-            python: 39
-            bitness: 32
-            platform_id: win32
-
           # Linux 64 bit manylinux2014
           - os: ubuntu-latest
             python: 38
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
@@ -280,9 +280,3 @@ jobs:
         COVERAGE: 'true'
         SKLEARN_ENABLE_DEBUG_CYTHON_DIRECTIVES: '1'
         SKLEARN_TESTS_GLOBAL_RANDOM_SEED: '7'  # non-default seed
-      py38_pip_openblas_32bit:
-        DISTRIB: 'pip-windows'
-        PYTHON_VERSION: '3.8'
-        PYTHON_ARCH: '32'
-        LOCK_FILE: ./build_tools/azure/py38_pip_openblas_32bit_lock.txt
-        SKLEARN_TESTS_GLOBAL_RANDOM_SEED: '8'  # non-default seed
diff --git a/build_tools/azure/py38_pip_openblas_32bit_lock.txt b/build_tools/azure/py38_pip_openblas_32bit_lock.txt
diff --git a/build_tools/azure/py38_pip_openblas_32bit_requirements.txt b/build_tools/azure/py38_pip_openblas_32bit_requirements.txt
diff --git a/build_tools/azure/test_script.sh b/build_tools/azure/test_script.sh
@@ -9,8 +9,6 @@ if [[ "$DISTRIB" =~ ^conda.* ]]; then
     source activate $VIRTUALENV
 elif [[ "$DISTRIB" == "ubuntu" || "$DISTRIB" == "debian-32" || "$DISTRIB" == "pip-nogil" ]]; then
     source $VIRTUALENV/bin/activate
-elif [[ "$DISTRIB" == "pip-windows" ]]; then
-    source $VIRTUALENV/Scripts/activate
 fi
 
 if [[ "$BUILD_WITH_ICC" == "true" ]]; then
diff --git a/build_tools/github/test_windows_wheels.sh b/build_tools/github/test_windows_wheels.sh
@@ -6,21 +6,13 @@ set -x
 PYTHON_VERSION=$1
 BITNESS=$2
 
-if [[ "$BITNESS" == "32" ]]; then
-    # 32-bit architectures use the regular
-    # test command (outside of the minimal Docker container)
-    cp $CONFTEST_PATH $CONFTEST_NAME
-    python -c "import sklearn; sklearn.show_versions()"
-    pytest --pyargs sklearn
-else
-    docker container run \
-        --rm scikit-learn/minimal-windows \
-        powershell -Command "python -c 'import sklearn; sklearn.show_versions()'"
+docker container run \
+    --rm scikit-learn/minimal-windows \
+    powershell -Command "python -c 'import sklearn; sklearn.show_versions()'"
 
-    docker container run \
-        -e SKLEARN_SKIP_NETWORK_TESTS=1 \
-        -e OMP_NUM_THREADS=2 \
-        -e OPENBLAS_NUM_THREADS=2 \
-        --rm scikit-learn/minimal-windows \
-        powershell -Command "pytest --pyargs sklearn"
-fi
+docker container run \
+    -e SKLEARN_SKIP_NETWORK_TESTS=1 \
+    -e OMP_NUM_THREADS=2 \
+    -e OPENBLAS_NUM_THREADS=2 \
+    --rm scikit-learn/minimal-windows \
+    powershell -Command "pytest --pyargs sklearn"
diff --git a/build_tools/update_environments_and_lock_files.py b/build_tools/update_environments_and_lock_files.py
@@ -330,29 +330,6 @@ def remove_from(alist, to_remove):
         # pip-compile
         "python_version": "3.8.5",
     },
-    {
-        "build_name": "py38_pip_openblas_32bit",
-        "folder": "build_tools/azure",
-        "pip_dependencies": [
-            "numpy",
-            "scipy",
-            "cython",
-            "joblib",
-            "threadpoolctl",
-            "pytest",
-            "pytest-xdist",
-            "pillow",
-            "pooch",
-            "wheel",
-        ],
-        # The Windows 32bit build use 3.8.10. No cross-compilation support for
-        # pip-compile, we are going to assume the pip lock file on a Linux
-        # 64bit machine gives appropriate versions
-        "python_version": "3.8.10",
-        "package_constraints": {
-            "scipy": "1.9.1",  # 1.9.2 not available for 32 bit Windows
-        },
-    },
 ]
 
 
