Skip to content

Commit 5cc8069

Browse files
authored
Merge pull request #255 from ngoldbaum/fix-build-deps
Add build dependency on cmake and numpy 2.4
2 parents ace8f05 + a218a9a commit 5cc8069

4 files changed

Lines changed: 10 additions & 25 deletions

File tree

.github/workflows/build_docs.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ jobs:
2727
- name: Build quaddtype package
2828
run: |
2929
cd quaddtype/
30-
python -m pip install . -v --no-build-isolation
30+
python -m pip install . -v
3131
- name: Build Sphinx documentation
3232
run: |
3333
cd quaddtype/

.github/workflows/build_wheels.yml

Lines changed: 6 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -39,16 +39,12 @@ jobs:
3939
CIBW_BEFORE_ALL: |
4040
yum update -y
4141
yum install -y cmake gcc gcc-c++ make git pkgconfig
42-
CIBW_BEFORE_BUILD: |
43-
pip install meson>=1.3.2 meson-python>=0.18.0 wheel ninja
44-
pip install --pre --upgrade --timeout=60 --extra-index-url https://pypi.anaconda.org/scientific-python-nightly-wheels/simple numpy
45-
CIBW_BUILD_FRONTEND: "pip; args: --no-build-isolation"
4642
CIBW_ENVIRONMENT: >
4743
LDFLAGS="-fopenmp"
4844
CIBW_REPAIR_WHEEL_COMMAND: |
4945
auditwheel repair -w {dest_dir} --plat manylinux_2_28_x86_64 {wheel}
5046
CIBW_TEST_COMMAND: |
51-
pip install --pre --upgrade --extra-index-url https://pypi.anaconda.org/scientific-python-nightly-wheels/simple numpy
47+
pip install numpy
5248
pip install --no-deps {wheel}
5349
pip install pytest pytest-run-parallel
5450
if python -c "import sys; exit(0 if hasattr(sys, '_is_gil_enabled') and not sys._is_gil_enabled() else 1)"; then
@@ -103,16 +99,12 @@ jobs:
10399
CIBW_ENABLE: cpython-prerelease cpython-freethreading
104100
# CIBW_ARCHS_MACOS: ${{ matrix.os == 'macos-13' && 'x86_64' || 'arm64' }}
105101
CIBW_BUILD_VERBOSITY: "3"
106-
CIBW_BEFORE_BUILD: |
107-
pip install meson>=1.3.2 meson-python>=0.18.0 wheel ninja
108-
pip install --pre --upgrade --timeout=60 --extra-index-url https://pypi.anaconda.org/scientific-python-nightly-wheels/simple numpy
109-
CIBW_BUILD_FRONTEND: "pip; args: --no-build-isolation"
110102
CIBW_ENVIRONMENT: >
111103
MACOSX_DEPLOYMENT_TARGET="${{ matrix.os == 'macos-14' && '14.0' || '15.0' }}"
112104
CIBW_REPAIR_WHEEL_COMMAND: >
113105
delocate-wheel --require-archs {delocate_archs} -w {dest_dir} -v {wheel}
114106
CIBW_TEST_COMMAND: |
115-
pip install --pre --upgrade --extra-index-url https://pypi.anaconda.org/scientific-python-nightly-wheels/simple numpy
107+
pip install numpy
116108
pip install --no-deps {wheel}
117109
pip install pytest pytest-run-parallel
118110
if python -c "import sys; exit(0 if hasattr(sys, '_is_gil_enabled') and not sys._is_gil_enabled() else 1)"; then
@@ -169,15 +161,11 @@ jobs:
169161
CIBW_BUILD_VERBOSITY: "3"
170162
DISTUTILS_USE_SDK: "1"
171163
MSSdk: "1"
172-
CIBW_BEFORE_BUILD: >-
173-
pip install meson meson-python ninja wheel &&
174-
pip install --pre --upgrade --timeout=60 --extra-index-url https://pypi.anaconda.org/scientific-python-nightly-wheels/simple numpy
175-
CIBW_BUILD_FRONTEND: "pip; args: --no-build-isolation"
176164
CIBW_ENVIRONMENT: >
177165
CFLAGS="/DDISABLE_QUADBLAS $CFLAGS"
178166
CXXFLAGS="/DDISABLE_QUADBLAS $CXXFLAGS"
179167
CIBW_REPAIR_WHEEL_COMMAND: 'delvewheel repair -w {dest_dir} {wheel} --add-path C:\sleef\bin'
180-
CIBW_TEST_COMMAND_WINDOWS: pip install --pre --upgrade --extra-index-url https://pypi.anaconda.org/scientific-python-nightly-wheels/simple numpy && pip install --no-deps {wheel} && pip install pytest pytest-run-parallel && pytest -s {project}/tests
168+
CIBW_TEST_COMMAND_WINDOWS: pip install numpy && pip install --no-deps {wheel} && pip install pytest pytest-run-parallel && pytest -s {project}/tests
181169
CIBW_TEST_EXTRAS: test
182170
shell: pwsh
183171
run: |
@@ -208,16 +196,14 @@ jobs:
208196
209197
- name: Install build dependencies
210198
run: |
211-
python -m pip install --upgrade pip
212-
python -m pip install build pytest meson meson-python wheel ninja
213-
python -m pip install --pre --upgrade --timeout=60 --extra-index-url https://pypi.anaconda.org/scientific-python-nightly-wheels/simple numpy
199+
python -m pip install --upgrade pip build
214200
215201
- name: Build SDist & test sdist
216202
env:
217203
LDFLAGS: "-fopenmp"
218204
run: |
219-
python -m build --sdist --no-isolation --outdir dist/
220-
pip install --no-build-isolation "$(ls dist/*.tar.gz)"[test] -v
205+
python -m build --sdist --outdir dist/
206+
pip install "$(ls dist/*.tar.gz)"[test] -v
221207
pytest -s tests
222208
working-directory: ./quaddtype
223209

.github/workflows/typecheck.yml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,9 +30,7 @@ jobs:
3030
- name: install
3131
working-directory: quaddtype
3232
run: |
33-
uv pip install --pre --extra-index-url https://pypi.anaconda.org/scientific-python-nightly-wheels/simple numpy
34-
uv pip install meson>=1.3.2 meson-python wheel ninja
35-
uv pip install mypy pyright . --no-build-isolation
33+
uv pip install mypy pyright .
3634
3735
- name: pyright
3836
working-directory: quaddtype

quaddtype/pyproject.toml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,8 @@ requires = [
33
"meson>=1.3.2",
44
"meson-python>=0.18.0",
55
"wheel",
6-
"numpy>=2.0"
6+
"cmake",
7+
"numpy>=2.4"
78
]
89
build-backend = "mesonpy"
910

0 commit comments

Comments
 (0)