From cd3a3d2b40bb20824b5750701e0fa02d9945c40c Mon Sep 17 00:00:00 2001 From: regro-cf-autotick-bot <36490558+regro-cf-autotick-bot@users.noreply.github.com> Date: Thu, 5 Oct 2023 10:20:06 +0000 Subject: [PATCH 1/2] Rebuild for libjpeg_turbo3 --- .ci_support/migrations/libjpeg_turbo3.yaml | 7 +++++++ recipe/meta.yaml | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) create mode 100644 .ci_support/migrations/libjpeg_turbo3.yaml diff --git a/.ci_support/migrations/libjpeg_turbo3.yaml b/.ci_support/migrations/libjpeg_turbo3.yaml new file mode 100644 index 0000000..b4e2468 --- /dev/null +++ b/.ci_support/migrations/libjpeg_turbo3.yaml @@ -0,0 +1,7 @@ +__migrator: + build_number: 1 + kind: version + migration_number: 1 +libjpeg_turbo: +- '3' +migrator_ts: 1693842343.429878 diff --git a/recipe/meta.yaml b/recipe/meta.yaml index acfa36f..51994ef 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -9,7 +9,7 @@ source: sha256: 2e262ae5e5281f839651cd706e417c83c58294a26527ec184b466a2ba6ca31dc build: - number: 1 + number: 2 skip: true # [win] run_exports: - {{ pin_subpackage('openimageio', max_pin='x.x') }} From 8fd469e2ec58bd13a85906dc04e83f9f728f142e Mon Sep 17 00:00:00 2001 From: regro-cf-autotick-bot <36490558+regro-cf-autotick-bot@users.noreply.github.com> Date: Thu, 5 Oct 2023 10:20:23 +0000 Subject: [PATCH 2/2] MNT: Re-rendered with conda-build 3.27.0, conda-smithy 3.27.1, and conda-forge-pinning 2023.10.05.07.43.12 --- .ci_support/linux_64_numpy1.22python3.10.____cpython.yaml | 2 +- .ci_support/linux_64_numpy1.22python3.8.____cpython.yaml | 2 +- .ci_support/linux_64_numpy1.22python3.9.____cpython.yaml | 2 +- .ci_support/linux_64_numpy1.23python3.11.____cpython.yaml | 2 +- .ci_support/linux_64_numpy1.26python3.12.____cpython.yaml | 2 +- .../linux_aarch64_numpy1.22python3.10.____cpython.yaml | 2 +- .ci_support/linux_aarch64_numpy1.22python3.8.____cpython.yaml | 2 +- .ci_support/linux_aarch64_numpy1.22python3.9.____cpython.yaml | 2 +- .../linux_aarch64_numpy1.23python3.11.____cpython.yaml | 2 +- .../linux_aarch64_numpy1.26python3.12.____cpython.yaml | 2 +- .../linux_ppc64le_numpy1.22python3.10.____cpython.yaml | 2 +- .ci_support/linux_ppc64le_numpy1.22python3.8.____cpython.yaml | 2 +- .ci_support/linux_ppc64le_numpy1.22python3.9.____cpython.yaml | 2 +- .../linux_ppc64le_numpy1.23python3.11.____cpython.yaml | 2 +- .../linux_ppc64le_numpy1.26python3.12.____cpython.yaml | 2 +- .ci_support/osx_64_numpy1.22python3.10.____cpython.yaml | 4 ++-- .ci_support/osx_64_numpy1.22python3.8.____cpython.yaml | 4 ++-- .ci_support/osx_64_numpy1.22python3.9.____cpython.yaml | 4 ++-- .ci_support/osx_64_numpy1.23python3.11.____cpython.yaml | 4 ++-- .ci_support/osx_64_numpy1.26python3.12.____cpython.yaml | 4 ++-- .ci_support/osx_arm64_numpy1.22python3.10.____cpython.yaml | 4 ++-- .ci_support/osx_arm64_numpy1.22python3.8.____cpython.yaml | 4 ++-- .ci_support/osx_arm64_numpy1.22python3.9.____cpython.yaml | 4 ++-- .ci_support/osx_arm64_numpy1.23python3.11.____cpython.yaml | 4 ++-- .ci_support/osx_arm64_numpy1.26python3.12.____cpython.yaml | 4 ++-- .scripts/build_steps.sh | 2 +- .scripts/run_osx_build.sh | 2 +- 27 files changed, 37 insertions(+), 37 deletions(-) diff --git a/.ci_support/linux_64_numpy1.22python3.10.____cpython.yaml b/.ci_support/linux_64_numpy1.22python3.10.____cpython.yaml index 86f7825..8ab35d8 100644 --- a/.ci_support/linux_64_numpy1.22python3.10.____cpython.yaml +++ b/.ci_support/linux_64_numpy1.22python3.10.____cpython.yaml @@ -23,7 +23,7 @@ imath: libboost_devel: - '1.82' libjpeg_turbo: -- 2.1.5 +- '3' libpng: - '1.6' libraw: diff --git a/.ci_support/linux_64_numpy1.22python3.8.____cpython.yaml b/.ci_support/linux_64_numpy1.22python3.8.____cpython.yaml index 1fc8923..5f8739d 100644 --- a/.ci_support/linux_64_numpy1.22python3.8.____cpython.yaml +++ b/.ci_support/linux_64_numpy1.22python3.8.____cpython.yaml @@ -23,7 +23,7 @@ imath: libboost_devel: - '1.82' libjpeg_turbo: -- 2.1.5 +- '3' libpng: - '1.6' libraw: diff --git a/.ci_support/linux_64_numpy1.22python3.9.____cpython.yaml b/.ci_support/linux_64_numpy1.22python3.9.____cpython.yaml index 767a89a..b8c98a7 100644 --- a/.ci_support/linux_64_numpy1.22python3.9.____cpython.yaml +++ b/.ci_support/linux_64_numpy1.22python3.9.____cpython.yaml @@ -23,7 +23,7 @@ imath: libboost_devel: - '1.82' libjpeg_turbo: -- 2.1.5 +- '3' libpng: - '1.6' libraw: diff --git a/.ci_support/linux_64_numpy1.23python3.11.____cpython.yaml b/.ci_support/linux_64_numpy1.23python3.11.____cpython.yaml index 4d052a4..2ad0334 100644 --- a/.ci_support/linux_64_numpy1.23python3.11.____cpython.yaml +++ b/.ci_support/linux_64_numpy1.23python3.11.____cpython.yaml @@ -23,7 +23,7 @@ imath: libboost_devel: - '1.82' libjpeg_turbo: -- 2.1.5 +- '3' libpng: - '1.6' libraw: diff --git a/.ci_support/linux_64_numpy1.26python3.12.____cpython.yaml b/.ci_support/linux_64_numpy1.26python3.12.____cpython.yaml index 6104226..e467dda 100644 --- a/.ci_support/linux_64_numpy1.26python3.12.____cpython.yaml +++ b/.ci_support/linux_64_numpy1.26python3.12.____cpython.yaml @@ -23,7 +23,7 @@ imath: libboost_devel: - '1.82' libjpeg_turbo: -- 2.1.5 +- '3' libpng: - '1.6' libraw: diff --git a/.ci_support/linux_aarch64_numpy1.22python3.10.____cpython.yaml b/.ci_support/linux_aarch64_numpy1.22python3.10.____cpython.yaml index 2f475f9..3631589 100644 --- a/.ci_support/linux_aarch64_numpy1.22python3.10.____cpython.yaml +++ b/.ci_support/linux_aarch64_numpy1.22python3.10.____cpython.yaml @@ -27,7 +27,7 @@ imath: libboost_devel: - '1.82' libjpeg_turbo: -- 2.1.5 +- '3' libpng: - '1.6' libraw: diff --git a/.ci_support/linux_aarch64_numpy1.22python3.8.____cpython.yaml b/.ci_support/linux_aarch64_numpy1.22python3.8.____cpython.yaml index 43e7b42..7273222 100644 --- a/.ci_support/linux_aarch64_numpy1.22python3.8.____cpython.yaml +++ b/.ci_support/linux_aarch64_numpy1.22python3.8.____cpython.yaml @@ -27,7 +27,7 @@ imath: libboost_devel: - '1.82' libjpeg_turbo: -- 2.1.5 +- '3' libpng: - '1.6' libraw: diff --git a/.ci_support/linux_aarch64_numpy1.22python3.9.____cpython.yaml b/.ci_support/linux_aarch64_numpy1.22python3.9.____cpython.yaml index 1deec2e..8f5d3f3 100644 --- a/.ci_support/linux_aarch64_numpy1.22python3.9.____cpython.yaml +++ b/.ci_support/linux_aarch64_numpy1.22python3.9.____cpython.yaml @@ -27,7 +27,7 @@ imath: libboost_devel: - '1.82' libjpeg_turbo: -- 2.1.5 +- '3' libpng: - '1.6' libraw: diff --git a/.ci_support/linux_aarch64_numpy1.23python3.11.____cpython.yaml b/.ci_support/linux_aarch64_numpy1.23python3.11.____cpython.yaml index f1400b5..a4173be 100644 --- a/.ci_support/linux_aarch64_numpy1.23python3.11.____cpython.yaml +++ b/.ci_support/linux_aarch64_numpy1.23python3.11.____cpython.yaml @@ -27,7 +27,7 @@ imath: libboost_devel: - '1.82' libjpeg_turbo: -- 2.1.5 +- '3' libpng: - '1.6' libraw: diff --git a/.ci_support/linux_aarch64_numpy1.26python3.12.____cpython.yaml b/.ci_support/linux_aarch64_numpy1.26python3.12.____cpython.yaml index fef8a9c..46355ce 100644 --- a/.ci_support/linux_aarch64_numpy1.26python3.12.____cpython.yaml +++ b/.ci_support/linux_aarch64_numpy1.26python3.12.____cpython.yaml @@ -27,7 +27,7 @@ imath: libboost_devel: - '1.82' libjpeg_turbo: -- 2.1.5 +- '3' libpng: - '1.6' libraw: diff --git a/.ci_support/linux_ppc64le_numpy1.22python3.10.____cpython.yaml b/.ci_support/linux_ppc64le_numpy1.22python3.10.____cpython.yaml index 1ac64b4..aa46e3c 100644 --- a/.ci_support/linux_ppc64le_numpy1.22python3.10.____cpython.yaml +++ b/.ci_support/linux_ppc64le_numpy1.22python3.10.____cpython.yaml @@ -23,7 +23,7 @@ imath: libboost_devel: - '1.82' libjpeg_turbo: -- 2.1.5 +- '3' libpng: - '1.6' libraw: diff --git a/.ci_support/linux_ppc64le_numpy1.22python3.8.____cpython.yaml b/.ci_support/linux_ppc64le_numpy1.22python3.8.____cpython.yaml index f40b7ff..606957d 100644 --- a/.ci_support/linux_ppc64le_numpy1.22python3.8.____cpython.yaml +++ b/.ci_support/linux_ppc64le_numpy1.22python3.8.____cpython.yaml @@ -23,7 +23,7 @@ imath: libboost_devel: - '1.82' libjpeg_turbo: -- 2.1.5 +- '3' libpng: - '1.6' libraw: diff --git a/.ci_support/linux_ppc64le_numpy1.22python3.9.____cpython.yaml b/.ci_support/linux_ppc64le_numpy1.22python3.9.____cpython.yaml index 456cb15..c90cfbb 100644 --- a/.ci_support/linux_ppc64le_numpy1.22python3.9.____cpython.yaml +++ b/.ci_support/linux_ppc64le_numpy1.22python3.9.____cpython.yaml @@ -23,7 +23,7 @@ imath: libboost_devel: - '1.82' libjpeg_turbo: -- 2.1.5 +- '3' libpng: - '1.6' libraw: diff --git a/.ci_support/linux_ppc64le_numpy1.23python3.11.____cpython.yaml b/.ci_support/linux_ppc64le_numpy1.23python3.11.____cpython.yaml index b7f6d96..cfc3c40 100644 --- a/.ci_support/linux_ppc64le_numpy1.23python3.11.____cpython.yaml +++ b/.ci_support/linux_ppc64le_numpy1.23python3.11.____cpython.yaml @@ -23,7 +23,7 @@ imath: libboost_devel: - '1.82' libjpeg_turbo: -- 2.1.5 +- '3' libpng: - '1.6' libraw: diff --git a/.ci_support/linux_ppc64le_numpy1.26python3.12.____cpython.yaml b/.ci_support/linux_ppc64le_numpy1.26python3.12.____cpython.yaml index 850a943..1218a16 100644 --- a/.ci_support/linux_ppc64le_numpy1.26python3.12.____cpython.yaml +++ b/.ci_support/linux_ppc64le_numpy1.26python3.12.____cpython.yaml @@ -23,7 +23,7 @@ imath: libboost_devel: - '1.82' libjpeg_turbo: -- 2.1.5 +- '3' libpng: - '1.6' libraw: diff --git a/.ci_support/osx_64_numpy1.22python3.10.____cpython.yaml b/.ci_support/osx_64_numpy1.22python3.10.____cpython.yaml index 2850353..c121479 100644 --- a/.ci_support/osx_64_numpy1.22python3.10.____cpython.yaml +++ b/.ci_support/osx_64_numpy1.22python3.10.____cpython.yaml @@ -9,7 +9,7 @@ channel_targets: cxx_compiler: - clangxx cxx_compiler_version: -- '15' +- '16' ffmpeg: - '6' fmt: @@ -23,7 +23,7 @@ imath: libboost_devel: - '1.82' libjpeg_turbo: -- 2.1.5 +- '3' libpng: - '1.6' libraw: diff --git a/.ci_support/osx_64_numpy1.22python3.8.____cpython.yaml b/.ci_support/osx_64_numpy1.22python3.8.____cpython.yaml index 12db044..980310a 100644 --- a/.ci_support/osx_64_numpy1.22python3.8.____cpython.yaml +++ b/.ci_support/osx_64_numpy1.22python3.8.____cpython.yaml @@ -9,7 +9,7 @@ channel_targets: cxx_compiler: - clangxx cxx_compiler_version: -- '15' +- '16' ffmpeg: - '6' fmt: @@ -23,7 +23,7 @@ imath: libboost_devel: - '1.82' libjpeg_turbo: -- 2.1.5 +- '3' libpng: - '1.6' libraw: diff --git a/.ci_support/osx_64_numpy1.22python3.9.____cpython.yaml b/.ci_support/osx_64_numpy1.22python3.9.____cpython.yaml index 3c4c022..89708db 100644 --- a/.ci_support/osx_64_numpy1.22python3.9.____cpython.yaml +++ b/.ci_support/osx_64_numpy1.22python3.9.____cpython.yaml @@ -9,7 +9,7 @@ channel_targets: cxx_compiler: - clangxx cxx_compiler_version: -- '15' +- '16' ffmpeg: - '6' fmt: @@ -23,7 +23,7 @@ imath: libboost_devel: - '1.82' libjpeg_turbo: -- 2.1.5 +- '3' libpng: - '1.6' libraw: diff --git a/.ci_support/osx_64_numpy1.23python3.11.____cpython.yaml b/.ci_support/osx_64_numpy1.23python3.11.____cpython.yaml index 21f41fc..94d5efb 100644 --- a/.ci_support/osx_64_numpy1.23python3.11.____cpython.yaml +++ b/.ci_support/osx_64_numpy1.23python3.11.____cpython.yaml @@ -9,7 +9,7 @@ channel_targets: cxx_compiler: - clangxx cxx_compiler_version: -- '15' +- '16' ffmpeg: - '6' fmt: @@ -23,7 +23,7 @@ imath: libboost_devel: - '1.82' libjpeg_turbo: -- 2.1.5 +- '3' libpng: - '1.6' libraw: diff --git a/.ci_support/osx_64_numpy1.26python3.12.____cpython.yaml b/.ci_support/osx_64_numpy1.26python3.12.____cpython.yaml index fc2a117..1ab1ad1 100644 --- a/.ci_support/osx_64_numpy1.26python3.12.____cpython.yaml +++ b/.ci_support/osx_64_numpy1.26python3.12.____cpython.yaml @@ -9,7 +9,7 @@ channel_targets: cxx_compiler: - clangxx cxx_compiler_version: -- '15' +- '16' ffmpeg: - '6' fmt: @@ -23,7 +23,7 @@ imath: libboost_devel: - '1.82' libjpeg_turbo: -- 2.1.5 +- '3' libpng: - '1.6' libraw: diff --git a/.ci_support/osx_arm64_numpy1.22python3.10.____cpython.yaml b/.ci_support/osx_arm64_numpy1.22python3.10.____cpython.yaml index 08027e8..f88cc29 100644 --- a/.ci_support/osx_arm64_numpy1.22python3.10.____cpython.yaml +++ b/.ci_support/osx_arm64_numpy1.22python3.10.____cpython.yaml @@ -7,7 +7,7 @@ channel_targets: cxx_compiler: - clangxx cxx_compiler_version: -- '15' +- '16' ffmpeg: - '6' fmt: @@ -21,7 +21,7 @@ imath: libboost_devel: - '1.82' libjpeg_turbo: -- 2.1.5 +- '3' libpng: - '1.6' libraw: diff --git a/.ci_support/osx_arm64_numpy1.22python3.8.____cpython.yaml b/.ci_support/osx_arm64_numpy1.22python3.8.____cpython.yaml index 55c6533..fc25fc6 100644 --- a/.ci_support/osx_arm64_numpy1.22python3.8.____cpython.yaml +++ b/.ci_support/osx_arm64_numpy1.22python3.8.____cpython.yaml @@ -7,7 +7,7 @@ channel_targets: cxx_compiler: - clangxx cxx_compiler_version: -- '15' +- '16' ffmpeg: - '6' fmt: @@ -21,7 +21,7 @@ imath: libboost_devel: - '1.82' libjpeg_turbo: -- 2.1.5 +- '3' libpng: - '1.6' libraw: diff --git a/.ci_support/osx_arm64_numpy1.22python3.9.____cpython.yaml b/.ci_support/osx_arm64_numpy1.22python3.9.____cpython.yaml index caea7b0..aec5fbe 100644 --- a/.ci_support/osx_arm64_numpy1.22python3.9.____cpython.yaml +++ b/.ci_support/osx_arm64_numpy1.22python3.9.____cpython.yaml @@ -7,7 +7,7 @@ channel_targets: cxx_compiler: - clangxx cxx_compiler_version: -- '15' +- '16' ffmpeg: - '6' fmt: @@ -21,7 +21,7 @@ imath: libboost_devel: - '1.82' libjpeg_turbo: -- 2.1.5 +- '3' libpng: - '1.6' libraw: diff --git a/.ci_support/osx_arm64_numpy1.23python3.11.____cpython.yaml b/.ci_support/osx_arm64_numpy1.23python3.11.____cpython.yaml index 76a8dff..f1abad5 100644 --- a/.ci_support/osx_arm64_numpy1.23python3.11.____cpython.yaml +++ b/.ci_support/osx_arm64_numpy1.23python3.11.____cpython.yaml @@ -7,7 +7,7 @@ channel_targets: cxx_compiler: - clangxx cxx_compiler_version: -- '15' +- '16' ffmpeg: - '6' fmt: @@ -21,7 +21,7 @@ imath: libboost_devel: - '1.82' libjpeg_turbo: -- 2.1.5 +- '3' libpng: - '1.6' libraw: diff --git a/.ci_support/osx_arm64_numpy1.26python3.12.____cpython.yaml b/.ci_support/osx_arm64_numpy1.26python3.12.____cpython.yaml index e8768cf..1eaaf7c 100644 --- a/.ci_support/osx_arm64_numpy1.26python3.12.____cpython.yaml +++ b/.ci_support/osx_arm64_numpy1.26python3.12.____cpython.yaml @@ -7,7 +7,7 @@ channel_targets: cxx_compiler: - clangxx cxx_compiler_version: -- '15' +- '16' ffmpeg: - '6' fmt: @@ -21,7 +21,7 @@ imath: libboost_devel: - '1.82' libjpeg_turbo: -- 2.1.5 +- '3' libpng: - '1.6' libraw: diff --git a/.scripts/build_steps.sh b/.scripts/build_steps.sh index 322832b..bd9e671 100755 --- a/.scripts/build_steps.sh +++ b/.scripts/build_steps.sh @@ -34,7 +34,7 @@ CONDARC mamba install --update-specs --yes --quiet --channel conda-forge --strict-channel-priority \ pip mamba conda-build boa conda-forge-ci-setup=3 mamba update --update-specs --yes --quiet --channel conda-forge --strict-channel-priority \ - pip mamba conda-build boa conda-forge-ci-setup + pip mamba conda-build boa conda-forge-ci-setup=3 # set up the condarc setup_conda_rc "${FEEDSTOCK_ROOT}" "${RECIPE_ROOT}" "${CONFIG_FILE}" diff --git a/.scripts/run_osx_build.sh b/.scripts/run_osx_build.sh index cd9a88f..870c49a 100755 --- a/.scripts/run_osx_build.sh +++ b/.scripts/run_osx_build.sh @@ -26,7 +26,7 @@ conda activate base mamba install --update-specs --quiet --yes --channel conda-forge --strict-channel-priority \ pip mamba conda-build boa conda-forge-ci-setup=3 mamba update --update-specs --yes --quiet --channel conda-forge --strict-channel-priority \ - pip mamba conda-build boa conda-forge-ci-setup + pip mamba conda-build boa conda-forge-ci-setup=3