Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Appearance settings

Commit 8081658

Browse filesBrowse files
committed
Simplify everything and just use --pre, also remove pre install of NumPy?
1 parent b2f32ac commit 8081658
Copy full SHA for 8081658

File tree

Expand file treeCollapse file tree

1 file changed

+13
-27
lines changed
Filter options
Expand file treeCollapse file tree

1 file changed

+13
-27
lines changed

‎.github/workflows/cibuildwheel.yml

Copy file name to clipboardExpand all lines: .github/workflows/cibuildwheel.yml
+13-27Lines changed: 13 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -90,35 +90,21 @@ jobs:
9090
name: Build wheels on ${{ matrix.os }} for ${{ matrix.cibw_archs }}
9191
runs-on: ${{ matrix.os }}
9292
env:
93-
# The following commands branch based on whether we are on the main
94-
# branch or have a PR into main. For these, we use the NumPy 2.0
95-
# nightlies to ensure future C-API/ABI compatibility.
96-
# This branching becomes unnecessary when NumPy 2.0 is released.
97-
# When using no-build-isolation we need to install all requirements.
98-
CIBW_BEFORE_BUILD:
99-
${{ (((github.event_name == 'push' && github.ref == 'refs/heads/main') ||
100-
(github.event_name == 'pull_request' && github.base_ref == 'refs/heads/main')) &&
101-
'pip install meson-python pybind11 setuptools_scm "setuptools>=64" ninja &&
102-
pip install "numpy>=2.0.0.dev0" --extra-index-url "https://pypi.anaconda.org/scientific-python-nightly-wheels/simple" &&
103-
rm -rf {package}/build'
104-
) ||
105-
'pip install "numpy>=1.25" &&
106-
rm -rf {package}/build'
107-
}}
108-
CIBW_BEFORE_BUILD_WINDOWS:
109-
${{ (((github.event_name == 'push' && github.ref == 'refs/heads/main') ||
110-
(github.event_name == 'pull_request' && github.base_ref == 'refs/heads/main')) &&
111-
'pip install delvewheel meson-python pybind11 setuptools_scm "setuptools>=64" ninja &&
112-
pip install "numpy>=2.0.0.dev0" --extra-index-url "https://pypi.anaconda.org/scientific-python-nightly-wheels/simple" &&
113-
rm -rf {package}/build'
114-
) ||
115-
'pip install delvewheel "numpy>=1.25" &&
116-
rm -rf {package}/build'
117-
}}
93+
CIBW_BEFORE_BUILD: >-
94+
rm -rf {package}/build
95+
CIBW_BEFORE_BUILD_WINDOWS: >-
96+
pip install delvewheel &&
97+
rm -rf {package}/build
98+
# Live on the edge when building on main or a PR against main since
99+
# these wheels are also used for nightlies and NumPy 2.0 transition
100+
# requires using the NumPy 2.0 nightlies for compatibility.
101+
# If using all `--pre` releases creates issues, the NumPy wheel can be
102+
# istalled more targeted.
118103
CIBW_BUILD_FRONTEND: >-
119-
${{ (((github.event_name == 'push' && github.ref == 'refs/heads/main') ||
104+
${{ (((github.event_name == 'main' && github.ref == 'refs/heads/main') ||
120105
(github.event_name == 'pull_request' && github.base_ref == 'refs/heads/main')) &&
121-
'pip; args: --no-build-isolation') || 'build' }}
106+
'pip; args: --pre --extra-index-url "https://pypi.anaconda.org/scientific-python-nightly-wheels/simple"') ||
107+
'build' }}
122108
CIBW_REPAIR_WHEEL_COMMAND_WINDOWS: >-
123109
delvewheel repair -w {dest_dir} {wheel}
124110
CIBW_AFTER_BUILD: >-

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.