Skip to content

Commit 9bc8839

Browse files
committed
BLD: bump minimum Meson version to 1.5.0
This is needed for the dependency fix in the previous commit, and it also allows some further cleanup since `custom_target` and `generator` now allow passing in a `CustomTargetIndex`.
1 parent a4227c0 commit 9bc8839

File tree

4 files changed

+5
-26
lines changed

4 files changed

+5
-26
lines changed

.github/workflows/windows_intel_oneAPI.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ jobs:
5757

5858
- name: Install packages from conda
5959
run: |
60-
conda install -c conda-forge pkg-config meson=1.4.0 meson-python=0.16.0 ninja openblas libblas=*=*openblas numpy==2.0 cython pybind11 pytest pytest-xdist pytest-timeout pytest-fail-slow pooch rich-click click doit pydevtool hypothesis
60+
conda install -c conda-forge pkg-config meson meson-python ninja openblas libblas=*=*openblas numpy==2.0 cython pybind11 pytest pytest-xdist pytest-timeout pytest-fail-slow pooch rich-click click doit pydevtool hypothesis
6161
6262
- name: cache install
6363
id: cache-install

meson.build

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ project(
66
# tools/version_utils.py
77
version: '1.15.0.dev0',
88
license: 'BSD-3',
9-
meson_version: '>= 1.1.0',
9+
meson_version: '>= 1.5.0',
1010
default_options: [
1111
'buildtype=debugoptimized',
1212
'b_ndebug=if-release',

scipy/_build_utils/echo.py

Lines changed: 0 additions & 12 deletions
This file was deleted.

scipy/linalg/meson.build

Lines changed: 3 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -25,18 +25,7 @@ cython_linalg = custom_target('cython_linalg',
2525
install_dir: py3.get_install_dir() / 'scipy/linalg',
2626
install_tag: 'devel'
2727
)
28-
29-
# This dummy custom target is only needed to establish a dependency on
30-
# cython_linalg in a generator below. Adding that dependency directly yields
31-
# warnings about multiple outputs. And using `depends: cython_linalg[2]` does
32-
# not work, because that generator depends does not accept CustomTargetIndex,
33-
# only CustomTarget. See https://github.com/mesonbuild/meson/issues/9837
34-
_echo = find_program('../_build_utils/echo.py')
35-
cython_blas_pxd = custom_target(
36-
output: '_dummy_cython_blas.pxd',
37-
input: cython_linalg[2],
38-
command: [_echo, '@INPUT@'],
39-
)
28+
cython_blas_pxd = cython_linalg[2]
4029

4130
# pyx -> c, pyx -> cpp generators, depending on __init__.py here.
4231
linalg_init_cython_gen = generator(cython,
@@ -284,6 +273,8 @@ py3.install_sources(
284273
# cython_linalg[2], # cython_blas.pxd
285274
# cython_linalg[3], # cython_lapack.pxd
286275
#]
276+
#py.install_sources(pxd_files)
277+
287278
#custom_target('cython_blas_lapack_pxd',
288279
# input : pxd_files,
289280
# output : ['cython_blas2.pxd', 'cython_lapack2.pxd'],

0 commit comments

Comments
 (0)