From 559b9c74875a494619e00b40c3b8b3b69988afce Mon Sep 17 00:00:00 2001 From: Ilya Lavrenov Date: Mon, 8 Jan 2024 12:30:55 +0400 Subject: [PATCH 1/5] OpenCV 4.9.0 --- recipe/meta.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 417132bb..5207eca2 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -19,7 +19,7 @@ # # By putting all the generated files in 1 package, this makes the build process # much easier, at the expense of a few MBs in the 'lib' package. -{% set version = "4.8.1" %} +{% set version = "4.9.0" %} {% set major_version = version.split('.')[0] %} {% set PY_VER_MAJOR = PY_VER.split('.')[0] %} {% set PY_VER_MINOR = PY_VER.split('.')[1] %} @@ -31,7 +31,7 @@ package: source: - url: https://github.com/opencv/opencv/archive/{{ version }}.tar.gz fn: opencv-{{ version }}.tar.gz - sha256: 62f650467a60a38794d681ae7e66e3e8cfba38f445e0bf87867e2f2cdc8be9d5 + sha256: ddf76f9dffd322c7c3cb1f721d0887f62d747b82059342213138dc190f28bc6c patches: # backport https://github.com/opencv/opencv/pull/21611 (unmerged as of 06/2023) - patches_opencv/0001-Add-installation-of-pip-metadata-from-cmake.patch @@ -40,7 +40,7 @@ source: - patches_opencv/0004-fix-detection-for-protobuf-23.x.patch - url: https://github.com/opencv/opencv_contrib/archive/{{ version }}.tar.gz fn: opencv_contrib-{{ version }}.tar.gz - sha256: 0c082a0b29b3118f2a0a1856b403bb098643af7b994a0080f402a12159a99c6e + sha256: 8952c45a73b75676c522dd574229f563e43c271ae1d5bbbd26f8e2b6bc1a4dae folder: opencv_contrib patches: # Allow attempt to find HDF5 on cross-compile From 2b7678c91e2cea0c66833b1949301cabd0e312da Mon Sep 17 00:00:00 2001 From: Ilya Lavrenov Date: Tue, 9 Jan 2024 12:12:19 +0400 Subject: [PATCH 2/5] Update meta.yaml --- recipe/meta.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 5207eca2..3403950a 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -37,7 +37,6 @@ source: - patches_opencv/0001-Add-installation-of-pip-metadata-from-cmake.patch - patches_opencv/0002-delete-lines-that-download-opencv.patch - patches_opencv/0003-find-pkgconfig-on-windows.patch - - patches_opencv/0004-fix-detection-for-protobuf-23.x.patch - url: https://github.com/opencv/opencv_contrib/archive/{{ version }}.tar.gz fn: opencv_contrib-{{ version }}.tar.gz sha256: 8952c45a73b75676c522dd574229f563e43c271ae1d5bbbd26f8e2b6bc1a4dae From fc32d2b878e85e0c4c013731d5b0aead6be9186b Mon Sep 17 00:00:00 2001 From: Ilya Lavrenov Date: Tue, 9 Jan 2024 12:16:40 +0400 Subject: [PATCH 3/5] Removed patch 0004-fix-detection-for-protobuf-23.x.patch --- ...0004-fix-detection-for-protobuf-23.x.patch | 38 ------------------- 1 file changed, 38 deletions(-) delete mode 100644 recipe/patches_opencv/0004-fix-detection-for-protobuf-23.x.patch diff --git a/recipe/patches_opencv/0004-fix-detection-for-protobuf-23.x.patch b/recipe/patches_opencv/0004-fix-detection-for-protobuf-23.x.patch deleted file mode 100644 index b0a7b9e7..00000000 --- a/recipe/patches_opencv/0004-fix-detection-for-protobuf-23.x.patch +++ /dev/null @@ -1,38 +0,0 @@ -From 0913b73bff8085886dc3f554f552a46e063986d4 Mon Sep 17 00:00:00 2001 -From: Silvio Traversaro -Date: Sun, 4 Jun 2023 19:21:33 +0200 -Subject: [PATCH 4/4] fix detection for protobuf 23.x - ---- - cmake/OpenCVFindProtobuf.cmake | 18 +++++++++++++++++- - 1 file changed, 17 insertions(+), 1 deletion(-) - -diff --git a/cmake/OpenCVFindProtobuf.cmake b/cmake/OpenCVFindProtobuf.cmake -index 8835347d1d..6c5b04db2d 100644 ---- a/cmake/OpenCVFindProtobuf.cmake -+++ b/cmake/OpenCVFindProtobuf.cmake -@@ -31,7 +31,23 @@ if(BUILD_PROTOBUF) - set(HAVE_PROTOBUF TRUE) - else() - unset(Protobuf_VERSION CACHE) -- find_package(Protobuf QUIET) -+ # First look for protobuf-config.cmake, and only later use -+ # FindProtobuf.cmake shipped with CMake, for compatibility -+ # with protobuf >= 22 -+ set(protobuf_MODULE_COMPATIBLE TRUE CACHE INTERNAL "") -+ find_package(Protobuf CONFIG QUIET) -+ if(Protobuf_FOUND) -+ # if protobuf-config.cmake is used, we need to explicitly -+ # support the case in which we are cross-compiling and we want -+ # to explicitly specify via CMake command line the protoc to use -+ if(Protobuf_PROTOC_EXECUTABLE) -+ set_target_properties(protobuf::protoc PROPERTIES -+ IMPORTED_LOCATION_RELEASE "${Protobuf_PROTOC_EXECUTABLE}" -+ ) -+ endif() -+ else() -+ find_package(Protobuf QUIET) -+ endif() - - # Backwards compatibility - # Define camel case versions of input variables From 2640400a7821a5db9fa3de9c047402dbeace5da7 Mon Sep 17 00:00:00 2001 From: Ilya Lavrenov Date: Tue, 9 Jan 2024 19:17:31 +0800 Subject: [PATCH 4/5] Return patch for protobuf --- recipe/meta.yaml | 1 + ...0004-fix-detection-for-protobuf-23.x.patch | 22 +++++++++++++++++++ 2 files changed, 23 insertions(+) create mode 100644 recipe/patches_opencv/0004-fix-detection-for-protobuf-23.x.patch diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 5febcd58..ef729e52 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -37,6 +37,7 @@ source: - patches_opencv/0001-Add-installation-of-pip-metadata-from-cmake.patch - patches_opencv/0002-delete-lines-that-download-opencv.patch - patches_opencv/0003-find-pkgconfig-on-windows.patch + - patches_opencv/0004-fix-detection-for-protobuf-23.x.patch - url: https://github.com/opencv/opencv_contrib/archive/{{ version }}.tar.gz fn: opencv_contrib-{{ version }}.tar.gz sha256: 8952c45a73b75676c522dd574229f563e43c271ae1d5bbbd26f8e2b6bc1a4dae diff --git a/recipe/patches_opencv/0004-fix-detection-for-protobuf-23.x.patch b/recipe/patches_opencv/0004-fix-detection-for-protobuf-23.x.patch new file mode 100644 index 00000000..4f1d6cc5 --- /dev/null +++ b/recipe/patches_opencv/0004-fix-detection-for-protobuf-23.x.patch @@ -0,0 +1,22 @@ +diff --git a/cmake/OpenCVFindProtobuf.cmake b/cmake/OpenCVFindProtobuf.cmake +index 5b1e17529f..740ddcf771 100644 +--- a/cmake/OpenCVFindProtobuf.cmake ++++ b/cmake/OpenCVFindProtobuf.cmake +@@ -35,7 +35,16 @@ else() + + unset(Protobuf_VERSION CACHE) + find_package(Protobuf QUIET CONFIG) +- if(NOT Protobuf_FOUND) ++ if(Protobuf_FOUND) ++ # if protobuf-config.cmake is used, we need to explicitly ++ # support the case in which we are cross-compiling and we want ++ # to explicitly specify via CMake command line the protoc to use ++ if(Protobuf_PROTOC_EXECUTABLE) ++ set_target_properties(protobuf::protoc PROPERTIES ++ IMPORTED_LOCATION_RELEASE "${Protobuf_PROTOC_EXECUTABLE}" ++ ) ++ endif() ++ else() + find_package(Protobuf QUIET) + endif() + From 852723f230ee653cc3e3cebe6ae7a24b602c2e93 Mon Sep 17 00:00:00 2001 From: "conda-forge-webservices[bot]" <91080706+conda-forge-webservices[bot]@users.noreply.github.com> Date: Tue, 9 Jan 2024 11:11:15 +0000 Subject: [PATCH 5/5] MNT: Re-rendered with conda-build 3.28.3, conda-smithy 3.30.2, and conda-forge-pinning 2024.01.08.19.20.26 --- .azure-pipelines/azure-pipelines-linux.yml | 3 +++ .azure-pipelines/azure-pipelines-osx.yml | 3 +++ .azure-pipelines/azure-pipelines-win.yml | 3 +++ ...otobuf3.21numpy1.22python3.10.____cpython.yaml | 2 +- ...rotobuf3.21numpy1.22python3.8.____cpython.yaml | 2 +- ...rotobuf3.21numpy1.22python3.9.____73_pypy.yaml | 2 +- ...rotobuf3.21numpy1.22python3.9.____cpython.yaml | 2 +- ...otobuf3.21numpy1.23python3.11.____cpython.yaml | 2 +- ...otobuf3.21numpy1.26python3.12.____cpython.yaml | 2 +- ...obuf4.24.4numpy1.22python3.10.____cpython.yaml | 2 +- ...tobuf4.24.4numpy1.22python3.8.____cpython.yaml | 2 +- ...tobuf4.24.4numpy1.22python3.9.____73_pypy.yaml | 2 +- ...tobuf4.24.4numpy1.22python3.9.____cpython.yaml | 2 +- ...obuf4.24.4numpy1.23python3.11.____cpython.yaml | 2 +- ...obuf4.24.4numpy1.26python3.12.____cpython.yaml | 2 +- ...x_aarch64_numpy1.22python3.10.____cpython.yaml | 2 +- ...ux_aarch64_numpy1.22python3.8.____cpython.yaml | 2 +- ...ux_aarch64_numpy1.22python3.9.____73_pypy.yaml | 2 +- ...ux_aarch64_numpy1.22python3.9.____cpython.yaml | 2 +- ...x_aarch64_numpy1.23python3.11.____cpython.yaml | 2 +- ...x_aarch64_numpy1.26python3.12.____cpython.yaml | 2 +- ...x_ppc64le_numpy1.22python3.10.____cpython.yaml | 2 +- ...ux_ppc64le_numpy1.22python3.8.____cpython.yaml | 2 +- ...ux_ppc64le_numpy1.22python3.9.____73_pypy.yaml | 2 +- ...ux_ppc64le_numpy1.22python3.9.____cpython.yaml | 2 +- ...x_ppc64le_numpy1.23python3.11.____cpython.yaml | 2 +- ...x_ppc64le_numpy1.26python3.12.____cpython.yaml | 2 +- .ci_support/migrations/libjpeg_turbo3.yaml | 7 ------- .ci_support/migrations/libtiff46.yaml | 7 ------- .../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 +- ...osx_arm64_numpy1.22python3.10.____cpython.yaml | 2 +- .../osx_arm64_numpy1.22python3.8.____cpython.yaml | 2 +- .../osx_arm64_numpy1.22python3.9.____cpython.yaml | 2 +- ...osx_arm64_numpy1.23python3.11.____cpython.yaml | 2 +- ...osx_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 +- .gitignore | 14 ++++++++++++-- .scripts/build_steps.sh | 15 ++++++++++++--- .scripts/run_docker_build.sh | 3 +++ .scripts/run_osx_build.sh | 13 ++++++++++--- .scripts/run_win_build.bat | 14 ++++++++++++-- README.md | 2 +- 52 files changed, 100 insertions(+), 66 deletions(-) delete mode 100644 .ci_support/migrations/libjpeg_turbo3.yaml delete mode 100644 .ci_support/migrations/libtiff46.yaml diff --git a/.azure-pipelines/azure-pipelines-linux.yml b/.azure-pipelines/azure-pipelines-linux.yml index beb9aa2e..6fa1cd9a 100755 --- a/.azure-pipelines/azure-pipelines-linux.yml +++ b/.azure-pipelines/azure-pipelines-linux.yml @@ -117,6 +117,9 @@ jobs: - script: | export CI=azure + export flow_run_id=azure_$(Build.BuildNumber).$(System.JobAttempt) + export remote_url=$(Build.Repository.Uri) + export sha=$(Build.SourceVersion) export GIT_BRANCH=$BUILD_SOURCEBRANCHNAME export FEEDSTOCK_NAME=$(basename ${BUILD_REPOSITORY_NAME}) if [[ "${BUILD_REASON:-}" == "PullRequest" ]]; then diff --git a/.azure-pipelines/azure-pipelines-osx.yml b/.azure-pipelines/azure-pipelines-osx.yml index 17ec432e..8654d40f 100755 --- a/.azure-pipelines/azure-pipelines-osx.yml +++ b/.azure-pipelines/azure-pipelines-osx.yml @@ -47,6 +47,9 @@ jobs: # TODO: Fast finish on azure pipelines? - script: | export CI=azure + export flow_run_id=azure_$(Build.BuildNumber).$(System.JobAttempt) + export remote_url=$(Build.Repository.Uri) + export sha=$(Build.SourceVersion) export OSX_FORCE_SDK_DOWNLOAD="1" export GIT_BRANCH=$BUILD_SOURCEBRANCHNAME export FEEDSTOCK_NAME=$(basename ${BUILD_REPOSITORY_NAME}) diff --git a/.azure-pipelines/azure-pipelines-win.yml b/.azure-pipelines/azure-pipelines-win.yml index eb061304..9f5a7811 100755 --- a/.azure-pipelines/azure-pipelines-win.yml +++ b/.azure-pipelines/azure-pipelines-win.yml @@ -57,6 +57,9 @@ jobs: PYTHONUNBUFFERED: 1 CONFIG: $(CONFIG) CI: azure + flow_run_id: azure_$(Build.BuildNumber).$(System.JobAttempt) + remote_url: $(Build.Repository.Uri) + sha: $(Build.SourceVersion) UPLOAD_PACKAGES: $(UPLOAD_PACKAGES) UPLOAD_TEMP: $(UPLOAD_TEMP) BINSTAR_TOKEN: $(BINSTAR_TOKEN) diff --git a/.ci_support/linux_64_libprotobuf3.21numpy1.22python3.10.____cpython.yaml b/.ci_support/linux_64_libprotobuf3.21numpy1.22python3.10.____cpython.yaml index c9beb360..af66b2f4 100644 --- a/.ci_support/linux_64_libprotobuf3.21numpy1.22python3.10.____cpython.yaml +++ b/.ci_support/linux_64_libprotobuf3.21numpy1.22python3.10.____cpython.yaml @@ -23,7 +23,7 @@ glib: harfbuzz: - '8' hdf5: -- 1.14.2 +- 1.14.3 jasper: - '4' libcblas: diff --git a/.ci_support/linux_64_libprotobuf3.21numpy1.22python3.8.____cpython.yaml b/.ci_support/linux_64_libprotobuf3.21numpy1.22python3.8.____cpython.yaml index 449da66c..d906af24 100644 --- a/.ci_support/linux_64_libprotobuf3.21numpy1.22python3.8.____cpython.yaml +++ b/.ci_support/linux_64_libprotobuf3.21numpy1.22python3.8.____cpython.yaml @@ -23,7 +23,7 @@ glib: harfbuzz: - '8' hdf5: -- 1.14.2 +- 1.14.3 jasper: - '4' libcblas: diff --git a/.ci_support/linux_64_libprotobuf3.21numpy1.22python3.9.____73_pypy.yaml b/.ci_support/linux_64_libprotobuf3.21numpy1.22python3.9.____73_pypy.yaml index 45d236b8..eb94fce1 100644 --- a/.ci_support/linux_64_libprotobuf3.21numpy1.22python3.9.____73_pypy.yaml +++ b/.ci_support/linux_64_libprotobuf3.21numpy1.22python3.9.____73_pypy.yaml @@ -23,7 +23,7 @@ glib: harfbuzz: - '8' hdf5: -- 1.14.2 +- 1.14.3 jasper: - '4' libcblas: diff --git a/.ci_support/linux_64_libprotobuf3.21numpy1.22python3.9.____cpython.yaml b/.ci_support/linux_64_libprotobuf3.21numpy1.22python3.9.____cpython.yaml index 29600101..bd7811af 100644 --- a/.ci_support/linux_64_libprotobuf3.21numpy1.22python3.9.____cpython.yaml +++ b/.ci_support/linux_64_libprotobuf3.21numpy1.22python3.9.____cpython.yaml @@ -23,7 +23,7 @@ glib: harfbuzz: - '8' hdf5: -- 1.14.2 +- 1.14.3 jasper: - '4' libcblas: diff --git a/.ci_support/linux_64_libprotobuf3.21numpy1.23python3.11.____cpython.yaml b/.ci_support/linux_64_libprotobuf3.21numpy1.23python3.11.____cpython.yaml index ae77d260..95e187ef 100644 --- a/.ci_support/linux_64_libprotobuf3.21numpy1.23python3.11.____cpython.yaml +++ b/.ci_support/linux_64_libprotobuf3.21numpy1.23python3.11.____cpython.yaml @@ -23,7 +23,7 @@ glib: harfbuzz: - '8' hdf5: -- 1.14.2 +- 1.14.3 jasper: - '4' libcblas: diff --git a/.ci_support/linux_64_libprotobuf3.21numpy1.26python3.12.____cpython.yaml b/.ci_support/linux_64_libprotobuf3.21numpy1.26python3.12.____cpython.yaml index 66a62f26..4e7f200d 100644 --- a/.ci_support/linux_64_libprotobuf3.21numpy1.26python3.12.____cpython.yaml +++ b/.ci_support/linux_64_libprotobuf3.21numpy1.26python3.12.____cpython.yaml @@ -23,7 +23,7 @@ glib: harfbuzz: - '8' hdf5: -- 1.14.2 +- 1.14.3 jasper: - '4' libcblas: diff --git a/.ci_support/linux_64_libprotobuf4.24.4numpy1.22python3.10.____cpython.yaml b/.ci_support/linux_64_libprotobuf4.24.4numpy1.22python3.10.____cpython.yaml index 12314211..15aaf1f0 100644 --- a/.ci_support/linux_64_libprotobuf4.24.4numpy1.22python3.10.____cpython.yaml +++ b/.ci_support/linux_64_libprotobuf4.24.4numpy1.22python3.10.____cpython.yaml @@ -23,7 +23,7 @@ glib: harfbuzz: - '8' hdf5: -- 1.14.2 +- 1.14.3 jasper: - '4' libcblas: diff --git a/.ci_support/linux_64_libprotobuf4.24.4numpy1.22python3.8.____cpython.yaml b/.ci_support/linux_64_libprotobuf4.24.4numpy1.22python3.8.____cpython.yaml index 198b63b4..955bdccf 100644 --- a/.ci_support/linux_64_libprotobuf4.24.4numpy1.22python3.8.____cpython.yaml +++ b/.ci_support/linux_64_libprotobuf4.24.4numpy1.22python3.8.____cpython.yaml @@ -23,7 +23,7 @@ glib: harfbuzz: - '8' hdf5: -- 1.14.2 +- 1.14.3 jasper: - '4' libcblas: diff --git a/.ci_support/linux_64_libprotobuf4.24.4numpy1.22python3.9.____73_pypy.yaml b/.ci_support/linux_64_libprotobuf4.24.4numpy1.22python3.9.____73_pypy.yaml index 9f958be2..7444c209 100644 --- a/.ci_support/linux_64_libprotobuf4.24.4numpy1.22python3.9.____73_pypy.yaml +++ b/.ci_support/linux_64_libprotobuf4.24.4numpy1.22python3.9.____73_pypy.yaml @@ -23,7 +23,7 @@ glib: harfbuzz: - '8' hdf5: -- 1.14.2 +- 1.14.3 jasper: - '4' libcblas: diff --git a/.ci_support/linux_64_libprotobuf4.24.4numpy1.22python3.9.____cpython.yaml b/.ci_support/linux_64_libprotobuf4.24.4numpy1.22python3.9.____cpython.yaml index 0a5ef91e..4cfb772a 100644 --- a/.ci_support/linux_64_libprotobuf4.24.4numpy1.22python3.9.____cpython.yaml +++ b/.ci_support/linux_64_libprotobuf4.24.4numpy1.22python3.9.____cpython.yaml @@ -23,7 +23,7 @@ glib: harfbuzz: - '8' hdf5: -- 1.14.2 +- 1.14.3 jasper: - '4' libcblas: diff --git a/.ci_support/linux_64_libprotobuf4.24.4numpy1.23python3.11.____cpython.yaml b/.ci_support/linux_64_libprotobuf4.24.4numpy1.23python3.11.____cpython.yaml index b31e3405..6f0c3762 100644 --- a/.ci_support/linux_64_libprotobuf4.24.4numpy1.23python3.11.____cpython.yaml +++ b/.ci_support/linux_64_libprotobuf4.24.4numpy1.23python3.11.____cpython.yaml @@ -23,7 +23,7 @@ glib: harfbuzz: - '8' hdf5: -- 1.14.2 +- 1.14.3 jasper: - '4' libcblas: diff --git a/.ci_support/linux_64_libprotobuf4.24.4numpy1.26python3.12.____cpython.yaml b/.ci_support/linux_64_libprotobuf4.24.4numpy1.26python3.12.____cpython.yaml index 45bb4bad..dfba5e0e 100644 --- a/.ci_support/linux_64_libprotobuf4.24.4numpy1.26python3.12.____cpython.yaml +++ b/.ci_support/linux_64_libprotobuf4.24.4numpy1.26python3.12.____cpython.yaml @@ -23,7 +23,7 @@ glib: harfbuzz: - '8' hdf5: -- 1.14.2 +- 1.14.3 jasper: - '4' libcblas: diff --git a/.ci_support/linux_aarch64_numpy1.22python3.10.____cpython.yaml b/.ci_support/linux_aarch64_numpy1.22python3.10.____cpython.yaml index 16c09822..27e8102a 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 @@ glib: harfbuzz: - '8' hdf5: -- 1.14.2 +- 1.14.3 jasper: - '4' libcblas: diff --git a/.ci_support/linux_aarch64_numpy1.22python3.8.____cpython.yaml b/.ci_support/linux_aarch64_numpy1.22python3.8.____cpython.yaml index 8fd2564b..f43d5c77 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 @@ glib: harfbuzz: - '8' hdf5: -- 1.14.2 +- 1.14.3 jasper: - '4' libcblas: 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 1873a6ef..af291148 100644 --- a/.ci_support/linux_aarch64_numpy1.22python3.9.____73_pypy.yaml +++ b/.ci_support/linux_aarch64_numpy1.22python3.9.____73_pypy.yaml @@ -27,7 +27,7 @@ glib: harfbuzz: - '8' hdf5: -- 1.14.2 +- 1.14.3 jasper: - '4' libcblas: diff --git a/.ci_support/linux_aarch64_numpy1.22python3.9.____cpython.yaml b/.ci_support/linux_aarch64_numpy1.22python3.9.____cpython.yaml index cb99b474..a3586065 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 @@ glib: harfbuzz: - '8' hdf5: -- 1.14.2 +- 1.14.3 jasper: - '4' libcblas: diff --git a/.ci_support/linux_aarch64_numpy1.23python3.11.____cpython.yaml b/.ci_support/linux_aarch64_numpy1.23python3.11.____cpython.yaml index d2a4041b..a8acd5b4 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 @@ glib: harfbuzz: - '8' hdf5: -- 1.14.2 +- 1.14.3 jasper: - '4' libcblas: diff --git a/.ci_support/linux_aarch64_numpy1.26python3.12.____cpython.yaml b/.ci_support/linux_aarch64_numpy1.26python3.12.____cpython.yaml index ba44e071..fc0ecd65 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 @@ glib: harfbuzz: - '8' hdf5: -- 1.14.2 +- 1.14.3 jasper: - '4' libcblas: diff --git a/.ci_support/linux_ppc64le_numpy1.22python3.10.____cpython.yaml b/.ci_support/linux_ppc64le_numpy1.22python3.10.____cpython.yaml index 57114feb..a2c14d5f 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 @@ glib: harfbuzz: - '8' hdf5: -- 1.14.2 +- 1.14.3 jasper: - '4' libcblas: diff --git a/.ci_support/linux_ppc64le_numpy1.22python3.8.____cpython.yaml b/.ci_support/linux_ppc64le_numpy1.22python3.8.____cpython.yaml index d3e4f878..15803928 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 @@ glib: harfbuzz: - '8' hdf5: -- 1.14.2 +- 1.14.3 jasper: - '4' libcblas: 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 8d34c688..2b4a0450 100644 --- a/.ci_support/linux_ppc64le_numpy1.22python3.9.____73_pypy.yaml +++ b/.ci_support/linux_ppc64le_numpy1.22python3.9.____73_pypy.yaml @@ -23,7 +23,7 @@ glib: harfbuzz: - '8' hdf5: -- 1.14.2 +- 1.14.3 jasper: - '4' libcblas: diff --git a/.ci_support/linux_ppc64le_numpy1.22python3.9.____cpython.yaml b/.ci_support/linux_ppc64le_numpy1.22python3.9.____cpython.yaml index 69e038c7..e24f5282 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 @@ glib: harfbuzz: - '8' hdf5: -- 1.14.2 +- 1.14.3 jasper: - '4' libcblas: diff --git a/.ci_support/linux_ppc64le_numpy1.23python3.11.____cpython.yaml b/.ci_support/linux_ppc64le_numpy1.23python3.11.____cpython.yaml index db41a37f..af712f76 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 @@ glib: harfbuzz: - '8' hdf5: -- 1.14.2 +- 1.14.3 jasper: - '4' libcblas: diff --git a/.ci_support/linux_ppc64le_numpy1.26python3.12.____cpython.yaml b/.ci_support/linux_ppc64le_numpy1.26python3.12.____cpython.yaml index 1a30329a..b38014df 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 @@ glib: harfbuzz: - '8' hdf5: -- 1.14.2 +- 1.14.3 jasper: - '4' libcblas: diff --git a/.ci_support/migrations/libjpeg_turbo3.yaml b/.ci_support/migrations/libjpeg_turbo3.yaml deleted file mode 100644 index b4e24688..00000000 --- a/.ci_support/migrations/libjpeg_turbo3.yaml +++ /dev/null @@ -1,7 +0,0 @@ -__migrator: - build_number: 1 - kind: version - migration_number: 1 -libjpeg_turbo: -- '3' -migrator_ts: 1693842343.429878 diff --git a/.ci_support/migrations/libtiff46.yaml b/.ci_support/migrations/libtiff46.yaml deleted file mode 100644 index 473b7bfd..00000000 --- a/.ci_support/migrations/libtiff46.yaml +++ /dev/null @@ -1,7 +0,0 @@ -__migrator: - build_number: 1 - kind: version - migration_number: 1 -libtiff: -- '4.6' -migrator_ts: 1694631046.2977061 diff --git a/.ci_support/osx_64_numpy1.22python3.10.____cpython.yaml b/.ci_support/osx_64_numpy1.22python3.10.____cpython.yaml index 8f1d6fdf..d1ed6059 100644 --- a/.ci_support/osx_64_numpy1.22python3.10.____cpython.yaml +++ b/.ci_support/osx_64_numpy1.22python3.10.____cpython.yaml @@ -23,7 +23,7 @@ glib: harfbuzz: - '8' hdf5: -- 1.14.2 +- 1.14.3 jasper: - '4' libcblas: diff --git a/.ci_support/osx_64_numpy1.22python3.8.____cpython.yaml b/.ci_support/osx_64_numpy1.22python3.8.____cpython.yaml index 68307425..2c34c7e6 100644 --- a/.ci_support/osx_64_numpy1.22python3.8.____cpython.yaml +++ b/.ci_support/osx_64_numpy1.22python3.8.____cpython.yaml @@ -23,7 +23,7 @@ glib: harfbuzz: - '8' hdf5: -- 1.14.2 +- 1.14.3 jasper: - '4' libcblas: 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 7992c217..8e001565 100644 --- a/.ci_support/osx_64_numpy1.22python3.9.____73_pypy.yaml +++ b/.ci_support/osx_64_numpy1.22python3.9.____73_pypy.yaml @@ -23,7 +23,7 @@ glib: harfbuzz: - '8' hdf5: -- 1.14.2 +- 1.14.3 jasper: - '4' libcblas: diff --git a/.ci_support/osx_64_numpy1.22python3.9.____cpython.yaml b/.ci_support/osx_64_numpy1.22python3.9.____cpython.yaml index 0a29ef75..1287d268 100644 --- a/.ci_support/osx_64_numpy1.22python3.9.____cpython.yaml +++ b/.ci_support/osx_64_numpy1.22python3.9.____cpython.yaml @@ -23,7 +23,7 @@ glib: harfbuzz: - '8' hdf5: -- 1.14.2 +- 1.14.3 jasper: - '4' libcblas: diff --git a/.ci_support/osx_64_numpy1.23python3.11.____cpython.yaml b/.ci_support/osx_64_numpy1.23python3.11.____cpython.yaml index bea34e38..318b3d10 100644 --- a/.ci_support/osx_64_numpy1.23python3.11.____cpython.yaml +++ b/.ci_support/osx_64_numpy1.23python3.11.____cpython.yaml @@ -23,7 +23,7 @@ glib: harfbuzz: - '8' hdf5: -- 1.14.2 +- 1.14.3 jasper: - '4' libcblas: diff --git a/.ci_support/osx_64_numpy1.26python3.12.____cpython.yaml b/.ci_support/osx_64_numpy1.26python3.12.____cpython.yaml index bcd9efa0..64c7a936 100644 --- a/.ci_support/osx_64_numpy1.26python3.12.____cpython.yaml +++ b/.ci_support/osx_64_numpy1.26python3.12.____cpython.yaml @@ -23,7 +23,7 @@ glib: harfbuzz: - '8' hdf5: -- 1.14.2 +- 1.14.3 jasper: - '4' libcblas: diff --git a/.ci_support/osx_arm64_numpy1.22python3.10.____cpython.yaml b/.ci_support/osx_arm64_numpy1.22python3.10.____cpython.yaml index f1ff615f..2fbbcd02 100644 --- a/.ci_support/osx_arm64_numpy1.22python3.10.____cpython.yaml +++ b/.ci_support/osx_arm64_numpy1.22python3.10.____cpython.yaml @@ -21,7 +21,7 @@ glib: harfbuzz: - '8' hdf5: -- 1.14.2 +- 1.14.3 jasper: - '4' libcblas: diff --git a/.ci_support/osx_arm64_numpy1.22python3.8.____cpython.yaml b/.ci_support/osx_arm64_numpy1.22python3.8.____cpython.yaml index 3da913fd..d4dc35a2 100644 --- a/.ci_support/osx_arm64_numpy1.22python3.8.____cpython.yaml +++ b/.ci_support/osx_arm64_numpy1.22python3.8.____cpython.yaml @@ -21,7 +21,7 @@ glib: harfbuzz: - '8' hdf5: -- 1.14.2 +- 1.14.3 jasper: - '4' libcblas: diff --git a/.ci_support/osx_arm64_numpy1.22python3.9.____cpython.yaml b/.ci_support/osx_arm64_numpy1.22python3.9.____cpython.yaml index 20afb720..c94acadc 100644 --- a/.ci_support/osx_arm64_numpy1.22python3.9.____cpython.yaml +++ b/.ci_support/osx_arm64_numpy1.22python3.9.____cpython.yaml @@ -21,7 +21,7 @@ glib: harfbuzz: - '8' hdf5: -- 1.14.2 +- 1.14.3 jasper: - '4' libcblas: diff --git a/.ci_support/osx_arm64_numpy1.23python3.11.____cpython.yaml b/.ci_support/osx_arm64_numpy1.23python3.11.____cpython.yaml index 1bc3b116..733349c3 100644 --- a/.ci_support/osx_arm64_numpy1.23python3.11.____cpython.yaml +++ b/.ci_support/osx_arm64_numpy1.23python3.11.____cpython.yaml @@ -21,7 +21,7 @@ glib: harfbuzz: - '8' hdf5: -- 1.14.2 +- 1.14.3 jasper: - '4' libcblas: diff --git a/.ci_support/osx_arm64_numpy1.26python3.12.____cpython.yaml b/.ci_support/osx_arm64_numpy1.26python3.12.____cpython.yaml index e7bbd809..0648996d 100644 --- a/.ci_support/osx_arm64_numpy1.26python3.12.____cpython.yaml +++ b/.ci_support/osx_arm64_numpy1.26python3.12.____cpython.yaml @@ -21,7 +21,7 @@ glib: harfbuzz: - '8' hdf5: -- 1.14.2 +- 1.14.3 jasper: - '4' libcblas: diff --git a/.ci_support/win_64_numpy1.22python3.10.____cpython.yaml b/.ci_support/win_64_numpy1.22python3.10.____cpython.yaml index f3a2e850..68dc5075 100644 --- a/.ci_support/win_64_numpy1.22python3.10.____cpython.yaml +++ b/.ci_support/win_64_numpy1.22python3.10.____cpython.yaml @@ -13,7 +13,7 @@ freetype: harfbuzz: - '8' hdf5: -- 1.14.2 +- 1.14.3 jasper: - '4' libcblas: diff --git a/.ci_support/win_64_numpy1.22python3.8.____cpython.yaml b/.ci_support/win_64_numpy1.22python3.8.____cpython.yaml index 65769dd3..2f2d1612 100644 --- a/.ci_support/win_64_numpy1.22python3.8.____cpython.yaml +++ b/.ci_support/win_64_numpy1.22python3.8.____cpython.yaml @@ -13,7 +13,7 @@ freetype: harfbuzz: - '8' hdf5: -- 1.14.2 +- 1.14.3 jasper: - '4' libcblas: 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 3caf5b3c..138f001d 100644 --- a/.ci_support/win_64_numpy1.22python3.9.____73_pypy.yaml +++ b/.ci_support/win_64_numpy1.22python3.9.____73_pypy.yaml @@ -13,7 +13,7 @@ freetype: harfbuzz: - '8' hdf5: -- 1.14.2 +- 1.14.3 jasper: - '4' libcblas: diff --git a/.ci_support/win_64_numpy1.22python3.9.____cpython.yaml b/.ci_support/win_64_numpy1.22python3.9.____cpython.yaml index c4ff10ba..98e5d3fc 100644 --- a/.ci_support/win_64_numpy1.22python3.9.____cpython.yaml +++ b/.ci_support/win_64_numpy1.22python3.9.____cpython.yaml @@ -13,7 +13,7 @@ freetype: harfbuzz: - '8' hdf5: -- 1.14.2 +- 1.14.3 jasper: - '4' libcblas: diff --git a/.ci_support/win_64_numpy1.23python3.11.____cpython.yaml b/.ci_support/win_64_numpy1.23python3.11.____cpython.yaml index 521d3eba..8e1bc47a 100644 --- a/.ci_support/win_64_numpy1.23python3.11.____cpython.yaml +++ b/.ci_support/win_64_numpy1.23python3.11.____cpython.yaml @@ -13,7 +13,7 @@ freetype: harfbuzz: - '8' hdf5: -- 1.14.2 +- 1.14.3 jasper: - '4' libcblas: diff --git a/.ci_support/win_64_numpy1.26python3.12.____cpython.yaml b/.ci_support/win_64_numpy1.26python3.12.____cpython.yaml index b3e4a6f3..c43662c3 100644 --- a/.ci_support/win_64_numpy1.26python3.12.____cpython.yaml +++ b/.ci_support/win_64_numpy1.26python3.12.____cpython.yaml @@ -13,7 +13,7 @@ freetype: harfbuzz: - '8' hdf5: -- 1.14.2 +- 1.14.3 jasper: - '4' libcblas: diff --git a/.gitignore b/.gitignore index c89ecb7d..c0029107 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,13 @@ -*.pyc +# User content belongs under recipe/. +# Feedstock configuration goes in `conda-forge.yml` +# Everything else is managed by the conda-smithy rerender process. +# Please do not modify + +* +!/conda-forge.yml -build_artifacts +!/*/ +!/recipe/** +!/.ci_support/** + +*.pyc diff --git a/.scripts/build_steps.sh b/.scripts/build_steps.sh index d772ecb3..465b19e8 100755 --- a/.scripts/build_steps.sh +++ b/.scripts/build_steps.sh @@ -28,13 +28,15 @@ conda-build: pkgs_dirs: - ${FEEDSTOCK_ROOT}/build_artifacts/pkg_cache - /opt/conda/pkgs +solver: libmamba 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=3 + pip mamba conda-build boa conda-forge-ci-setup=4 mamba update --update-specs --yes --quiet --channel conda-forge --strict-channel-priority \ - pip mamba conda-build boa conda-forge-ci-setup=3 + pip mamba conda-build boa conda-forge-ci-setup=4 # set up the condarc setup_conda_rc "${FEEDSTOCK_ROOT}" "${RECIPE_ROOT}" "${CONFIG_FILE}" @@ -63,6 +65,12 @@ if [[ -f "${FEEDSTOCK_ROOT}/LICENSE.txt" ]]; then cp "${FEEDSTOCK_ROOT}/LICENSE.txt" "${RECIPE_ROOT}/recipe-scripts-license.txt" fi +if [[ "${sha:-}" == "" ]]; then + pushd ${FEEDSTOCK_ROOT} + sha=$(git rev-parse HEAD) + popd +fi + if [[ "${BUILD_WITH_CONDA_DEBUG:-0}" == 1 ]]; then if [[ "x${BUILD_OUTPUT_ID:-}" != "x" ]]; then EXTRA_CB_OPTIONS="${EXTRA_CB_OPTIONS:-} --output-id ${BUILD_OUTPUT_ID}" @@ -76,7 +84,8 @@ if [[ "${BUILD_WITH_CONDA_DEBUG:-0}" == 1 ]]; then else conda mambabuild "${RECIPE_ROOT}" -m "${CI_SUPPORT}/${CONFIG}.yaml" \ --suppress-variables ${EXTRA_CB_OPTIONS:-} \ - --clobber-file "${CI_SUPPORT}/clobber_${CONFIG}.yaml" + --clobber-file "${CI_SUPPORT}/clobber_${CONFIG}.yaml" \ + --extra-meta flow_run_id="${flow_run_id:-}" remote_url="${remote_url:-}" sha="${sha:-}" ( startgroup "Validating outputs" ) 2> /dev/null validate_recipe_outputs "${FEEDSTOCK_NAME}" diff --git a/.scripts/run_docker_build.sh b/.scripts/run_docker_build.sh index 92362398..b70ef014 100755 --- a/.scripts/run_docker_build.sh +++ b/.scripts/run_docker_build.sh @@ -91,6 +91,9 @@ docker run ${DOCKER_RUN_ARGS} \ -e CPU_COUNT \ -e BUILD_WITH_CONDA_DEBUG \ -e BUILD_OUTPUT_ID \ + -e flow_run_id \ + -e remote_url \ + -e sha \ -e BINSTAR_TOKEN \ -e FEEDSTOCK_TOKEN \ -e STAGING_BINSTAR_TOKEN \ diff --git a/.scripts/run_osx_build.sh b/.scripts/run_osx_build.sh index 870c49aa..9259eb93 100755 --- a/.scripts/run_osx_build.sh +++ b/.scripts/run_osx_build.sh @@ -22,11 +22,13 @@ bash $MINIFORGE_FILE -b -p ${MINIFORGE_HOME} source ${MINIFORGE_HOME}/etc/profile.d/conda.sh conda activate base +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=3 + pip mamba conda-build boa conda-forge-ci-setup=4 mamba update --update-specs --yes --quiet --channel conda-forge --strict-channel-priority \ - pip mamba conda-build boa conda-forge-ci-setup=3 + pip mamba conda-build boa conda-forge-ci-setup=4 @@ -45,6 +47,10 @@ else echo -e "\n\nNot mangling homebrew as we are not running in CI" fi +if [[ "${sha:-}" == "" ]]; then + sha=$(git rev-parse HEAD) +fi + echo -e "\n\nRunning the build setup script." source run_conda_forge_build_setup @@ -77,7 +83,8 @@ else conda mambabuild ./recipe -m ./.ci_support/${CONFIG}.yaml \ --suppress-variables ${EXTRA_CB_OPTIONS:-} \ - --clobber-file ./.ci_support/clobber_${CONFIG}.yaml + --clobber-file ./.ci_support/clobber_${CONFIG}.yaml \ + --extra-meta flow_run_id="$flow_run_id" remote_url="$remote_url" sha="$sha" ( startgroup "Validating outputs" ) 2> /dev/null validate_recipe_outputs "${FEEDSTOCK_NAME}" diff --git a/.scripts/run_win_build.bat b/.scripts/run_win_build.bat index 07d34456..48734de9 100755 --- a/.scripts/run_win_build.bat +++ b/.scripts/run_win_build.bat @@ -17,10 +17,14 @@ call :start_group "Configuring conda" :: Activate the base conda environment call activate base +:: Configure the solver +set "CONDA_SOLVER=libmamba" +if !errorlevel! neq 0 exit /b !errorlevel! +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=3 -c conda-forge --strict-channel-priority --yes +mamba.exe install "python=3.10" pip mamba conda-build boa conda-forge-ci-setup=4 -c conda-forge --strict-channel-priority --yes if !errorlevel! neq 0 exit /b !errorlevel! :: Set basic configuration @@ -38,7 +42,13 @@ if EXIST LICENSE.txt ( copy LICENSE.txt "recipe\\recipe-scripts-license.txt" ) if NOT [%HOST_PLATFORM%] == [%BUILD_PLATFORM%] ( - set "EXTRA_CB_OPTIONS=%EXTRA_CB_OPTIONS% --no-test" + if [%CROSSCOMPILING_EMULATOR%] == [] ( + set "EXTRA_CB_OPTIONS=%EXTRA_CB_OPTIONS% --no-test" + ) +) + +if NOT [%flow_run_id%] == [] ( + set "EXTRA_CB_OPTIONS=%EXTRA_CB_OPTIONS% --extra-meta flow_run_id=%flow_run_id% remote_url=%remote_url% sha=%sha%" ) call :end_group diff --git a/README.md b/README.md index 567c2995..929c92e0 100644 --- a/README.md +++ b/README.md @@ -400,7 +400,7 @@ available continuous integration services. Thanks to the awesome service provide [CircleCI](https://circleci.com/), [AppVeyor](https://www.appveyor.com/), [Drone](https://cloud.drone.io/welcome), and [TravisCI](https://travis-ci.com/) it is possible to build and upload installable packages to the -[conda-forge](https://anaconda.org/conda-forge) [Anaconda-Cloud](https://anaconda.org/) +[conda-forge](https://anaconda.org/conda-forge) [anaconda.org](https://anaconda.org/) channel for Linux, Windows and OSX respectively. To manage the continuous integration and simplify feedstock maintenance