Skip to content

Commit 6864d79

Browse files
rgommersjorisvandenbossche
authored andcommitted
CI: clean up wheel build workarounds now that Cython 3.1.0 is out (pandas-dev#61446)
1 parent 7096342 commit 6864d79

File tree

3 files changed

+2
-17
lines changed

3 files changed

+2
-17
lines changed

.github/workflows/wheels.yml

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -101,11 +101,6 @@ jobs:
101101
- [windows-2022, win_amd64]
102102
# TODO: support PyPy?
103103
python: [["cp310", "3.10"], ["cp311", "3.11"], ["cp312", "3.12"], ["cp313", "3.13"], ["cp313t", "3.13"]]
104-
include:
105-
# TODO: Remove this plus installing build deps in cibw_before_build.sh
106-
# after pandas can be built with a released NumPy/Cython
107-
- python: ["cp313t", "3.13"]
108-
cibw_build_frontend: 'pip; args: --no-build-isolation'
109104
# TODO: Build free-threaded wheels for Windows
110105
exclude:
111106
- buildplat: [windows-2022, win_amd64]

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)