From 04d90116bfb5fd4cb5a01f107908f5b0acf0e906 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= Date: Mon, 10 Feb 2025 16:02:28 +0100 Subject: [PATCH 1/3] Build with `-Wl,-z,noexecstack` to fix glibc 2.41 compatibility Explicitly pass `-Wl,-z,noexecstack` to the linker, to ensure that `libpytorch_cpu.so` is compiled without an executable stack. This is necessary because the raw assembly in oneDNN triggers: ``` $BUILD_PREFIX/bin/../lib/gcc/x86_64-conda-linux-gnu/13.3.0/../../../../x86_64-conda-linux-gnu/bin/ld: warning: ittptmark64.S.o: missing .note.GNU-stack section implies executable stack ``` ...and glibc 2.41 no longer permits loading libraries with executable stack. Fixes #350 --- recipe/build.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/recipe/build.sh b/recipe/build.sh index 22dde8f0e..f44aa8f95 100644 --- a/recipe/build.sh +++ b/recipe/build.sh @@ -40,6 +40,9 @@ export LDFLAGS="$(echo $LDFLAGS | sed 's/-Wl,--as-needed//g')" # error on osx-64. export LDFLAGS="$(echo $LDFLAGS | sed 's/-Wl,-dead_strip_dylibs//g')" export LDFLAGS_LD="$(echo $LDFLAGS_LD | sed 's/-dead_strip_dylibs//g')" +# Explicitly force non-executable stack to fix compatibility with glibc 2.41, due to: +# ittptmark64.S.o: missing .note.GNU-stack section implies executable stack +LDFLAGS+=" -Wl,-z,noexecstack" if [[ "$c_compiler" == "clang" ]]; then export CXXFLAGS="$CXXFLAGS -Wno-deprecated-declarations -Wno-unknown-warning-option -Wno-error=unused-command-line-argument -Wno-error=vla-cxx-extension" export CFLAGS="$CFLAGS -Wno-deprecated-declarations -Wno-unknown-warning-option -Wno-error=unused-command-line-argument -Wno-error=vla-cxx-extension" From 04f058ed610243cb6585c145e762f02041603f75 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= Date: Mon, 10 Feb 2025 16:05:37 +0100 Subject: [PATCH 2/3] Bump build number --- recipe/meta.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index e1c2a2d6b..1a6f4912f 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -1,6 +1,6 @@ # if you wish to build release candidate number X, append the version string with ".rcX" {% set version = "2.5.1" %} -{% set build = 12 %} +{% set build = 13 %} # Use a higher build number for the CUDA variant, to ensure that it's # preferred by conda's solver, and it's preferentially From 5ffe6d1ca29efc82254ff32716c3c9c02da39582 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= Date: Mon, 10 Feb 2025 16:07:04 +0100 Subject: [PATCH 3/3] MNT: Re-rendered with conda-build 25.1.2, conda-smithy 3.45.4, and conda-forge-pinning 2025.02.10.08.21.42 --- ..._compiler_versionNonecxx_compiler_version13is_rcFalse.yaml | 4 +++- ..._compiler_version12.6cxx_compiler_version13is_rcFalse.yaml | 4 +++- ..._compiler_versionNonecxx_compiler_version13is_rcFalse.yaml | 4 +++- ..._compiler_version12.6cxx_compiler_version13is_rcFalse.yaml | 4 +++- ..._compiler_versionNonecxx_compiler_version13is_rcFalse.yaml | 4 +++- ..._compiler_version12.6cxx_compiler_version13is_rcFalse.yaml | 4 +++- ...da-forge_mainis_rcFalsenumpy2.0python3.10.____cpython.yaml | 4 +++- ...da-forge_mainis_rcFalsenumpy2.0python3.11.____cpython.yaml | 4 +++- ...da-forge_mainis_rcFalsenumpy2.0python3.12.____cpython.yaml | 4 +++- ...nda-forge_mainis_rcFalsenumpy2.0python3.9.____cpython.yaml | 4 +++- ...sconda-forge_mainis_rcFalsenumpy2python3.13.____cp313.yaml | 4 +++- ...da-forge_mainis_rcFalsenumpy2.0python3.10.____cpython.yaml | 4 +++- ...da-forge_mainis_rcFalsenumpy2.0python3.11.____cpython.yaml | 4 +++- ...da-forge_mainis_rcFalsenumpy2.0python3.12.____cpython.yaml | 4 +++- ...nda-forge_mainis_rcFalsenumpy2.0python3.9.____cpython.yaml | 4 +++- ...sconda-forge_mainis_rcFalsenumpy2python3.13.____cp313.yaml | 4 +++- ...da-forge_mainis_rcFalsenumpy2.0python3.10.____cpython.yaml | 4 +++- ...da-forge_mainis_rcFalsenumpy2.0python3.11.____cpython.yaml | 4 +++- ...da-forge_mainis_rcFalsenumpy2.0python3.12.____cpython.yaml | 4 +++- ...nda-forge_mainis_rcFalsenumpy2.0python3.9.____cpython.yaml | 4 +++- ...sconda-forge_mainis_rcFalsenumpy2python3.13.____cp313.yaml | 4 +++- ...ncuda_compilerNonecuda_compiler_versionNoneis_rcFalse.yaml | 4 +++- ..._compilercuda-nvcccuda_compiler_version12.6is_rcFalse.yaml | 4 +++- 23 files changed, 69 insertions(+), 23 deletions(-) diff --git a/.ci_support/linux_64_blas_implgenericc_compiler_version13channel_targetsconda-forge_maincuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13is_rcFalse.yaml b/.ci_support/linux_64_blas_implgenericc_compiler_version13channel_targetsconda-forge_maincuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13is_rcFalse.yaml index 3df538354..1fbaefff6 100644 --- a/.ci_support/linux_64_blas_implgenericc_compiler_version13channel_targetsconda-forge_maincuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13is_rcFalse.yaml +++ b/.ci_support/linux_64_blas_implgenericc_compiler_version13channel_targetsconda-forge_maincuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13is_rcFalse.yaml @@ -55,7 +55,7 @@ numpy: - '2' - '2.0' orc: -- 2.0.3 +- 2.1.0 pin_run_as_build: python: min_pin: x.x @@ -80,3 +80,5 @@ zip_keys: - is_rc - - python - numpy +zlib: +- '1' diff --git a/.ci_support/linux_64_blas_implgenericc_compiler_version13channel_targetsconda-forge_maincuda_compilercuda-nvcccuda_compiler_version12.6cxx_compiler_version13is_rcFalse.yaml b/.ci_support/linux_64_blas_implgenericc_compiler_version13channel_targetsconda-forge_maincuda_compilercuda-nvcccuda_compiler_version12.6cxx_compiler_version13is_rcFalse.yaml index 9f8a62b5a..53fa4acb4 100644 --- a/.ci_support/linux_64_blas_implgenericc_compiler_version13channel_targetsconda-forge_maincuda_compilercuda-nvcccuda_compiler_version12.6cxx_compiler_version13is_rcFalse.yaml +++ b/.ci_support/linux_64_blas_implgenericc_compiler_version13channel_targetsconda-forge_maincuda_compilercuda-nvcccuda_compiler_version12.6cxx_compiler_version13is_rcFalse.yaml @@ -55,7 +55,7 @@ numpy: - '2' - '2.0' orc: -- 2.0.3 +- 2.1.0 pin_run_as_build: python: min_pin: x.x @@ -80,3 +80,5 @@ zip_keys: - is_rc - - python - numpy +zlib: +- '1' diff --git a/.ci_support/linux_64_blas_implmklc_compiler_version13channel_targetsconda-forge_maincuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13is_rcFalse.yaml b/.ci_support/linux_64_blas_implmklc_compiler_version13channel_targetsconda-forge_maincuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13is_rcFalse.yaml index f3434835e..09283a32e 100644 --- a/.ci_support/linux_64_blas_implmklc_compiler_version13channel_targetsconda-forge_maincuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13is_rcFalse.yaml +++ b/.ci_support/linux_64_blas_implmklc_compiler_version13channel_targetsconda-forge_maincuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13is_rcFalse.yaml @@ -55,7 +55,7 @@ numpy: - '2' - '2.0' orc: -- 2.0.3 +- 2.1.0 pin_run_as_build: python: min_pin: x.x @@ -80,3 +80,5 @@ zip_keys: - is_rc - - python - numpy +zlib: +- '1' diff --git a/.ci_support/linux_64_blas_implmklc_compiler_version13channel_targetsconda-forge_maincuda_compilercuda-nvcccuda_compiler_version12.6cxx_compiler_version13is_rcFalse.yaml b/.ci_support/linux_64_blas_implmklc_compiler_version13channel_targetsconda-forge_maincuda_compilercuda-nvcccuda_compiler_version12.6cxx_compiler_version13is_rcFalse.yaml index 3348ffc3a..fe8ce125a 100644 --- a/.ci_support/linux_64_blas_implmklc_compiler_version13channel_targetsconda-forge_maincuda_compilercuda-nvcccuda_compiler_version12.6cxx_compiler_version13is_rcFalse.yaml +++ b/.ci_support/linux_64_blas_implmklc_compiler_version13channel_targetsconda-forge_maincuda_compilercuda-nvcccuda_compiler_version12.6cxx_compiler_version13is_rcFalse.yaml @@ -55,7 +55,7 @@ numpy: - '2' - '2.0' orc: -- 2.0.3 +- 2.1.0 pin_run_as_build: python: min_pin: x.x @@ -80,3 +80,5 @@ zip_keys: - is_rc - - python - numpy +zlib: +- '1' diff --git a/.ci_support/linux_aarch64_c_compiler_version13channel_targetsconda-forge_maincuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13is_rcFalse.yaml b/.ci_support/linux_aarch64_c_compiler_version13channel_targetsconda-forge_maincuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13is_rcFalse.yaml index 9a5eb8c59..5854d956d 100644 --- a/.ci_support/linux_aarch64_c_compiler_version13channel_targetsconda-forge_maincuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13is_rcFalse.yaml +++ b/.ci_support/linux_aarch64_c_compiler_version13channel_targetsconda-forge_maincuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13is_rcFalse.yaml @@ -55,7 +55,7 @@ numpy: - '2' - '2.0' orc: -- 2.0.3 +- 2.1.0 pin_run_as_build: python: min_pin: x.x @@ -80,3 +80,5 @@ zip_keys: - is_rc - - python - numpy +zlib: +- '1' diff --git a/.ci_support/linux_aarch64_c_compiler_version13channel_targetsconda-forge_maincuda_compilercuda-nvcccuda_compiler_version12.6cxx_compiler_version13is_rcFalse.yaml b/.ci_support/linux_aarch64_c_compiler_version13channel_targetsconda-forge_maincuda_compilercuda-nvcccuda_compiler_version12.6cxx_compiler_version13is_rcFalse.yaml index 99655f8b9..d14595514 100644 --- a/.ci_support/linux_aarch64_c_compiler_version13channel_targetsconda-forge_maincuda_compilercuda-nvcccuda_compiler_version12.6cxx_compiler_version13is_rcFalse.yaml +++ b/.ci_support/linux_aarch64_c_compiler_version13channel_targetsconda-forge_maincuda_compilercuda-nvcccuda_compiler_version12.6cxx_compiler_version13is_rcFalse.yaml @@ -55,7 +55,7 @@ numpy: - '2' - '2.0' orc: -- 2.0.3 +- 2.1.0 pin_run_as_build: python: min_pin: x.x @@ -80,3 +80,5 @@ zip_keys: - is_rc - - python - numpy +zlib: +- '1' diff --git a/.ci_support/osx_64_blas_implgenericchannel_targetsconda-forge_mainis_rcFalsenumpy2.0python3.10.____cpython.yaml b/.ci_support/osx_64_blas_implgenericchannel_targetsconda-forge_mainis_rcFalsenumpy2.0python3.10.____cpython.yaml index c6feec780..07e332718 100644 --- a/.ci_support/osx_64_blas_implgenericchannel_targetsconda-forge_mainis_rcFalsenumpy2.0python3.10.____cpython.yaml +++ b/.ci_support/osx_64_blas_implgenericchannel_targetsconda-forge_mainis_rcFalsenumpy2.0python3.10.____cpython.yaml @@ -49,7 +49,7 @@ mkl: numpy: - '2.0' orc: -- 2.0.3 +- 2.1.0 pin_run_as_build: python: min_pin: x.x @@ -67,3 +67,5 @@ zip_keys: - is_rc - - python - numpy +zlib: +- '1' diff --git a/.ci_support/osx_64_blas_implgenericchannel_targetsconda-forge_mainis_rcFalsenumpy2.0python3.11.____cpython.yaml b/.ci_support/osx_64_blas_implgenericchannel_targetsconda-forge_mainis_rcFalsenumpy2.0python3.11.____cpython.yaml index 20e3ffe5f..1c325a8a8 100644 --- a/.ci_support/osx_64_blas_implgenericchannel_targetsconda-forge_mainis_rcFalsenumpy2.0python3.11.____cpython.yaml +++ b/.ci_support/osx_64_blas_implgenericchannel_targetsconda-forge_mainis_rcFalsenumpy2.0python3.11.____cpython.yaml @@ -49,7 +49,7 @@ mkl: numpy: - '2.0' orc: -- 2.0.3 +- 2.1.0 pin_run_as_build: python: min_pin: x.x @@ -67,3 +67,5 @@ zip_keys: - is_rc - - python - numpy +zlib: +- '1' diff --git a/.ci_support/osx_64_blas_implgenericchannel_targetsconda-forge_mainis_rcFalsenumpy2.0python3.12.____cpython.yaml b/.ci_support/osx_64_blas_implgenericchannel_targetsconda-forge_mainis_rcFalsenumpy2.0python3.12.____cpython.yaml index db9bacb32..faa75f28b 100644 --- a/.ci_support/osx_64_blas_implgenericchannel_targetsconda-forge_mainis_rcFalsenumpy2.0python3.12.____cpython.yaml +++ b/.ci_support/osx_64_blas_implgenericchannel_targetsconda-forge_mainis_rcFalsenumpy2.0python3.12.____cpython.yaml @@ -49,7 +49,7 @@ mkl: numpy: - '2.0' orc: -- 2.0.3 +- 2.1.0 pin_run_as_build: python: min_pin: x.x @@ -67,3 +67,5 @@ zip_keys: - is_rc - - python - numpy +zlib: +- '1' diff --git a/.ci_support/osx_64_blas_implgenericchannel_targetsconda-forge_mainis_rcFalsenumpy2.0python3.9.____cpython.yaml b/.ci_support/osx_64_blas_implgenericchannel_targetsconda-forge_mainis_rcFalsenumpy2.0python3.9.____cpython.yaml index 634c6e7a5..a3f21ce19 100644 --- a/.ci_support/osx_64_blas_implgenericchannel_targetsconda-forge_mainis_rcFalsenumpy2.0python3.9.____cpython.yaml +++ b/.ci_support/osx_64_blas_implgenericchannel_targetsconda-forge_mainis_rcFalsenumpy2.0python3.9.____cpython.yaml @@ -49,7 +49,7 @@ mkl: numpy: - '2.0' orc: -- 2.0.3 +- 2.1.0 pin_run_as_build: python: min_pin: x.x @@ -67,3 +67,5 @@ zip_keys: - is_rc - - python - numpy +zlib: +- '1' diff --git a/.ci_support/osx_64_blas_implgenericchannel_targetsconda-forge_mainis_rcFalsenumpy2python3.13.____cp313.yaml b/.ci_support/osx_64_blas_implgenericchannel_targetsconda-forge_mainis_rcFalsenumpy2python3.13.____cp313.yaml index c30fcfeb8..95b0288a9 100644 --- a/.ci_support/osx_64_blas_implgenericchannel_targetsconda-forge_mainis_rcFalsenumpy2python3.13.____cp313.yaml +++ b/.ci_support/osx_64_blas_implgenericchannel_targetsconda-forge_mainis_rcFalsenumpy2python3.13.____cp313.yaml @@ -49,7 +49,7 @@ mkl: numpy: - '2' orc: -- 2.0.3 +- 2.1.0 pin_run_as_build: python: min_pin: x.x @@ -67,3 +67,5 @@ zip_keys: - is_rc - - python - numpy +zlib: +- '1' diff --git a/.ci_support/osx_64_blas_implmklchannel_targetsconda-forge_mainis_rcFalsenumpy2.0python3.10.____cpython.yaml b/.ci_support/osx_64_blas_implmklchannel_targetsconda-forge_mainis_rcFalsenumpy2.0python3.10.____cpython.yaml index 54a51beef..ec40cf70e 100644 --- a/.ci_support/osx_64_blas_implmklchannel_targetsconda-forge_mainis_rcFalsenumpy2.0python3.10.____cpython.yaml +++ b/.ci_support/osx_64_blas_implmklchannel_targetsconda-forge_mainis_rcFalsenumpy2.0python3.10.____cpython.yaml @@ -49,7 +49,7 @@ mkl: numpy: - '2.0' orc: -- 2.0.3 +- 2.1.0 pin_run_as_build: python: min_pin: x.x @@ -67,3 +67,5 @@ zip_keys: - is_rc - - python - numpy +zlib: +- '1' diff --git a/.ci_support/osx_64_blas_implmklchannel_targetsconda-forge_mainis_rcFalsenumpy2.0python3.11.____cpython.yaml b/.ci_support/osx_64_blas_implmklchannel_targetsconda-forge_mainis_rcFalsenumpy2.0python3.11.____cpython.yaml index 5b2d139d0..c06b45eb5 100644 --- a/.ci_support/osx_64_blas_implmklchannel_targetsconda-forge_mainis_rcFalsenumpy2.0python3.11.____cpython.yaml +++ b/.ci_support/osx_64_blas_implmklchannel_targetsconda-forge_mainis_rcFalsenumpy2.0python3.11.____cpython.yaml @@ -49,7 +49,7 @@ mkl: numpy: - '2.0' orc: -- 2.0.3 +- 2.1.0 pin_run_as_build: python: min_pin: x.x @@ -67,3 +67,5 @@ zip_keys: - is_rc - - python - numpy +zlib: +- '1' diff --git a/.ci_support/osx_64_blas_implmklchannel_targetsconda-forge_mainis_rcFalsenumpy2.0python3.12.____cpython.yaml b/.ci_support/osx_64_blas_implmklchannel_targetsconda-forge_mainis_rcFalsenumpy2.0python3.12.____cpython.yaml index 9ba9f9253..d9829a3fb 100644 --- a/.ci_support/osx_64_blas_implmklchannel_targetsconda-forge_mainis_rcFalsenumpy2.0python3.12.____cpython.yaml +++ b/.ci_support/osx_64_blas_implmklchannel_targetsconda-forge_mainis_rcFalsenumpy2.0python3.12.____cpython.yaml @@ -49,7 +49,7 @@ mkl: numpy: - '2.0' orc: -- 2.0.3 +- 2.1.0 pin_run_as_build: python: min_pin: x.x @@ -67,3 +67,5 @@ zip_keys: - is_rc - - python - numpy +zlib: +- '1' diff --git a/.ci_support/osx_64_blas_implmklchannel_targetsconda-forge_mainis_rcFalsenumpy2.0python3.9.____cpython.yaml b/.ci_support/osx_64_blas_implmklchannel_targetsconda-forge_mainis_rcFalsenumpy2.0python3.9.____cpython.yaml index 532cd94d8..4df1914c0 100644 --- a/.ci_support/osx_64_blas_implmklchannel_targetsconda-forge_mainis_rcFalsenumpy2.0python3.9.____cpython.yaml +++ b/.ci_support/osx_64_blas_implmklchannel_targetsconda-forge_mainis_rcFalsenumpy2.0python3.9.____cpython.yaml @@ -49,7 +49,7 @@ mkl: numpy: - '2.0' orc: -- 2.0.3 +- 2.1.0 pin_run_as_build: python: min_pin: x.x @@ -67,3 +67,5 @@ zip_keys: - is_rc - - python - numpy +zlib: +- '1' diff --git a/.ci_support/osx_64_blas_implmklchannel_targetsconda-forge_mainis_rcFalsenumpy2python3.13.____cp313.yaml b/.ci_support/osx_64_blas_implmklchannel_targetsconda-forge_mainis_rcFalsenumpy2python3.13.____cp313.yaml index 56565a9de..3758fc47f 100644 --- a/.ci_support/osx_64_blas_implmklchannel_targetsconda-forge_mainis_rcFalsenumpy2python3.13.____cp313.yaml +++ b/.ci_support/osx_64_blas_implmklchannel_targetsconda-forge_mainis_rcFalsenumpy2python3.13.____cp313.yaml @@ -49,7 +49,7 @@ mkl: numpy: - '2' orc: -- 2.0.3 +- 2.1.0 pin_run_as_build: python: min_pin: x.x @@ -67,3 +67,5 @@ zip_keys: - is_rc - - python - numpy +zlib: +- '1' diff --git a/.ci_support/osx_arm64_channel_targetsconda-forge_mainis_rcFalsenumpy2.0python3.10.____cpython.yaml b/.ci_support/osx_arm64_channel_targetsconda-forge_mainis_rcFalsenumpy2.0python3.10.____cpython.yaml index ecc6bdbc8..a48376c10 100644 --- a/.ci_support/osx_arm64_channel_targetsconda-forge_mainis_rcFalsenumpy2.0python3.10.____cpython.yaml +++ b/.ci_support/osx_arm64_channel_targetsconda-forge_mainis_rcFalsenumpy2.0python3.10.____cpython.yaml @@ -49,7 +49,7 @@ mkl: numpy: - '2.0' orc: -- 2.0.3 +- 2.1.0 pin_run_as_build: python: min_pin: x.x @@ -67,3 +67,5 @@ zip_keys: - is_rc - - python - numpy +zlib: +- '1' diff --git a/.ci_support/osx_arm64_channel_targetsconda-forge_mainis_rcFalsenumpy2.0python3.11.____cpython.yaml b/.ci_support/osx_arm64_channel_targetsconda-forge_mainis_rcFalsenumpy2.0python3.11.____cpython.yaml index 8fbb298f0..283c76f0f 100644 --- a/.ci_support/osx_arm64_channel_targetsconda-forge_mainis_rcFalsenumpy2.0python3.11.____cpython.yaml +++ b/.ci_support/osx_arm64_channel_targetsconda-forge_mainis_rcFalsenumpy2.0python3.11.____cpython.yaml @@ -49,7 +49,7 @@ mkl: numpy: - '2.0' orc: -- 2.0.3 +- 2.1.0 pin_run_as_build: python: min_pin: x.x @@ -67,3 +67,5 @@ zip_keys: - is_rc - - python - numpy +zlib: +- '1' diff --git a/.ci_support/osx_arm64_channel_targetsconda-forge_mainis_rcFalsenumpy2.0python3.12.____cpython.yaml b/.ci_support/osx_arm64_channel_targetsconda-forge_mainis_rcFalsenumpy2.0python3.12.____cpython.yaml index 576ca03cf..7cfee4303 100644 --- a/.ci_support/osx_arm64_channel_targetsconda-forge_mainis_rcFalsenumpy2.0python3.12.____cpython.yaml +++ b/.ci_support/osx_arm64_channel_targetsconda-forge_mainis_rcFalsenumpy2.0python3.12.____cpython.yaml @@ -49,7 +49,7 @@ mkl: numpy: - '2.0' orc: -- 2.0.3 +- 2.1.0 pin_run_as_build: python: min_pin: x.x @@ -67,3 +67,5 @@ zip_keys: - is_rc - - python - numpy +zlib: +- '1' diff --git a/.ci_support/osx_arm64_channel_targetsconda-forge_mainis_rcFalsenumpy2.0python3.9.____cpython.yaml b/.ci_support/osx_arm64_channel_targetsconda-forge_mainis_rcFalsenumpy2.0python3.9.____cpython.yaml index ef8363fab..0b7301035 100644 --- a/.ci_support/osx_arm64_channel_targetsconda-forge_mainis_rcFalsenumpy2.0python3.9.____cpython.yaml +++ b/.ci_support/osx_arm64_channel_targetsconda-forge_mainis_rcFalsenumpy2.0python3.9.____cpython.yaml @@ -49,7 +49,7 @@ mkl: numpy: - '2.0' orc: -- 2.0.3 +- 2.1.0 pin_run_as_build: python: min_pin: x.x @@ -67,3 +67,5 @@ zip_keys: - is_rc - - python - numpy +zlib: +- '1' diff --git a/.ci_support/osx_arm64_channel_targetsconda-forge_mainis_rcFalsenumpy2python3.13.____cp313.yaml b/.ci_support/osx_arm64_channel_targetsconda-forge_mainis_rcFalsenumpy2python3.13.____cp313.yaml index 82cd46011..a38cd59a5 100644 --- a/.ci_support/osx_arm64_channel_targetsconda-forge_mainis_rcFalsenumpy2python3.13.____cp313.yaml +++ b/.ci_support/osx_arm64_channel_targetsconda-forge_mainis_rcFalsenumpy2python3.13.____cp313.yaml @@ -49,7 +49,7 @@ mkl: numpy: - '2' orc: -- 2.0.3 +- 2.1.0 pin_run_as_build: python: min_pin: x.x @@ -67,3 +67,5 @@ zip_keys: - is_rc - - python - numpy +zlib: +- '1' diff --git a/.ci_support/win_64_channel_targetsconda-forge_maincuda_compilerNonecuda_compiler_versionNoneis_rcFalse.yaml b/.ci_support/win_64_channel_targetsconda-forge_maincuda_compilerNonecuda_compiler_versionNoneis_rcFalse.yaml index ad886cb08..f36a10dfa 100644 --- a/.ci_support/win_64_channel_targetsconda-forge_maincuda_compilerNonecuda_compiler_versionNoneis_rcFalse.yaml +++ b/.ci_support/win_64_channel_targetsconda-forge_maincuda_compilerNonecuda_compiler_versionNoneis_rcFalse.yaml @@ -37,7 +37,7 @@ numpy: - '2' - '2.0' orc: -- 2.0.3 +- 2.1.0 pin_run_as_build: python: min_pin: x.x @@ -59,3 +59,5 @@ zip_keys: - cuda_compiler_version - - python - numpy +zlib: +- '1' diff --git a/.ci_support/win_64_channel_targetsconda-forge_maincuda_compilercuda-nvcccuda_compiler_version12.6is_rcFalse.yaml b/.ci_support/win_64_channel_targetsconda-forge_maincuda_compilercuda-nvcccuda_compiler_version12.6is_rcFalse.yaml index f5b631f70..77627da3f 100644 --- a/.ci_support/win_64_channel_targetsconda-forge_maincuda_compilercuda-nvcccuda_compiler_version12.6is_rcFalse.yaml +++ b/.ci_support/win_64_channel_targetsconda-forge_maincuda_compilercuda-nvcccuda_compiler_version12.6is_rcFalse.yaml @@ -37,7 +37,7 @@ numpy: - '2' - '2.0' orc: -- 2.0.3 +- 2.1.0 pin_run_as_build: python: min_pin: x.x @@ -59,3 +59,5 @@ zip_keys: - cuda_compiler_version - - python - numpy +zlib: +- '1'