scipy v1.14.1 (#282)

automerged PR by conda-forge/automerge-action
conda-forge · Aug 22, 2024 · 9a03cf2 · 9a03cf2
2 parents c05bc7c + cbdfc15
commit 9a03cf2
Show file tree

Hide file tree

Showing 18 changed files with 63 additions and 101 deletions.
diff --git a/.ci_support/linux_64_numpy2.0python3.10.____cpythonpython_implcpython.yaml b/.ci_support/linux_64_numpy2.0python3.10.____cpythonpython_implcpython.yaml
@@ -1,7 +1,7 @@
 c_compiler:
 - gcc
 c_compiler_version:
-- '12'
+- '13'
 c_stdlib:
 - sysroot
 c_stdlib_version:
@@ -15,13 +15,13 @@ channel_targets:
 cxx_compiler:
 - gxx
 cxx_compiler_version:
-- '12'
+- '13'
 docker_image:
 - quay.io/condaforge/linux-anvil-cos7-x86_64
 fortran_compiler:
 - gfortran
 fortran_compiler_version:
-- '12'
+- '13'
 libblas:
 - 3.9 *netlib
 libcblas:

diff --git a/.ci_support/linux_64_numpy2.0python3.11.____cpythonpython_implcpython.yaml b/.ci_support/linux_64_numpy2.0python3.11.____cpythonpython_implcpython.yaml
@@ -1,7 +1,7 @@
 c_compiler:
 - gcc
 c_compiler_version:
-- '12'
+- '13'
 c_stdlib:
 - sysroot
 c_stdlib_version:
@@ -15,13 +15,13 @@ channel_targets:
 cxx_compiler:
 - gxx
 cxx_compiler_version:
-- '12'
+- '13'
 docker_image:
 - quay.io/condaforge/linux-anvil-cos7-x86_64
 fortran_compiler:
 - gfortran
 fortran_compiler_version:
-- '12'
+- '13'
 libblas:
 - 3.9 *netlib
 libcblas:

diff --git a/.ci_support/linux_64_numpy2.0python3.12.____cpythonpython_implcpython.yaml b/.ci_support/linux_64_numpy2.0python3.12.____cpythonpython_implcpython.yaml
@@ -1,7 +1,7 @@
 c_compiler:
 - gcc
 c_compiler_version:
-- '12'
+- '13'
 c_stdlib:
 - sysroot
 c_stdlib_version:
@@ -15,13 +15,13 @@ channel_targets:
 cxx_compiler:
 - gxx
 cxx_compiler_version:
-- '12'
+- '13'
 docker_image:
 - quay.io/condaforge/linux-anvil-cos7-x86_64
 fortran_compiler:
 - gfortran
 fortran_compiler_version:
-- '12'
+- '13'
 libblas:
 - 3.9 *netlib
 libcblas:

diff --git a/.ci_support/linux_aarch64_numpy2.0python3.10.____cpythonpython_implcpython.yaml b/.ci_support/linux_aarch64_numpy2.0python3.10.____cpythonpython_implcpython.yaml
@@ -3,7 +3,7 @@ BUILD:
 c_compiler:
 - gcc
 c_compiler_version:
-- '12'
+- '13'
 c_stdlib:
 - sysroot
 c_stdlib_version:
@@ -19,13 +19,13 @@ channel_targets:
 cxx_compiler:
 - gxx
 cxx_compiler_version:
-- '12'
+- '13'
 docker_image:
 - quay.io/condaforge/linux-anvil-cos7-x86_64
 fortran_compiler:
 - gfortran
 fortran_compiler_version:
-- '12'
+- '13'
 libblas:
 - 3.9 *netlib
 libcblas:

diff --git a/.ci_support/linux_aarch64_numpy2.0python3.11.____cpythonpython_implcpython.yaml b/.ci_support/linux_aarch64_numpy2.0python3.11.____cpythonpython_implcpython.yaml
@@ -3,7 +3,7 @@ BUILD:
 c_compiler:
 - gcc
 c_compiler_version:
-- '12'
+- '13'
 c_stdlib:
 - sysroot
 c_stdlib_version:
@@ -19,13 +19,13 @@ channel_targets:
 cxx_compiler:
 - gxx
 cxx_compiler_version:
-- '12'
+- '13'
 docker_image:
 - quay.io/condaforge/linux-anvil-cos7-x86_64
 fortran_compiler:
 - gfortran
 fortran_compiler_version:
-- '12'
+- '13'
 libblas:
 - 3.9 *netlib
 libcblas:

diff --git a/.ci_support/linux_aarch64_numpy2.0python3.12.____cpythonpython_implcpython.yaml b/.ci_support/linux_aarch64_numpy2.0python3.12.____cpythonpython_implcpython.yaml
@@ -3,7 +3,7 @@ BUILD:
 c_compiler:
 - gcc
 c_compiler_version:
-- '12'
+- '13'
 c_stdlib:
 - sysroot
 c_stdlib_version:
@@ -19,13 +19,13 @@ channel_targets:
 cxx_compiler:
 - gxx
 cxx_compiler_version:
-- '12'
+- '13'
 docker_image:
 - quay.io/condaforge/linux-anvil-cos7-x86_64
 fortran_compiler:
 - gfortran
 fortran_compiler_version:
-- '12'
+- '13'
 libblas:
 - 3.9 *netlib
 libcblas:

diff --git a/.ci_support/linux_ppc64le_numpy2.0python3.10.____cpythonpython_implcpython.yaml b/.ci_support/linux_ppc64le_numpy2.0python3.10.____cpythonpython_implcpython.yaml
@@ -1,7 +1,7 @@
 c_compiler:
 - gcc
 c_compiler_version:
-- '12'
+- '13'
 c_stdlib:
 - sysroot
 c_stdlib_version:
@@ -15,13 +15,13 @@ channel_targets:
 cxx_compiler:
 - gxx
 cxx_compiler_version:
-- '12'
+- '13'
 docker_image:
 - quay.io/condaforge/linux-anvil-cos7-x86_64
 fortran_compiler:
 - gfortran
 fortran_compiler_version:
-- '12'
+- '13'
 libblas:
 - 3.9 *netlib
 libcblas:

diff --git a/.ci_support/linux_ppc64le_numpy2.0python3.11.____cpythonpython_implcpython.yaml b/.ci_support/linux_ppc64le_numpy2.0python3.11.____cpythonpython_implcpython.yaml
@@ -1,7 +1,7 @@
 c_compiler:
 - gcc
 c_compiler_version:
-- '12'
+- '13'
 c_stdlib:
 - sysroot
 c_stdlib_version:
@@ -15,13 +15,13 @@ channel_targets:
 cxx_compiler:
 - gxx
 cxx_compiler_version:
-- '12'
+- '13'
 docker_image:
 - quay.io/condaforge/linux-anvil-cos7-x86_64
 fortran_compiler:
 - gfortran
 fortran_compiler_version:
-- '12'
+- '13'
 libblas:
 - 3.9 *netlib
 libcblas:

diff --git a/.ci_support/linux_ppc64le_numpy2.0python3.12.____cpythonpython_implcpython.yaml b/.ci_support/linux_ppc64le_numpy2.0python3.12.____cpythonpython_implcpython.yaml
@@ -1,7 +1,7 @@
 c_compiler:
 - gcc
 c_compiler_version:
-- '12'
+- '13'
 c_stdlib:
 - sysroot
 c_stdlib_version:
@@ -15,13 +15,13 @@ channel_targets:
 cxx_compiler:
 - gxx
 cxx_compiler_version:
-- '12'
+- '13'
 docker_image:
 - quay.io/condaforge/linux-anvil-cos7-x86_64
 fortran_compiler:
 - gfortran
 fortran_compiler_version:
-- '12'
+- '13'
 libblas:
 - 3.9 *netlib
 libcblas:

diff --git a/.ci_support/osx_64_numpy2.0python3.10.____cpythonpython_implcpython.yaml b/.ci_support/osx_64_numpy2.0python3.10.____cpythonpython_implcpython.yaml
@@ -5,7 +5,7 @@ MACOSX_SDK_VERSION:
 c_compiler:
 - clang
 c_compiler_version:
-- '16'
+- '17'
 c_stdlib:
 - macosx_deployment_target
 c_stdlib_version:
@@ -17,11 +17,11 @@ channel_targets:
 cxx_compiler:
 - clangxx
 cxx_compiler_version:
-- '16'
+- '17'
 fortran_compiler:
 - gfortran
 fortran_compiler_version:
-- '12'
+- '13'
 libblas:
 - 3.9 *netlib
 libcblas:

diff --git a/.ci_support/osx_64_numpy2.0python3.11.____cpythonpython_implcpython.yaml b/.ci_support/osx_64_numpy2.0python3.11.____cpythonpython_implcpython.yaml
@@ -5,7 +5,7 @@ MACOSX_SDK_VERSION:
 c_compiler:
 - clang
 c_compiler_version:
-- '16'
+- '17'
 c_stdlib:
 - macosx_deployment_target
 c_stdlib_version:
@@ -17,11 +17,11 @@ channel_targets:
 cxx_compiler:
 - clangxx
 cxx_compiler_version:
-- '16'
+- '17'
 fortran_compiler:
 - gfortran
 fortran_compiler_version:
-- '12'
+- '13'
 libblas:
 - 3.9 *netlib
 libcblas:

diff --git a/.ci_support/osx_64_numpy2.0python3.12.____cpythonpython_implcpython.yaml b/.ci_support/osx_64_numpy2.0python3.12.____cpythonpython_implcpython.yaml
@@ -5,7 +5,7 @@ MACOSX_SDK_VERSION:
 c_compiler:
 - clang
 c_compiler_version:
-- '16'
+- '17'
 c_stdlib:
 - macosx_deployment_target
 c_stdlib_version:
@@ -17,11 +17,11 @@ channel_targets:
 cxx_compiler:
 - clangxx
 cxx_compiler_version:
-- '16'
+- '17'
 fortran_compiler:
 - gfortran
 fortran_compiler_version:
-- '12'
+- '13'
 libblas:
 - 3.9 *netlib
 libcblas:

diff --git a/.ci_support/osx_arm64_numpy2.0python3.10.____cpython.yaml b/.ci_support/osx_arm64_numpy2.0python3.10.____cpython.yaml
@@ -5,7 +5,7 @@ MACOSX_SDK_VERSION:
 c_compiler:
 - clang
 c_compiler_version:
-- '16'
+- '17'
 c_stdlib:
 - macosx_deployment_target
 c_stdlib_version:
@@ -17,11 +17,11 @@ channel_targets:
 cxx_compiler:
 - clangxx
 cxx_compiler_version:
-- '16'
+- '17'
 fortran_compiler:
 - gfortran
 fortran_compiler_version:
-- '12'
+- '13'
 libblas:
 - 3.9 *netlib
 libcblas:

diff --git a/.ci_support/osx_arm64_numpy2.0python3.11.____cpython.yaml b/.ci_support/osx_arm64_numpy2.0python3.11.____cpython.yaml
@@ -5,7 +5,7 @@ MACOSX_SDK_VERSION:
 c_compiler:
 - clang
 c_compiler_version:
-- '16'
+- '17'
 c_stdlib:
 - macosx_deployment_target
 c_stdlib_version:
@@ -17,11 +17,11 @@ channel_targets:
 cxx_compiler:
 - clangxx
 cxx_compiler_version:
-- '16'
+- '17'
 fortran_compiler:
 - gfortran
 fortran_compiler_version:
-- '12'
+- '13'
 libblas:
 - 3.9 *netlib
 libcblas:

diff --git a/.ci_support/osx_arm64_numpy2.0python3.12.____cpython.yaml b/.ci_support/osx_arm64_numpy2.0python3.12.____cpython.yaml
@@ -5,7 +5,7 @@ MACOSX_SDK_VERSION:
 c_compiler:
 - clang
 c_compiler_version:
-- '16'
+- '17'
 c_stdlib:
 - macosx_deployment_target
 c_stdlib_version:
@@ -17,11 +17,11 @@ channel_targets:
 cxx_compiler:
 - clangxx
 cxx_compiler_version:
-- '16'
+- '17'
 fortran_compiler:
 - gfortran
 fortran_compiler_version:
-- '12'
+- '13'
 libblas:
 - 3.9 *netlib
 libcblas:

diff --git a/recipe/build.sh b/recipe/build.sh
@@ -9,16 +9,12 @@ mkdir builddir
 # to use host python; requires that [binaries] section is last in meson_cross_file
 echo "python = '${PREFIX}/bin/python'" >> ${CONDA_PREFIX}/meson_cross_file.txt
 
-# meson-python already sets up a -Dbuildtype=release argument to meson, so
-# we need to strip --buildtype out of MESON_ARGS or fail due to redundancy
-MESON_ARGS_REDUCED="$(echo $MESON_ARGS | sed 's/--buildtype release //g')"
-
 # -wnx flags mean: --wheel --no-isolation --skip-dependency-check
 $PYTHON -m build -w -n -x \
     -Cbuilddir=builddir \
     -Cinstall-args=--tags=runtime,python-runtime,devel \
     -Csetup-args=-Dblas=blas \
     -Csetup-args=-Dlapack=lapack \
     -Csetup-args=-Duse-g77-abi=true \
-    -Csetup-args=${MESON_ARGS_REDUCED// / -Csetup-args=} \
+    -Csetup-args=${MESON_ARGS// / -Csetup-args=} \
     || (cat builddir/meson-logs/meson-log.txt && exit 1)