Better comments plus always run before-build/before-test on 3.13

Author: lysnikolaou

.github/workflows/wheels.yml

@@ -103,10 +103,11 @@ jobs:
         include:
         # 'pip' is the default
         - cibw_build_frontend: pip
-        # TODO: Remove this and installing build deps in cibw_before_build.sh
-        # after NumPy can be built with a released Cython
+        # TODO: Remove this plus installing build deps in cibw_before_build.sh
+        # and test deps in cibw_before_test.sh after pandas can be built with a released NumPy/Cython
         - python: ["cp313t", "3.13"]
           cibw_build_frontend: 'pip; args: --no-build-isolation'
+        # TODO: Build free-threaded wheels for Windows
         exclude:
         - buildplat: [windows-2022, win_amd64]
           python: ["cp313t", "3.13"]

pyproject.toml

@@ -159,7 +159,7 @@ before-build = "bash {package}/scripts/cibw_before_build.sh"
 before-test = "bash {package}/scripts/cibw_before_test.sh"
 
 [tool.cibuildwheel.windows]
-before-build = "pip install delvewheel"
+before-build = "pip install delvewheel && bash {package}/scripts/cibw_before_build.sh"
 repair-wheel-command = "delvewheel repair -w {dest_dir} {wheel}"
 
 [[tool.cibuildwheel.overrides]]

scripts/cibw_before_build.sh

@@ -1,8 +1,8 @@
-# TODO: delete along with enabling build isolation by unsetting
-# CIBW_BUILD_FRONTEND when scipy is buildable under free-threaded
-# python with a released version of cython
-FREE_THREADED_BUILD="$(python -c "import sysconfig; print(bool(sysconfig.get_config_var('Py_GIL_DISABLED')))")"
-if [[ $FREE_THREADED_BUILD == "True" ]]; then
+# TODO: Delete when there's PyPI NumPy/Cython releases the support Python 3.13.
+# If free-threading support is not included in those releases, this script will have
+# to whether this runs for a free-threaded build instead.
+PYTHON_VERSION="$(python -c "import sys; print(f'{sys.version_info.major}{sys.version_info.minor}')")"
+if [[ $PYTHON_VERSION == "313" ]]; then
     python -m pip install -U pip
     python -m pip install -i https://pypi.anaconda.org/scientific-python-nightly-wheels/simple numpy cython
     python -m pip install ninja meson-python versioneer[toml]

scripts/cibw_before_test.sh

@@ -1,8 +1,8 @@
-# TODO: delete along with enabling build isolation by unsetting
-# CIBW_BUILD_FRONTEND when scipy is buildable under free-threaded
-# python with a released version of cython
-FREE_THREADED_BUILD="$(python -c "import sysconfig; print(bool(sysconfig.get_config_var('Py_GIL_DISABLED')))")"
-if [[ $FREE_THREADED_BUILD == "True" ]]; then
+# TODO: Delete when there's PyPI NumPy/Cython releases the support Python 3.13.
+# If free-threading support is not included in those releases, this script will have
+# to whether this runs for a free-threaded build instead.
+PYTHON_VERSION="$(python -c "import sys; print(f'{sys.version_info.major}{sys.version_info.minor}')")"
+if [[ $PYTHON_VERSION == "313" ]]; then
     python -m pip install -U pip
     python -m pip install -i https://pypi.anaconda.org/scientific-python-nightly-wheels/simple numpy
 fi