Skip to content

Commit 17f0dd6

Browse files
authored
CI: clean up wheel build workarounds now that Cython 3.1.0 is out (#61446)
1 parent 341f161 commit 17f0dd6

File tree

6 files changed

+2
-31
lines changed

6 files changed

+2
-31
lines changed

.gitattributes

-2
Original file line numberDiff line numberDiff line change
@@ -84,5 +84,3 @@ pandas/tests/io/parser/data export-ignore
8484

8585
# Include cibw script in sdist since it's needed for building wheels
8686
scripts/cibw_before_build.sh -export-ignore
87-
scripts/cibw_before_build_windows.sh -export-ignore
88-
scripts/cibw_before_test_windows.sh -export-ignore

.github/workflows/wheels.yml

-4
Original file line numberDiff line numberDiff line change
@@ -102,10 +102,6 @@ jobs:
102102
# TODO: support PyPy?
103103
python: [["cp310", "3.10"], ["cp311", "3.11"], ["cp312", "3.12"], ["cp313", "3.13"], ["cp313t", "3.13"]]
104104
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'
109105
# Build Pyodide wheels and upload them to Anaconda.org
110106
# NOTE: this job is similar to the one in unit-tests.yml except for the fact
111107
# that it uses cibuildwheel instead of a standard Pyodide xbuildenv setup.

MANIFEST.in

-2
Original file line numberDiff line numberDiff line change
@@ -65,5 +65,3 @@ graft pandas/_libs/include
6565

6666
# Include cibw script in sdist since it's needed for building wheels
6767
include scripts/cibw_before_build.sh
68-
include scripts/cibw_before_build_windows.sh
69-
include scripts/cibw_before_test_windows.sh

pyproject.toml

+2-2
Original file line numberDiff line numberDiff line change
@@ -154,12 +154,12 @@ test-command = """
154154
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"]); \
155155
pd.test(extra_args=["-m not clipboard and single_cpu and not slow and not network and not db", "--no-strict-data-files"]);' \
156156
"""
157-
free-threaded-support = true
157+
enable = ["cpython-freethreading"]
158158
before-build = "PACKAGE_DIR={package} bash {package}/scripts/cibw_before_build.sh"
159159

160160
[tool.cibuildwheel.windows]
161161
environment = {}
162-
before-build = "pip install delvewheel && bash {package}/scripts/cibw_before_build_windows.sh"
162+
before-build = "pip install delvewheel"
163163
test-command = """
164164
set PANDAS_CI='1' && \
165165
python -c "import pandas as pd; \

scripts/cibw_before_build.sh

-8
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,3 @@
33
for file in $PACKAGE_DIR/LICENSES/*; do
44
cat $file >> $PACKAGE_DIR/LICENSE
55
done
6-
7-
# TODO: Delete when there's a PyPI Cython release that supports free-threaded Python 3.13.
8-
FREE_THREADED_BUILD="$(python -c"import sysconfig; print(bool(sysconfig.get_config_var('Py_GIL_DISABLED')))")"
9-
if [[ $FREE_THREADED_BUILD == "True" ]]; then
10-
python -m pip install -U pip
11-
python -m pip install -i https://pypi.anaconda.org/scientific-python-nightly-wheels/simple cython
12-
python -m pip install numpy ninja meson-python versioneer[toml]
13-
fi

scripts/cibw_before_build_windows.sh

-13
This file was deleted.

0 commit comments

Comments
 (0)