From 3091ad3c63299ba0cedc3ab2e19309b861f6f60e Mon Sep 17 00:00:00 2001 From: regro-cf-autotick-bot <36490558+regro-cf-autotick-bot@users.noreply.github.com> Date: Fri, 23 Feb 2024 04:46:57 +0000 Subject: [PATCH 1/2] Rebuild for libabseil 20240116, libgrp 1.61, libprotobuf 4.25.2 --- ...il20240116_libgrpc161_libprotobuf4252.yaml | 22 +++++++++++++++++++ recipe/meta.yaml | 2 +- 2 files changed, 23 insertions(+), 1 deletion(-) create mode 100644 .ci_support/migrations/libabseil20240116_libgrpc161_libprotobuf4252.yaml diff --git a/.ci_support/migrations/libabseil20240116_libgrpc161_libprotobuf4252.yaml b/.ci_support/migrations/libabseil20240116_libgrpc161_libprotobuf4252.yaml new file mode 100644 index 00000000..08cd5a02 --- /dev/null +++ b/.ci_support/migrations/libabseil20240116_libgrpc161_libprotobuf4252.yaml @@ -0,0 +1,22 @@ +__migrator: + build_number: 1 + commit_message: Rebuild for libabseil 20240116, libgrp 1.61, libprotobuf 4.25.2 + kind: version + migration_number: 1 + exclude: + - abseil-cpp + - grpc-cpp + - libprotobuf + # this shouldn't attempt to modify the python feedstocks + - protobuf +libabseil: +- "20240116" +libgrpc: +- "1.61" +libprotobuf: +- 4.25.2 +# already covered by libabseil20230802_libgrpc157_libprotobuf4234, +# which we cannot delete yet, but keep for clarity +MACOSX_DEPLOYMENT_TARGET: # [osx and x86_64] +- "10.13" # [osx and x86_64] +migrator_ts: 1705991934.9119136 diff --git a/recipe/meta.yaml b/recipe/meta.yaml index fc50b307..6b5b433b 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -50,7 +50,7 @@ source: sha256: 78884f64b564a3b06dc6ee731ed33b60c6d8cd864cea07f21d94ba0f90c7b310 build: - number: 7 + number: 8 string: py{{ PY_VER_MAJOR }}{{ PY_VER_MINOR }}h{{ PKG_HASH }}_{{ PKG_BUILDNUM }} run_exports: # https://abi-laboratory.pro/index.php?view=timeline&l=opencv From d04c11a16c9d99927df1279a6233698c570000bd Mon Sep 17 00:00:00 2001 From: regro-cf-autotick-bot <36490558+regro-cf-autotick-bot@users.noreply.github.com> Date: Fri, 23 Feb 2024 04:47:43 +0000 Subject: [PATCH 2/2] MNT: Re-rendered with conda-build 24.1.2, conda-smithy 3.31.0, and conda-forge-pinning 2024.02.23.00.50.32 --- ...linux_64_numpy1.22python3.10.____cpython.yaml | 2 +- .../linux_64_numpy1.22python3.8.____cpython.yaml | 2 +- .../linux_64_numpy1.22python3.9.____73_pypy.yaml | 2 +- .../linux_64_numpy1.22python3.9.____cpython.yaml | 2 +- ...linux_64_numpy1.23python3.11.____cpython.yaml | 2 +- ...linux_64_numpy1.26python3.12.____cpython.yaml | 2 +- ..._aarch64_numpy1.22python3.10.____cpython.yaml | 2 +- ...x_aarch64_numpy1.22python3.8.____cpython.yaml | 2 +- ...x_aarch64_numpy1.22python3.9.____73_pypy.yaml | 2 +- ...x_aarch64_numpy1.22python3.9.____cpython.yaml | 2 +- ..._aarch64_numpy1.23python3.11.____cpython.yaml | 2 +- ..._aarch64_numpy1.26python3.12.____cpython.yaml | 2 +- ..._ppc64le_numpy1.22python3.10.____cpython.yaml | 2 +- ...x_ppc64le_numpy1.22python3.8.____cpython.yaml | 2 +- ...x_ppc64le_numpy1.22python3.9.____73_pypy.yaml | 2 +- ...x_ppc64le_numpy1.22python3.9.____cpython.yaml | 2 +- ..._ppc64le_numpy1.23python3.11.____cpython.yaml | 2 +- ..._ppc64le_numpy1.26python3.12.____cpython.yaml | 2 +- .ci_support/migrations/hdf51142.yaml | 7 ------- .../migrations/libgrpc159_libprotobuf4244.yaml | 16 ---------------- .../osx_64_numpy1.22python3.10.____cpython.yaml | 2 +- .../osx_64_numpy1.22python3.8.____cpython.yaml | 2 +- .../osx_64_numpy1.22python3.9.____73_pypy.yaml | 2 +- .../osx_64_numpy1.22python3.9.____cpython.yaml | 2 +- .../osx_64_numpy1.23python3.11.____cpython.yaml | 2 +- .../osx_64_numpy1.26python3.12.____cpython.yaml | 2 +- ...sx_arm64_numpy1.22python3.10.____cpython.yaml | 2 +- ...osx_arm64_numpy1.22python3.8.____cpython.yaml | 2 +- ...osx_arm64_numpy1.22python3.9.____cpython.yaml | 2 +- ...sx_arm64_numpy1.23python3.11.____cpython.yaml | 2 +- ...sx_arm64_numpy1.26python3.12.____cpython.yaml | 2 +- .../win_64_numpy1.22python3.10.____cpython.yaml | 2 +- .../win_64_numpy1.22python3.8.____cpython.yaml | 2 +- .../win_64_numpy1.22python3.9.____73_pypy.yaml | 2 +- .../win_64_numpy1.22python3.9.____cpython.yaml | 2 +- .../win_64_numpy1.23python3.11.____cpython.yaml | 2 +- .../win_64_numpy1.26python3.12.____cpython.yaml | 2 +- .scripts/build_steps.sh | 6 +++--- .scripts/run_osx_build.sh | 6 +++--- .scripts/run_win_build.bat | 4 ++-- build-locally.py | 5 +++-- 41 files changed, 46 insertions(+), 68 deletions(-) delete mode 100644 .ci_support/migrations/hdf51142.yaml delete mode 100644 .ci_support/migrations/libgrpc159_libprotobuf4244.yaml diff --git a/.ci_support/linux_64_numpy1.22python3.10.____cpython.yaml b/.ci_support/linux_64_numpy1.22python3.10.____cpython.yaml index 945f654d..67c668b0 100644 --- a/.ci_support/linux_64_numpy1.22python3.10.____cpython.yaml +++ b/.ci_support/linux_64_numpy1.22python3.10.____cpython.yaml @@ -41,7 +41,7 @@ libopenvino_dev: libpng: - '1.6' libprotobuf: -- 4.25.1 +- 4.25.2 libtiff: - '4.6' libwebp: diff --git a/.ci_support/linux_64_numpy1.22python3.8.____cpython.yaml b/.ci_support/linux_64_numpy1.22python3.8.____cpython.yaml index 4b94f5fd..c9722a08 100644 --- a/.ci_support/linux_64_numpy1.22python3.8.____cpython.yaml +++ b/.ci_support/linux_64_numpy1.22python3.8.____cpython.yaml @@ -41,7 +41,7 @@ libopenvino_dev: libpng: - '1.6' libprotobuf: -- 4.25.1 +- 4.25.2 libtiff: - '4.6' libwebp: diff --git a/.ci_support/linux_64_numpy1.22python3.9.____73_pypy.yaml b/.ci_support/linux_64_numpy1.22python3.9.____73_pypy.yaml index d37eb60f..c3ad6450 100644 --- a/.ci_support/linux_64_numpy1.22python3.9.____73_pypy.yaml +++ b/.ci_support/linux_64_numpy1.22python3.9.____73_pypy.yaml @@ -41,7 +41,7 @@ libopenvino_dev: libpng: - '1.6' libprotobuf: -- 4.25.1 +- 4.25.2 libtiff: - '4.6' libwebp: diff --git a/.ci_support/linux_64_numpy1.22python3.9.____cpython.yaml b/.ci_support/linux_64_numpy1.22python3.9.____cpython.yaml index 28f8c2b7..6291d212 100644 --- a/.ci_support/linux_64_numpy1.22python3.9.____cpython.yaml +++ b/.ci_support/linux_64_numpy1.22python3.9.____cpython.yaml @@ -41,7 +41,7 @@ libopenvino_dev: libpng: - '1.6' libprotobuf: -- 4.25.1 +- 4.25.2 libtiff: - '4.6' libwebp: diff --git a/.ci_support/linux_64_numpy1.23python3.11.____cpython.yaml b/.ci_support/linux_64_numpy1.23python3.11.____cpython.yaml index 098d7d21..b366f71c 100644 --- a/.ci_support/linux_64_numpy1.23python3.11.____cpython.yaml +++ b/.ci_support/linux_64_numpy1.23python3.11.____cpython.yaml @@ -41,7 +41,7 @@ libopenvino_dev: libpng: - '1.6' libprotobuf: -- 4.25.1 +- 4.25.2 libtiff: - '4.6' libwebp: diff --git a/.ci_support/linux_64_numpy1.26python3.12.____cpython.yaml b/.ci_support/linux_64_numpy1.26python3.12.____cpython.yaml index 3d8d5a56..a2871a52 100644 --- a/.ci_support/linux_64_numpy1.26python3.12.____cpython.yaml +++ b/.ci_support/linux_64_numpy1.26python3.12.____cpython.yaml @@ -41,7 +41,7 @@ libopenvino_dev: libpng: - '1.6' libprotobuf: -- 4.25.1 +- 4.25.2 libtiff: - '4.6' libwebp: diff --git a/.ci_support/linux_aarch64_numpy1.22python3.10.____cpython.yaml b/.ci_support/linux_aarch64_numpy1.22python3.10.____cpython.yaml index f40c6051..96b93ab8 100644 --- a/.ci_support/linux_aarch64_numpy1.22python3.10.____cpython.yaml +++ b/.ci_support/linux_aarch64_numpy1.22python3.10.____cpython.yaml @@ -45,7 +45,7 @@ libopenvino_dev: libpng: - '1.6' libprotobuf: -- 4.25.1 +- 4.25.2 libtiff: - '4.6' libwebp: diff --git a/.ci_support/linux_aarch64_numpy1.22python3.8.____cpython.yaml b/.ci_support/linux_aarch64_numpy1.22python3.8.____cpython.yaml index 7285f322..a95f34f0 100644 --- a/.ci_support/linux_aarch64_numpy1.22python3.8.____cpython.yaml +++ b/.ci_support/linux_aarch64_numpy1.22python3.8.____cpython.yaml @@ -45,7 +45,7 @@ libopenvino_dev: libpng: - '1.6' libprotobuf: -- 4.25.1 +- 4.25.2 libtiff: - '4.6' libwebp: diff --git a/.ci_support/linux_aarch64_numpy1.22python3.9.____73_pypy.yaml b/.ci_support/linux_aarch64_numpy1.22python3.9.____73_pypy.yaml index 1e291b82..390b710f 100644 --- a/.ci_support/linux_aarch64_numpy1.22python3.9.____73_pypy.yaml +++ b/.ci_support/linux_aarch64_numpy1.22python3.9.____73_pypy.yaml @@ -45,7 +45,7 @@ libopenvino_dev: libpng: - '1.6' libprotobuf: -- 4.25.1 +- 4.25.2 libtiff: - '4.6' libwebp: diff --git a/.ci_support/linux_aarch64_numpy1.22python3.9.____cpython.yaml b/.ci_support/linux_aarch64_numpy1.22python3.9.____cpython.yaml index c304e9b3..0583408b 100644 --- a/.ci_support/linux_aarch64_numpy1.22python3.9.____cpython.yaml +++ b/.ci_support/linux_aarch64_numpy1.22python3.9.____cpython.yaml @@ -45,7 +45,7 @@ libopenvino_dev: libpng: - '1.6' libprotobuf: -- 4.25.1 +- 4.25.2 libtiff: - '4.6' libwebp: diff --git a/.ci_support/linux_aarch64_numpy1.23python3.11.____cpython.yaml b/.ci_support/linux_aarch64_numpy1.23python3.11.____cpython.yaml index ce1f5f37..b0cc8484 100644 --- a/.ci_support/linux_aarch64_numpy1.23python3.11.____cpython.yaml +++ b/.ci_support/linux_aarch64_numpy1.23python3.11.____cpython.yaml @@ -45,7 +45,7 @@ libopenvino_dev: libpng: - '1.6' libprotobuf: -- 4.25.1 +- 4.25.2 libtiff: - '4.6' libwebp: diff --git a/.ci_support/linux_aarch64_numpy1.26python3.12.____cpython.yaml b/.ci_support/linux_aarch64_numpy1.26python3.12.____cpython.yaml index b8be4d80..2a01ced1 100644 --- a/.ci_support/linux_aarch64_numpy1.26python3.12.____cpython.yaml +++ b/.ci_support/linux_aarch64_numpy1.26python3.12.____cpython.yaml @@ -45,7 +45,7 @@ libopenvino_dev: libpng: - '1.6' libprotobuf: -- 4.25.1 +- 4.25.2 libtiff: - '4.6' libwebp: diff --git a/.ci_support/linux_ppc64le_numpy1.22python3.10.____cpython.yaml b/.ci_support/linux_ppc64le_numpy1.22python3.10.____cpython.yaml index a397e8c7..6e1e49ee 100644 --- a/.ci_support/linux_ppc64le_numpy1.22python3.10.____cpython.yaml +++ b/.ci_support/linux_ppc64le_numpy1.22python3.10.____cpython.yaml @@ -39,7 +39,7 @@ liblapacke: libpng: - '1.6' libprotobuf: -- 4.25.1 +- 4.25.2 libtiff: - '4.6' libwebp: diff --git a/.ci_support/linux_ppc64le_numpy1.22python3.8.____cpython.yaml b/.ci_support/linux_ppc64le_numpy1.22python3.8.____cpython.yaml index 59876a41..c77fa18c 100644 --- a/.ci_support/linux_ppc64le_numpy1.22python3.8.____cpython.yaml +++ b/.ci_support/linux_ppc64le_numpy1.22python3.8.____cpython.yaml @@ -39,7 +39,7 @@ liblapacke: libpng: - '1.6' libprotobuf: -- 4.25.1 +- 4.25.2 libtiff: - '4.6' libwebp: diff --git a/.ci_support/linux_ppc64le_numpy1.22python3.9.____73_pypy.yaml b/.ci_support/linux_ppc64le_numpy1.22python3.9.____73_pypy.yaml index f3eded66..b558ae59 100644 --- a/.ci_support/linux_ppc64le_numpy1.22python3.9.____73_pypy.yaml +++ b/.ci_support/linux_ppc64le_numpy1.22python3.9.____73_pypy.yaml @@ -39,7 +39,7 @@ liblapacke: libpng: - '1.6' libprotobuf: -- 4.25.1 +- 4.25.2 libtiff: - '4.6' libwebp: diff --git a/.ci_support/linux_ppc64le_numpy1.22python3.9.____cpython.yaml b/.ci_support/linux_ppc64le_numpy1.22python3.9.____cpython.yaml index 4347cb02..33fe0e31 100644 --- a/.ci_support/linux_ppc64le_numpy1.22python3.9.____cpython.yaml +++ b/.ci_support/linux_ppc64le_numpy1.22python3.9.____cpython.yaml @@ -39,7 +39,7 @@ liblapacke: libpng: - '1.6' libprotobuf: -- 4.25.1 +- 4.25.2 libtiff: - '4.6' libwebp: diff --git a/.ci_support/linux_ppc64le_numpy1.23python3.11.____cpython.yaml b/.ci_support/linux_ppc64le_numpy1.23python3.11.____cpython.yaml index 27737c3a..8c6d45ae 100644 --- a/.ci_support/linux_ppc64le_numpy1.23python3.11.____cpython.yaml +++ b/.ci_support/linux_ppc64le_numpy1.23python3.11.____cpython.yaml @@ -39,7 +39,7 @@ liblapacke: libpng: - '1.6' libprotobuf: -- 4.25.1 +- 4.25.2 libtiff: - '4.6' libwebp: diff --git a/.ci_support/linux_ppc64le_numpy1.26python3.12.____cpython.yaml b/.ci_support/linux_ppc64le_numpy1.26python3.12.____cpython.yaml index d304ba40..eb206ea5 100644 --- a/.ci_support/linux_ppc64le_numpy1.26python3.12.____cpython.yaml +++ b/.ci_support/linux_ppc64le_numpy1.26python3.12.____cpython.yaml @@ -39,7 +39,7 @@ liblapacke: libpng: - '1.6' libprotobuf: -- 4.25.1 +- 4.25.2 libtiff: - '4.6' libwebp: diff --git a/.ci_support/migrations/hdf51142.yaml b/.ci_support/migrations/hdf51142.yaml deleted file mode 100644 index 1517ced4..00000000 --- a/.ci_support/migrations/hdf51142.yaml +++ /dev/null @@ -1,7 +0,0 @@ -__migrator: - build_number: 1 - kind: version - migration_number: 1 -hdf5: -- 1.14.2 -migrator_ts: 1692590899.44706 diff --git a/.ci_support/migrations/libgrpc159_libprotobuf4244.yaml b/.ci_support/migrations/libgrpc159_libprotobuf4244.yaml deleted file mode 100644 index 8a51b6ed..00000000 --- a/.ci_support/migrations/libgrpc159_libprotobuf4244.yaml +++ /dev/null @@ -1,16 +0,0 @@ -__migrator: - build_number: 1 - kind: version - migration_number: 1 - exclude: - # this shouldn't attempt to modify the python feedstocks - - protobuf -libgrpc: -- "1.59" -libprotobuf: -- 4.24.4 -# already covered by libabseil20230802_libgrpc157_libprotobuf4234, -# which we cannot delete yet, but keep for clarity -MACOSX_DEPLOYMENT_TARGET: # [osx and x86_64] -- "10.13" # [osx and x86_64] -migrator_ts: 1698833751.21557 diff --git a/.ci_support/osx_64_numpy1.22python3.10.____cpython.yaml b/.ci_support/osx_64_numpy1.22python3.10.____cpython.yaml index d88dd31e..900f30fd 100644 --- a/.ci_support/osx_64_numpy1.22python3.10.____cpython.yaml +++ b/.ci_support/osx_64_numpy1.22python3.10.____cpython.yaml @@ -41,7 +41,7 @@ libopenvino_dev: libpng: - '1.6' libprotobuf: -- 4.25.1 +- 4.25.2 libtiff: - '4.6' libwebp: diff --git a/.ci_support/osx_64_numpy1.22python3.8.____cpython.yaml b/.ci_support/osx_64_numpy1.22python3.8.____cpython.yaml index 4aa9b79f..82b3dc33 100644 --- a/.ci_support/osx_64_numpy1.22python3.8.____cpython.yaml +++ b/.ci_support/osx_64_numpy1.22python3.8.____cpython.yaml @@ -41,7 +41,7 @@ libopenvino_dev: libpng: - '1.6' libprotobuf: -- 4.25.1 +- 4.25.2 libtiff: - '4.6' libwebp: diff --git a/.ci_support/osx_64_numpy1.22python3.9.____73_pypy.yaml b/.ci_support/osx_64_numpy1.22python3.9.____73_pypy.yaml index 942ccf95..d723eb6b 100644 --- a/.ci_support/osx_64_numpy1.22python3.9.____73_pypy.yaml +++ b/.ci_support/osx_64_numpy1.22python3.9.____73_pypy.yaml @@ -41,7 +41,7 @@ libopenvino_dev: libpng: - '1.6' libprotobuf: -- 4.25.1 +- 4.25.2 libtiff: - '4.6' libwebp: diff --git a/.ci_support/osx_64_numpy1.22python3.9.____cpython.yaml b/.ci_support/osx_64_numpy1.22python3.9.____cpython.yaml index 2964d4db..c01307d8 100644 --- a/.ci_support/osx_64_numpy1.22python3.9.____cpython.yaml +++ b/.ci_support/osx_64_numpy1.22python3.9.____cpython.yaml @@ -41,7 +41,7 @@ libopenvino_dev: libpng: - '1.6' libprotobuf: -- 4.25.1 +- 4.25.2 libtiff: - '4.6' libwebp: diff --git a/.ci_support/osx_64_numpy1.23python3.11.____cpython.yaml b/.ci_support/osx_64_numpy1.23python3.11.____cpython.yaml index 1917c936..cf656572 100644 --- a/.ci_support/osx_64_numpy1.23python3.11.____cpython.yaml +++ b/.ci_support/osx_64_numpy1.23python3.11.____cpython.yaml @@ -41,7 +41,7 @@ libopenvino_dev: libpng: - '1.6' libprotobuf: -- 4.25.1 +- 4.25.2 libtiff: - '4.6' libwebp: diff --git a/.ci_support/osx_64_numpy1.26python3.12.____cpython.yaml b/.ci_support/osx_64_numpy1.26python3.12.____cpython.yaml index 868d2730..07081d3c 100644 --- a/.ci_support/osx_64_numpy1.26python3.12.____cpython.yaml +++ b/.ci_support/osx_64_numpy1.26python3.12.____cpython.yaml @@ -41,7 +41,7 @@ libopenvino_dev: libpng: - '1.6' libprotobuf: -- 4.25.1 +- 4.25.2 libtiff: - '4.6' libwebp: diff --git a/.ci_support/osx_arm64_numpy1.22python3.10.____cpython.yaml b/.ci_support/osx_arm64_numpy1.22python3.10.____cpython.yaml index 453ea296..d2a6d501 100644 --- a/.ci_support/osx_arm64_numpy1.22python3.10.____cpython.yaml +++ b/.ci_support/osx_arm64_numpy1.22python3.10.____cpython.yaml @@ -39,7 +39,7 @@ libopenvino_dev: libpng: - '1.6' libprotobuf: -- 4.25.1 +- 4.25.2 libtiff: - '4.6' libwebp: diff --git a/.ci_support/osx_arm64_numpy1.22python3.8.____cpython.yaml b/.ci_support/osx_arm64_numpy1.22python3.8.____cpython.yaml index 61d079c2..0aadc57f 100644 --- a/.ci_support/osx_arm64_numpy1.22python3.8.____cpython.yaml +++ b/.ci_support/osx_arm64_numpy1.22python3.8.____cpython.yaml @@ -39,7 +39,7 @@ libopenvino_dev: libpng: - '1.6' libprotobuf: -- 4.25.1 +- 4.25.2 libtiff: - '4.6' libwebp: diff --git a/.ci_support/osx_arm64_numpy1.22python3.9.____cpython.yaml b/.ci_support/osx_arm64_numpy1.22python3.9.____cpython.yaml index 6d046d99..5d66b6c2 100644 --- a/.ci_support/osx_arm64_numpy1.22python3.9.____cpython.yaml +++ b/.ci_support/osx_arm64_numpy1.22python3.9.____cpython.yaml @@ -39,7 +39,7 @@ libopenvino_dev: libpng: - '1.6' libprotobuf: -- 4.25.1 +- 4.25.2 libtiff: - '4.6' libwebp: diff --git a/.ci_support/osx_arm64_numpy1.23python3.11.____cpython.yaml b/.ci_support/osx_arm64_numpy1.23python3.11.____cpython.yaml index e6985cb3..c2e5d8e7 100644 --- a/.ci_support/osx_arm64_numpy1.23python3.11.____cpython.yaml +++ b/.ci_support/osx_arm64_numpy1.23python3.11.____cpython.yaml @@ -39,7 +39,7 @@ libopenvino_dev: libpng: - '1.6' libprotobuf: -- 4.25.1 +- 4.25.2 libtiff: - '4.6' libwebp: diff --git a/.ci_support/osx_arm64_numpy1.26python3.12.____cpython.yaml b/.ci_support/osx_arm64_numpy1.26python3.12.____cpython.yaml index ed503cea..986869d8 100644 --- a/.ci_support/osx_arm64_numpy1.26python3.12.____cpython.yaml +++ b/.ci_support/osx_arm64_numpy1.26python3.12.____cpython.yaml @@ -39,7 +39,7 @@ libopenvino_dev: libpng: - '1.6' libprotobuf: -- 4.25.1 +- 4.25.2 libtiff: - '4.6' libwebp: diff --git a/.ci_support/win_64_numpy1.22python3.10.____cpython.yaml b/.ci_support/win_64_numpy1.22python3.10.____cpython.yaml index 8f9b6c00..fba2cd20 100644 --- a/.ci_support/win_64_numpy1.22python3.10.____cpython.yaml +++ b/.ci_support/win_64_numpy1.22python3.10.____cpython.yaml @@ -29,7 +29,7 @@ libopenvino_dev: libpng: - '1.6' libprotobuf: -- 4.25.1 +- 4.25.2 libtiff: - '4.6' libwebp: diff --git a/.ci_support/win_64_numpy1.22python3.8.____cpython.yaml b/.ci_support/win_64_numpy1.22python3.8.____cpython.yaml index b21ba86e..cfda765d 100644 --- a/.ci_support/win_64_numpy1.22python3.8.____cpython.yaml +++ b/.ci_support/win_64_numpy1.22python3.8.____cpython.yaml @@ -29,7 +29,7 @@ libopenvino_dev: libpng: - '1.6' libprotobuf: -- 4.25.1 +- 4.25.2 libtiff: - '4.6' libwebp: diff --git a/.ci_support/win_64_numpy1.22python3.9.____73_pypy.yaml b/.ci_support/win_64_numpy1.22python3.9.____73_pypy.yaml index 69f10dd9..f9270f5b 100644 --- a/.ci_support/win_64_numpy1.22python3.9.____73_pypy.yaml +++ b/.ci_support/win_64_numpy1.22python3.9.____73_pypy.yaml @@ -29,7 +29,7 @@ libopenvino_dev: libpng: - '1.6' libprotobuf: -- 4.25.1 +- 4.25.2 libtiff: - '4.6' libwebp: diff --git a/.ci_support/win_64_numpy1.22python3.9.____cpython.yaml b/.ci_support/win_64_numpy1.22python3.9.____cpython.yaml index b961d494..f361e7a8 100644 --- a/.ci_support/win_64_numpy1.22python3.9.____cpython.yaml +++ b/.ci_support/win_64_numpy1.22python3.9.____cpython.yaml @@ -29,7 +29,7 @@ libopenvino_dev: libpng: - '1.6' libprotobuf: -- 4.25.1 +- 4.25.2 libtiff: - '4.6' libwebp: diff --git a/.ci_support/win_64_numpy1.23python3.11.____cpython.yaml b/.ci_support/win_64_numpy1.23python3.11.____cpython.yaml index c21d5ce2..3bbf43e3 100644 --- a/.ci_support/win_64_numpy1.23python3.11.____cpython.yaml +++ b/.ci_support/win_64_numpy1.23python3.11.____cpython.yaml @@ -29,7 +29,7 @@ libopenvino_dev: libpng: - '1.6' libprotobuf: -- 4.25.1 +- 4.25.2 libtiff: - '4.6' libwebp: diff --git a/.ci_support/win_64_numpy1.26python3.12.____cpython.yaml b/.ci_support/win_64_numpy1.26python3.12.____cpython.yaml index 1a41d7e4..96a3cd97 100644 --- a/.ci_support/win_64_numpy1.26python3.12.____cpython.yaml +++ b/.ci_support/win_64_numpy1.26python3.12.____cpython.yaml @@ -29,7 +29,7 @@ libopenvino_dev: libpng: - '1.6' libprotobuf: -- 4.25.1 +- 4.25.2 libtiff: - '4.6' libwebp: diff --git a/.scripts/build_steps.sh b/.scripts/build_steps.sh index 6524cb20..846fc2b0 100755 --- a/.scripts/build_steps.sh +++ b/.scripts/build_steps.sh @@ -34,9 +34,9 @@ CONDARC export CONDA_LIBMAMBA_SOLVER_NO_CHANNELS_FROM_INSTALLED=1 mamba install --update-specs --yes --quiet --channel conda-forge --strict-channel-priority \ - pip mamba conda-build boa conda-forge-ci-setup=4 + pip mamba conda-build conda-forge-ci-setup=4 "conda-build>=24.1" mamba update --update-specs --yes --quiet --channel conda-forge --strict-channel-priority \ - pip mamba conda-build boa conda-forge-ci-setup=4 + pip mamba conda-build conda-forge-ci-setup=4 "conda-build>=24.1" # set up the condarc setup_conda_rc "${FEEDSTOCK_ROOT}" "${RECIPE_ROOT}" "${CONFIG_FILE}" @@ -76,7 +76,7 @@ if [[ "${BUILD_WITH_CONDA_DEBUG:-0}" == 1 ]]; then # Drop into an interactive shell /bin/bash else - conda mambabuild "${RECIPE_ROOT}" -m "${CI_SUPPORT}/${CONFIG}.yaml" \ + conda build "${RECIPE_ROOT}" -m "${CI_SUPPORT}/${CONFIG}.yaml" \ --suppress-variables ${EXTRA_CB_OPTIONS:-} \ --clobber-file "${CI_SUPPORT}/clobber_${CONFIG}.yaml" \ --extra-meta flow_run_id="${flow_run_id:-}" remote_url="${remote_url:-}" sha="${sha:-}" diff --git a/.scripts/run_osx_build.sh b/.scripts/run_osx_build.sh index 9259eb93..16daa698 100755 --- a/.scripts/run_osx_build.sh +++ b/.scripts/run_osx_build.sh @@ -26,9 +26,9 @@ export CONDA_SOLVER="libmamba" export CONDA_LIBMAMBA_SOLVER_NO_CHANNELS_FROM_INSTALLED=1 mamba install --update-specs --quiet --yes --channel conda-forge --strict-channel-priority \ - pip mamba conda-build boa conda-forge-ci-setup=4 + pip mamba conda-build conda-forge-ci-setup=4 "conda-build>=24.1" mamba update --update-specs --yes --quiet --channel conda-forge --strict-channel-priority \ - pip mamba conda-build boa conda-forge-ci-setup=4 + pip mamba conda-build conda-forge-ci-setup=4 "conda-build>=24.1" @@ -81,7 +81,7 @@ else EXTRA_CB_OPTIONS="${EXTRA_CB_OPTIONS:-} --no-test" fi - conda mambabuild ./recipe -m ./.ci_support/${CONFIG}.yaml \ + conda build ./recipe -m ./.ci_support/${CONFIG}.yaml \ --suppress-variables ${EXTRA_CB_OPTIONS:-} \ --clobber-file ./.ci_support/clobber_${CONFIG}.yaml \ --extra-meta flow_run_id="$flow_run_id" remote_url="$remote_url" sha="$sha" diff --git a/.scripts/run_win_build.bat b/.scripts/run_win_build.bat index 48734de9..f801cf46 100755 --- a/.scripts/run_win_build.bat +++ b/.scripts/run_win_build.bat @@ -24,7 +24,7 @@ set "CONDA_LIBMAMBA_SOLVER_NO_CHANNELS_FROM_INSTALLED=1" :: Provision the necessary dependencies to build the recipe later echo Installing dependencies -mamba.exe install "python=3.10" pip mamba conda-build boa conda-forge-ci-setup=4 -c conda-forge --strict-channel-priority --yes +mamba.exe install "python=3.10" pip mamba conda-build conda-forge-ci-setup=4 "conda-build>=24.1" -c conda-forge --strict-channel-priority --yes if !errorlevel! neq 0 exit /b !errorlevel! :: Set basic configuration @@ -55,7 +55,7 @@ call :end_group :: Build the recipe echo Building recipe -conda.exe mambabuild "recipe" -m .ci_support\%CONFIG%.yaml --suppress-variables %EXTRA_CB_OPTIONS% +conda.exe build "recipe" -m .ci_support\%CONFIG%.yaml --suppress-variables %EXTRA_CB_OPTIONS% if !errorlevel! neq 0 exit /b !errorlevel! :: Prepare some environment variables for the upload step diff --git a/build-locally.py b/build-locally.py index 3f4b7a79..e0d408d0 100755 --- a/build-locally.py +++ b/build-locally.py @@ -64,8 +64,9 @@ def verify_config(ns): elif ns.config.startswith("osx"): if "OSX_SDK_DIR" not in os.environ: raise RuntimeError( - "Need OSX_SDK_DIR env variable set. Run 'export OSX_SDK_DIR=SDKs' " - "to download the SDK automatically to 'SDKs/MacOSX.sdk'. " + "Need OSX_SDK_DIR env variable set. Run 'export OSX_SDK_DIR=$PWD/SDKs' " + "to download the SDK automatically to '$PWD/SDKs/MacOSX.sdk'. " + "Note: OSX_SDK_DIR must be set to an absolute path. " "Setting this variable implies agreement to the licensing terms of the SDK by Apple." )