Skip to content

Commit 4e5237d

Browse files
[backport 2.3.x] CI: clean up wheel build workarounds now that Cython 3.1.0 is out (pandas-dev#61446) (pandas-dev#61752)
* CI: clean up wheel build workarounds now that Cython 3.1.0 is out (pandas-dev#61446) * Bump pypa/cibuildwheel to 2.23.3 * remove prerelease flag --------- Co-authored-by: Ralf Gommers <ralf.gommers@gmail.com>
1 parent 4d42cd8 commit 4e5237d

File tree

3 files changed

+3
-19
lines changed

3 files changed

+3
-19
lines changed

.github/workflows/wheels.yml

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -102,11 +102,6 @@ jobs:
102102
- [windows-2022, win_amd64]
103103
# TODO: support PyPy?
104104
python: [["cp39", "3.9"], ["cp310", "3.10"], ["cp311", "3.11"], ["cp312", "3.12"], ["cp313", "3.13"], ["cp313t", "3.13"]]
105-
include:
106-
# TODO: Remove this plus installing build deps in cibw_before_build.sh
107-
# after pandas can be built with a released NumPy/Cython
108-
- python: ["cp313t", "3.13"]
109-
cibw_build_frontend: 'pip; args: --no-build-isolation'
110105
# TODO: Build free-threaded wheels for Windows
111106
exclude:
112107
- buildplat: [windows-2022, win_amd64]
@@ -152,11 +147,10 @@ jobs:
152147
run: echo "sdist_name=$(cd ./dist && ls -d */)" >> "$GITHUB_ENV"
153148

154149
- name: Build wheels
155-
uses: pypa/cibuildwheel@v2.21.3
150+
uses: pypa/cibuildwheel@v2.23.3
156151
with:
157152
package-dir: ./dist/${{ startsWith(matrix.buildplat[1], 'macosx') && env.sdist_name || needs.build_sdist.outputs.sdist_file }}
158153
env:
159-
CIBW_PRERELEASE_PYTHONS: True
160154
CIBW_BUILD: ${{ matrix.python[0] }}-${{ matrix.buildplat[1] }}
161155
CIBW_BUILD_FRONTEND: ${{ matrix.cibw_build_frontend || 'pip' }}
162156

pyproject.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -161,11 +161,11 @@ test-command = """
161161
pd.test(extra_args=["-m not clipboard and not single_cpu and not slow and not network and not db", "-n 2", "--no-strict-data-files"]); \
162162
pd.test(extra_args=["-m not clipboard and single_cpu and not slow and not network and not db", "--no-strict-data-files"]);' \
163163
"""
164-
free-threaded-support = true
164+
enable = ["cpython-freethreading"]
165165
before-build = "PACKAGE_DIR={package} bash {package}/scripts/cibw_before_build.sh"
166166

167167
[tool.cibuildwheel.windows]
168-
before-build = "pip install delvewheel && bash {package}/scripts/cibw_before_build.sh"
168+
before-build = "pip install delvewheel"
169169
repair-wheel-command = "delvewheel repair -w {dest_dir} {wheel}"
170170

171171
[[tool.cibuildwheel.overrides]]

scripts/cibw_before_build.sh

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,3 @@
22
for file in $PACKAGE_DIR/LICENSES/*; do
33
cat $file >> $PACKAGE_DIR/LICENSE
44
done
5-
6-
# TODO: Delete when there's a PyPI Cython release that supports free-threaded Python 3.13.
7-
FREE_THREADED_BUILD="$(python -c"import sysconfig; print(bool(sysconfig.get_config_var('Py_GIL_DISABLED')))")"
8-
if [[ $FREE_THREADED_BUILD == "True" ]]; then
9-
python -m pip install -U pip
10-
# python -m pip install -i https://pypi.anaconda.org/scientific-python-nightly-wheels/simple cython
11-
# TODO: Remove below and uncomment above once https://github.com/cython/cython/pull/6717 no longer breaks tests
12-
python -m pip install git+https://github.com/cython/cython.git@3276b588720a053c78488e5de788605950f4b136
13-
python -m pip install ninja meson-python versioneer[toml] numpy
14-
fi

0 commit comments

Comments
 (0)