Skip to content

Commit d924005

Browse files
committed
MAINT: PR 21362 revisions [wheel build]
* Revert some commits related to `setuptools` breakage. See gh-21416. [wheel build]
1 parent b901a4e commit d924005

File tree

2 files changed

+11
-12
lines changed

2 files changed

+11
-12
lines changed

.github/workflows/wheels.yml

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -189,22 +189,22 @@ jobs:
189189
# For dev versions of python need to use wheels from scientific-python-nightly-wheels
190190
# When the python version is released please comment out this section, but do not remove
191191
# (there will soon be another dev version to target).
192-
#DEPS0="pip install -U --pre numpy>=2.1.0rc1"
193-
#DEPS1="pip install ninja meson-python pybind11 pythran cython"
192+
DEPS0="pip install -U --pre numpy>=2.1.0rc1"
193+
DEPS1="pip install ninja meson-python pybind11 pythran cython"
194194
195-
#CIBW="$DEPS0;$DEPS1;bash {project}/tools/wheels/cibw_before_build_linux.sh {project}"
196-
#echo "CIBW_BEFORE_BUILD_LINUX=$CIBW" >> "$GITHUB_ENV"
195+
CIBW="$DEPS0;$DEPS1;bash {project}/tools/wheels/cibw_before_build_linux.sh {project}"
196+
echo "CIBW_BEFORE_BUILD_LINUX=$CIBW" >> "$GITHUB_ENV"
197197
198-
#CIBW="$DEPS0 && $DEPS1 && bash {project}/tools/wheels/cibw_before_build_win.sh {project}"
199-
#echo "CIBW_BEFORE_BUILD_WINDOWS=$CIBW" >> "$GITHUB_ENV"
198+
CIBW="$DEPS0 && $DEPS1 && bash {project}/tools/wheels/cibw_before_build_win.sh {project}"
199+
echo "CIBW_BEFORE_BUILD_WINDOWS=$CIBW" >> "$GITHUB_ENV"
200200
201-
#CIBW="$DEPS0;$DEPS1;bash {project}/tools/wheels/cibw_before_build_macos.sh {project}"
202-
#echo "CIBW_BEFORE_BUILD_MACOS=$CIBW" >> "$GITHUB_ENV"
201+
CIBW="$DEPS0;$DEPS1;bash {project}/tools/wheels/cibw_before_build_macos.sh {project}"
202+
echo "CIBW_BEFORE_BUILD_MACOS=$CIBW" >> "$GITHUB_ENV"
203203
204-
#echo "CIBW_BEFORE_TEST=$DEPS0" >> "$GITHUB_ENV"
204+
echo "CIBW_BEFORE_TEST=$DEPS0" >> "$GITHUB_ENV"
205205
206-
#CIBW="pip; args: --no-build-isolation"
207-
#echo "CIBW_BUILD_FRONTEND=$CIBW" >> "$GITHUB_ENV"
206+
CIBW="pip; args: --no-build-isolation"
207+
echo "CIBW_BUILD_FRONTEND=$CIBW" >> "$GITHUB_ENV"
208208
209209
- name: Build wheels
210210
uses: pypa/cibuildwheel@v2.20.0

pyproject.toml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@ requires = [
2828
# The upper bound on pythran is pre-emptive only; 0.16.1
2929
# is released/working at time of writing.
3030
"pythran>=0.14.0,<0.17.0",
31-
"setuptools<73.0.0", # hack to work around gh-21416
3231

3332
# numpy requirement for wheel builds for distribution on PyPI - building
3433
# against 2.x yields wheels that are also compatible with numpy 1.x at

0 commit comments

Comments
 (0)