Skip to content

Commit

Permalink
CI: fix Windows wheels, clean up cp313/cp313t build config
Browse files Browse the repository at this point in the history
  • Loading branch information
rgommers committed Nov 1, 2024
1 parent 0a14d9c commit 5511116
Showing 1 changed file with 5 additions and 16 deletions.
21 changes: 5 additions & 16 deletions .github/workflows/wheel_tests_and_release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -49,9 +49,8 @@ jobs:
if: ${{ matrix.cibw_python }} == "cp313t"
run: |
PYPI_URL="https://pypi.anaconda.org/scientific-python-nightly-wheels/simple"
CIBW_DEPS="pip install --upgrade pip build &&\
pip install --pre -i $PYPI_URL cython numpy scipy &&\
pip install pytest meson-python ninja"
CIBW_DEPS="pip install --pre -i $PYPI_URL cython scipy &&\
pip install numpy pytest meson-python ninja"
NO_BUILD_ISOLATION="pip; args: --no-build-isolation"
echo "CIBW_BEFORE_BUILD=$CIBW_DEPS" >> "$GITHUB_ENV"
echo "CIBW_BEFORE_TEST=$CIBW_DEPS" >> "$GITHUB_ENV"
Expand Down Expand Up @@ -95,14 +94,6 @@ jobs:
with:
platforms: arm64

- name: Install test dep; set CIBW environment variables
# Can be removed once numpy 2.1.0 is released
if: ${{ matrix.cibw_python }} == "cp313"
run: |
PYPI_URL="https://pypi.anaconda.org/scientific-python-nightly-wheels/simple"
CIBW_DEPS="pip install --pre -i $PYPI_URL numpy"
echo "CIBW_BEFORE_TEST=$CIBW_DEPS" >> "$GITHUB_ENV"
- name: Build the wheel
uses: pypa/cibuildwheel@7940a4c0e76eb2030e473a5f864f291f63ee879b # v2.21.3
with:
Expand Down Expand Up @@ -149,9 +140,8 @@ jobs:
if: ${{ matrix.cibw_python }} == "cp313t"
run: |
PYPI_URL="https://pypi.anaconda.org/scientific-python-nightly-wheels/simple"
CIBW_DEPS="pip install --upgrade pip build &&\
pip install --pre -i $PYPI_URL cython numpy scipy &&\
pip install pytest meson-python ninja"
CIBW_DEPS="pip install --pre -i $PYPI_URL cython scipy &&\
pip install numpy pytest meson-python ninja"
NO_BUILD_ISOLATION="pip; args: --no-build-isolation"
echo "CIBW_BEFORE_BUILD=$CIBW_DEPS" >> "$GITHUB_ENV"
echo "CIBW_BEFORE_TEST=$CIBW_DEPS" >> "$GITHUB_ENV"
Expand Down Expand Up @@ -218,8 +208,7 @@ jobs:
shell: bash -el {0}
run: |
PYPI_URL="https://pypi.anaconda.org/scientific-python-nightly-wheels/simple"
CIBW_DEPS="pip install --upgrade pip build &&\
pip install --pre -i $PYPI_URL cython numpy &&\
CIBW_DEPS="pip install --pre -i $PYPI_URL cython numpy &&\
pip install pytest meson-python ninja"
NO_BUILD_ISOLATION="pip; args: --no-build-isolation"
echo "CIBW_BEFORE_BUILD=$CIBW_DEPS" >> "$GITHUB_ENV"
Expand Down

0 comments on commit 5511116

Please sign in to comment.