From 35ee4d12266aee6051c3d53029f1f22fbe7b676f Mon Sep 17 00:00:00 2001 From: "conda-forge-webservices[bot]" <121827174+conda-forge-webservices[bot]@users.noreply.github.com> Date: Sun, 22 Jan 2023 23:35:03 +0000 Subject: [PATCH 01/12] dummy commit for rerendering --- README.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/README.md b/README.md index ef61f3c..d722a8b 100644 --- a/README.md +++ b/README.md @@ -261,3 +261,6 @@ Feedstock Maintainers * [@lgritz](https://github.com/lgritz/) * [@wolfv](https://github.com/wolfv/) + + + From 5ce4346a34b87aa8fa72b42b954be789553fcaf9 Mon Sep 17 00:00:00 2001 From: "conda-forge-webservices[bot]" <91080706+conda-forge-webservices[bot]@users.noreply.github.com> Date: Sun, 22 Jan 2023 23:36:40 +0000 Subject: [PATCH 02/12] MNT: Re-rendered with conda-build 3.23.3, conda-smithy 3.22.1, and conda-forge-pinning 2023.01.22.23.15.20 --- .azure-pipelines/azure-pipelines-linux.yml | 36 ------ .azure-pipelines/azure-pipelines-osx.yml | 5 +- .../linux_64_python3.10.____cpython.yaml | 12 +- .../linux_64_python3.7.____cpython.yaml | 44 -------- .../linux_64_python3.8.____cpython.yaml | 12 +- .../linux_64_python3.9.____cpython.yaml | 12 +- .../linux_aarch64_python3.10.____cpython.yaml | 12 +- .../linux_aarch64_python3.7.____cpython.yaml | 48 -------- .../linux_aarch64_python3.8.____cpython.yaml | 12 +- .../linux_aarch64_python3.9.____cpython.yaml | 12 +- .../linux_ppc64le_python3.10.____cpython.yaml | 12 +- .../linux_ppc64le_python3.7.____cpython.yaml | 44 -------- .../linux_ppc64le_python3.8.____cpython.yaml | 12 +- .../linux_ppc64le_python3.9.____cpython.yaml | 12 +- .ci_support/migrations/ffmpeg44.yaml | 7 -- .ci_support/migrations/openexr31.yaml | 7 -- .ci_support/migrations/python310.yaml | 34 ------ .../osx_64_python3.10.____cpython.yaml | 12 +- .ci_support/osx_64_python3.7.____cpython.yaml | 44 -------- .ci_support/osx_64_python3.8.____cpython.yaml | 12 +- .ci_support/osx_64_python3.9.____cpython.yaml | 12 +- .circleci/config.yml | 5 +- .scripts/build_steps.sh | 13 ++- .scripts/run_osx_build.sh | 9 +- .travis.yml | 47 ++++++++ LICENSE.txt | 30 +++-- README.md | 103 +++++++++--------- build-locally.py | 19 +++- 28 files changed, 191 insertions(+), 448 deletions(-) delete mode 100644 .ci_support/linux_64_python3.7.____cpython.yaml delete mode 100644 .ci_support/linux_aarch64_python3.7.____cpython.yaml delete mode 100644 .ci_support/linux_ppc64le_python3.7.____cpython.yaml delete mode 100644 .ci_support/migrations/ffmpeg44.yaml delete mode 100644 .ci_support/migrations/openexr31.yaml delete mode 100644 .ci_support/migrations/python310.yaml delete mode 100644 .ci_support/osx_64_python3.7.____cpython.yaml create mode 100644 .travis.yml diff --git a/.azure-pipelines/azure-pipelines-linux.yml b/.azure-pipelines/azure-pipelines-linux.yml index f3c1734..91aec1d 100755 --- a/.azure-pipelines/azure-pipelines-linux.yml +++ b/.azure-pipelines/azure-pipelines-linux.yml @@ -12,10 +12,6 @@ jobs: CONFIG: linux_64_python3.10.____cpython UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - linux_64_python3.7.____cpython: - CONFIG: linux_64_python3.7.____cpython - UPLOAD_PACKAGES: 'True' - DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 linux_64_python3.8.____cpython: CONFIG: linux_64_python3.8.____cpython UPLOAD_PACKAGES: 'True' @@ -24,38 +20,6 @@ jobs: CONFIG: linux_64_python3.9.____cpython UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - linux_aarch64_python3.10.____cpython: - CONFIG: linux_aarch64_python3.10.____cpython - UPLOAD_PACKAGES: 'True' - DOCKER_IMAGE: quay.io/condaforge/linux-anvil-aarch64 - linux_aarch64_python3.7.____cpython: - CONFIG: linux_aarch64_python3.7.____cpython - UPLOAD_PACKAGES: 'True' - DOCKER_IMAGE: quay.io/condaforge/linux-anvil-aarch64 - linux_aarch64_python3.8.____cpython: - CONFIG: linux_aarch64_python3.8.____cpython - UPLOAD_PACKAGES: 'True' - DOCKER_IMAGE: quay.io/condaforge/linux-anvil-aarch64 - linux_aarch64_python3.9.____cpython: - CONFIG: linux_aarch64_python3.9.____cpython - UPLOAD_PACKAGES: 'True' - DOCKER_IMAGE: quay.io/condaforge/linux-anvil-aarch64 - linux_ppc64le_python3.10.____cpython: - CONFIG: linux_ppc64le_python3.10.____cpython - UPLOAD_PACKAGES: 'True' - DOCKER_IMAGE: quay.io/condaforge/linux-anvil-ppc64le - linux_ppc64le_python3.7.____cpython: - CONFIG: linux_ppc64le_python3.7.____cpython - UPLOAD_PACKAGES: 'True' - DOCKER_IMAGE: quay.io/condaforge/linux-anvil-ppc64le - linux_ppc64le_python3.8.____cpython: - CONFIG: linux_ppc64le_python3.8.____cpython - UPLOAD_PACKAGES: 'True' - DOCKER_IMAGE: quay.io/condaforge/linux-anvil-ppc64le - linux_ppc64le_python3.9.____cpython: - CONFIG: linux_ppc64le_python3.9.____cpython - UPLOAD_PACKAGES: 'True' - DOCKER_IMAGE: quay.io/condaforge/linux-anvil-ppc64le timeoutInMinutes: 360 steps: diff --git a/.azure-pipelines/azure-pipelines-osx.yml b/.azure-pipelines/azure-pipelines-osx.yml index a0d1f0a..3c2bd11 100755 --- a/.azure-pipelines/azure-pipelines-osx.yml +++ b/.azure-pipelines/azure-pipelines-osx.yml @@ -5,15 +5,12 @@ jobs: - job: osx pool: - vmImage: macOS-10.15 + vmImage: macOS-11 strategy: matrix: osx_64_python3.10.____cpython: CONFIG: osx_64_python3.10.____cpython UPLOAD_PACKAGES: 'True' - osx_64_python3.7.____cpython: - CONFIG: osx_64_python3.7.____cpython - UPLOAD_PACKAGES: 'True' osx_64_python3.8.____cpython: CONFIG: osx_64_python3.8.____cpython UPLOAD_PACKAGES: 'True' diff --git a/.ci_support/linux_64_python3.10.____cpython.yaml b/.ci_support/linux_64_python3.10.____cpython.yaml index 42fcdef..ed774e0 100644 --- a/.ci_support/linux_64_python3.10.____cpython.yaml +++ b/.ci_support/linux_64_python3.10.____cpython.yaml @@ -1,5 +1,5 @@ boost: -- 1.74.0 +- 1.78.0 cdt_name: - cos6 channel_sources: @@ -9,7 +9,7 @@ channel_targets: cxx_compiler: - gxx cxx_compiler_version: -- '10' +- '11' docker_image: - quay.io/condaforge/linux-anvil-cos7-x86_64 ffmpeg: @@ -21,7 +21,7 @@ jpeg: libpng: - '1.6' libtiff: -- '4' +- '4.4' libwebp: - '1' openexr: @@ -29,12 +29,6 @@ openexr: pin_run_as_build: boost: max_pin: x.x.x - jpeg: - max_pin: x - libpng: - max_pin: x.x - libtiff: - max_pin: x python: min_pin: x.x max_pin: x.x diff --git a/.ci_support/linux_64_python3.7.____cpython.yaml b/.ci_support/linux_64_python3.7.____cpython.yaml deleted file mode 100644 index 2ecdead..0000000 --- a/.ci_support/linux_64_python3.7.____cpython.yaml +++ /dev/null @@ -1,44 +0,0 @@ -boost: -- 1.74.0 -cdt_name: -- cos6 -channel_sources: -- conda-forge -channel_targets: -- conda-forge main -cxx_compiler: -- gxx -cxx_compiler_version: -- '10' -docker_image: -- quay.io/condaforge/linux-anvil-cos7-x86_64 -ffmpeg: -- '4.4' -giflib: -- '5.2' -jpeg: -- '9' -libpng: -- '1.6' -libtiff: -- '4' -libwebp: -- '1' -openexr: -- '3.1' -pin_run_as_build: - boost: - max_pin: x.x.x - jpeg: - max_pin: x - libpng: - max_pin: x.x - libtiff: - max_pin: x - python: - min_pin: x.x - max_pin: x.x -python: -- 3.7.* *_cpython -target_platform: -- linux-64 diff --git a/.ci_support/linux_64_python3.8.____cpython.yaml b/.ci_support/linux_64_python3.8.____cpython.yaml index 5ba6507..4eca22b 100644 --- a/.ci_support/linux_64_python3.8.____cpython.yaml +++ b/.ci_support/linux_64_python3.8.____cpython.yaml @@ -1,5 +1,5 @@ boost: -- 1.74.0 +- 1.78.0 cdt_name: - cos6 channel_sources: @@ -9,7 +9,7 @@ channel_targets: cxx_compiler: - gxx cxx_compiler_version: -- '10' +- '11' docker_image: - quay.io/condaforge/linux-anvil-cos7-x86_64 ffmpeg: @@ -21,7 +21,7 @@ jpeg: libpng: - '1.6' libtiff: -- '4' +- '4.4' libwebp: - '1' openexr: @@ -29,12 +29,6 @@ openexr: pin_run_as_build: boost: max_pin: x.x.x - jpeg: - max_pin: x - libpng: - max_pin: x.x - libtiff: - max_pin: x python: min_pin: x.x max_pin: x.x diff --git a/.ci_support/linux_64_python3.9.____cpython.yaml b/.ci_support/linux_64_python3.9.____cpython.yaml index 867e010..9e093ab 100644 --- a/.ci_support/linux_64_python3.9.____cpython.yaml +++ b/.ci_support/linux_64_python3.9.____cpython.yaml @@ -1,5 +1,5 @@ boost: -- 1.74.0 +- 1.78.0 cdt_name: - cos6 channel_sources: @@ -9,7 +9,7 @@ channel_targets: cxx_compiler: - gxx cxx_compiler_version: -- '10' +- '11' docker_image: - quay.io/condaforge/linux-anvil-cos7-x86_64 ffmpeg: @@ -21,7 +21,7 @@ jpeg: libpng: - '1.6' libtiff: -- '4' +- '4.4' libwebp: - '1' openexr: @@ -29,12 +29,6 @@ openexr: pin_run_as_build: boost: max_pin: x.x.x - jpeg: - max_pin: x - libpng: - max_pin: x.x - libtiff: - max_pin: x python: min_pin: x.x max_pin: x.x diff --git a/.ci_support/linux_aarch64_python3.10.____cpython.yaml b/.ci_support/linux_aarch64_python3.10.____cpython.yaml index cd03156..412f174 100644 --- a/.ci_support/linux_aarch64_python3.10.____cpython.yaml +++ b/.ci_support/linux_aarch64_python3.10.____cpython.yaml @@ -1,7 +1,7 @@ BUILD: - aarch64-conda_cos7-linux-gnu boost: -- 1.74.0 +- 1.78.0 cdt_arch: - aarch64 cdt_name: @@ -13,7 +13,7 @@ channel_targets: cxx_compiler: - gxx cxx_compiler_version: -- '10' +- '11' docker_image: - quay.io/condaforge/linux-anvil-aarch64 ffmpeg: @@ -25,7 +25,7 @@ jpeg: libpng: - '1.6' libtiff: -- '4' +- '4.4' libwebp: - '1' openexr: @@ -33,12 +33,6 @@ openexr: pin_run_as_build: boost: max_pin: x.x.x - jpeg: - max_pin: x - libpng: - max_pin: x.x - libtiff: - max_pin: x python: min_pin: x.x max_pin: x.x diff --git a/.ci_support/linux_aarch64_python3.7.____cpython.yaml b/.ci_support/linux_aarch64_python3.7.____cpython.yaml deleted file mode 100644 index 0f882f0..0000000 --- a/.ci_support/linux_aarch64_python3.7.____cpython.yaml +++ /dev/null @@ -1,48 +0,0 @@ -BUILD: -- aarch64-conda_cos7-linux-gnu -boost: -- 1.74.0 -cdt_arch: -- aarch64 -cdt_name: -- cos7 -channel_sources: -- conda-forge -channel_targets: -- conda-forge main -cxx_compiler: -- gxx -cxx_compiler_version: -- '10' -docker_image: -- quay.io/condaforge/linux-anvil-aarch64 -ffmpeg: -- '4.4' -giflib: -- '5.2' -jpeg: -- '9' -libpng: -- '1.6' -libtiff: -- '4' -libwebp: -- '1' -openexr: -- '3.1' -pin_run_as_build: - boost: - max_pin: x.x.x - jpeg: - max_pin: x - libpng: - max_pin: x.x - libtiff: - max_pin: x - python: - min_pin: x.x - max_pin: x.x -python: -- 3.7.* *_cpython -target_platform: -- linux-aarch64 diff --git a/.ci_support/linux_aarch64_python3.8.____cpython.yaml b/.ci_support/linux_aarch64_python3.8.____cpython.yaml index eea3dc2..bc37209 100644 --- a/.ci_support/linux_aarch64_python3.8.____cpython.yaml +++ b/.ci_support/linux_aarch64_python3.8.____cpython.yaml @@ -1,7 +1,7 @@ BUILD: - aarch64-conda_cos7-linux-gnu boost: -- 1.74.0 +- 1.78.0 cdt_arch: - aarch64 cdt_name: @@ -13,7 +13,7 @@ channel_targets: cxx_compiler: - gxx cxx_compiler_version: -- '10' +- '11' docker_image: - quay.io/condaforge/linux-anvil-aarch64 ffmpeg: @@ -25,7 +25,7 @@ jpeg: libpng: - '1.6' libtiff: -- '4' +- '4.4' libwebp: - '1' openexr: @@ -33,12 +33,6 @@ openexr: pin_run_as_build: boost: max_pin: x.x.x - jpeg: - max_pin: x - libpng: - max_pin: x.x - libtiff: - max_pin: x python: min_pin: x.x max_pin: x.x diff --git a/.ci_support/linux_aarch64_python3.9.____cpython.yaml b/.ci_support/linux_aarch64_python3.9.____cpython.yaml index 5b0901f..5448776 100644 --- a/.ci_support/linux_aarch64_python3.9.____cpython.yaml +++ b/.ci_support/linux_aarch64_python3.9.____cpython.yaml @@ -1,7 +1,7 @@ BUILD: - aarch64-conda_cos7-linux-gnu boost: -- 1.74.0 +- 1.78.0 cdt_arch: - aarch64 cdt_name: @@ -13,7 +13,7 @@ channel_targets: cxx_compiler: - gxx cxx_compiler_version: -- '10' +- '11' docker_image: - quay.io/condaforge/linux-anvil-aarch64 ffmpeg: @@ -25,7 +25,7 @@ jpeg: libpng: - '1.6' libtiff: -- '4' +- '4.4' libwebp: - '1' openexr: @@ -33,12 +33,6 @@ openexr: pin_run_as_build: boost: max_pin: x.x.x - jpeg: - max_pin: x - libpng: - max_pin: x.x - libtiff: - max_pin: x python: min_pin: x.x max_pin: x.x diff --git a/.ci_support/linux_ppc64le_python3.10.____cpython.yaml b/.ci_support/linux_ppc64le_python3.10.____cpython.yaml index ec23a7e..c461eca 100644 --- a/.ci_support/linux_ppc64le_python3.10.____cpython.yaml +++ b/.ci_support/linux_ppc64le_python3.10.____cpython.yaml @@ -1,5 +1,5 @@ boost: -- 1.74.0 +- 1.78.0 cdt_name: - cos7 channel_sources: @@ -9,7 +9,7 @@ channel_targets: cxx_compiler: - gxx cxx_compiler_version: -- '10' +- '11' docker_image: - quay.io/condaforge/linux-anvil-ppc64le ffmpeg: @@ -21,7 +21,7 @@ jpeg: libpng: - '1.6' libtiff: -- '4' +- '4.4' libwebp: - '1' openexr: @@ -29,12 +29,6 @@ openexr: pin_run_as_build: boost: max_pin: x.x.x - jpeg: - max_pin: x - libpng: - max_pin: x.x - libtiff: - max_pin: x python: min_pin: x.x max_pin: x.x diff --git a/.ci_support/linux_ppc64le_python3.7.____cpython.yaml b/.ci_support/linux_ppc64le_python3.7.____cpython.yaml deleted file mode 100644 index 54396ef..0000000 --- a/.ci_support/linux_ppc64le_python3.7.____cpython.yaml +++ /dev/null @@ -1,44 +0,0 @@ -boost: -- 1.74.0 -cdt_name: -- cos7 -channel_sources: -- conda-forge -channel_targets: -- conda-forge main -cxx_compiler: -- gxx -cxx_compiler_version: -- '10' -docker_image: -- quay.io/condaforge/linux-anvil-ppc64le -ffmpeg: -- '4.4' -giflib: -- '5.2' -jpeg: -- '9' -libpng: -- '1.6' -libtiff: -- '4' -libwebp: -- '1' -openexr: -- '3.1' -pin_run_as_build: - boost: - max_pin: x.x.x - jpeg: - max_pin: x - libpng: - max_pin: x.x - libtiff: - max_pin: x - python: - min_pin: x.x - max_pin: x.x -python: -- 3.7.* *_cpython -target_platform: -- linux-ppc64le diff --git a/.ci_support/linux_ppc64le_python3.8.____cpython.yaml b/.ci_support/linux_ppc64le_python3.8.____cpython.yaml index a1e1ade..a8de1d3 100644 --- a/.ci_support/linux_ppc64le_python3.8.____cpython.yaml +++ b/.ci_support/linux_ppc64le_python3.8.____cpython.yaml @@ -1,5 +1,5 @@ boost: -- 1.74.0 +- 1.78.0 cdt_name: - cos7 channel_sources: @@ -9,7 +9,7 @@ channel_targets: cxx_compiler: - gxx cxx_compiler_version: -- '10' +- '11' docker_image: - quay.io/condaforge/linux-anvil-ppc64le ffmpeg: @@ -21,7 +21,7 @@ jpeg: libpng: - '1.6' libtiff: -- '4' +- '4.4' libwebp: - '1' openexr: @@ -29,12 +29,6 @@ openexr: pin_run_as_build: boost: max_pin: x.x.x - jpeg: - max_pin: x - libpng: - max_pin: x.x - libtiff: - max_pin: x python: min_pin: x.x max_pin: x.x diff --git a/.ci_support/linux_ppc64le_python3.9.____cpython.yaml b/.ci_support/linux_ppc64le_python3.9.____cpython.yaml index 25d4d48..25cd993 100644 --- a/.ci_support/linux_ppc64le_python3.9.____cpython.yaml +++ b/.ci_support/linux_ppc64le_python3.9.____cpython.yaml @@ -1,5 +1,5 @@ boost: -- 1.74.0 +- 1.78.0 cdt_name: - cos7 channel_sources: @@ -9,7 +9,7 @@ channel_targets: cxx_compiler: - gxx cxx_compiler_version: -- '10' +- '11' docker_image: - quay.io/condaforge/linux-anvil-ppc64le ffmpeg: @@ -21,7 +21,7 @@ jpeg: libpng: - '1.6' libtiff: -- '4' +- '4.4' libwebp: - '1' openexr: @@ -29,12 +29,6 @@ openexr: pin_run_as_build: boost: max_pin: x.x.x - jpeg: - max_pin: x - libpng: - max_pin: x.x - libtiff: - max_pin: x python: min_pin: x.x max_pin: x.x diff --git a/.ci_support/migrations/ffmpeg44.yaml b/.ci_support/migrations/ffmpeg44.yaml deleted file mode 100644 index 76c3308..0000000 --- a/.ci_support/migrations/ffmpeg44.yaml +++ /dev/null @@ -1,7 +0,0 @@ -__migrator: - build_number: 1 - kind: version - migration_number: 1 -ffmpeg: -- '4.4' -migrator_ts: 1645963201.9878001 diff --git a/.ci_support/migrations/openexr31.yaml b/.ci_support/migrations/openexr31.yaml deleted file mode 100644 index 69765fc..0000000 --- a/.ci_support/migrations/openexr31.yaml +++ /dev/null @@ -1,7 +0,0 @@ -__migrator: - build_number: 1 - kind: version - migration_number: 1 -migrator_ts: 1647920048.0070014 -openexr: -- '3.1' diff --git a/.ci_support/migrations/python310.yaml b/.ci_support/migrations/python310.yaml deleted file mode 100644 index c31e991..0000000 --- a/.ci_support/migrations/python310.yaml +++ /dev/null @@ -1,34 +0,0 @@ -migrator_ts: 1634137107 -__migrator: - migration_number: 1 - operation: key_add - primary_key: python - ordering: - python: - - 3.6.* *_cpython - - 3.7.* *_cpython - - 3.8.* *_cpython - - 3.9.* *_cpython - - 3.10.* *_cpython # new entry - - 3.6.* *_73_pypy - - 3.7.* *_73_pypy - paused: false - longterm: True - pr_limit: 40 - max_solver_attempts: 10 # this will make the bot retry "not solvable" stuff 10 times - exclude: - # this shouldn't attempt to modify the python feedstocks - - python - - pypy3.6 - - pypy-meta - - cross-python - - python_abi - exclude_pinned_pkgs: false - -python: - - 3.10.* *_cpython -# additional entries to add for zip_keys -numpy: - - 1.21 -python_impl: - - cpython diff --git a/.ci_support/osx_64_python3.10.____cpython.yaml b/.ci_support/osx_64_python3.10.____cpython.yaml index fcfa52b..acce758 100644 --- a/.ci_support/osx_64_python3.10.____cpython.yaml +++ b/.ci_support/osx_64_python3.10.____cpython.yaml @@ -1,7 +1,7 @@ MACOSX_DEPLOYMENT_TARGET: - '10.9' boost: -- 1.74.0 +- 1.78.0 channel_sources: - conda-forge channel_targets: @@ -9,7 +9,7 @@ channel_targets: cxx_compiler: - clangxx cxx_compiler_version: -- '12' +- '14' ffmpeg: - '4.4' giflib: @@ -19,7 +19,7 @@ jpeg: libpng: - '1.6' libtiff: -- '4' +- '4.4' libwebp: - '1' macos_machine: @@ -29,12 +29,6 @@ openexr: pin_run_as_build: boost: max_pin: x.x.x - jpeg: - max_pin: x - libpng: - max_pin: x.x - libtiff: - max_pin: x python: min_pin: x.x max_pin: x.x diff --git a/.ci_support/osx_64_python3.7.____cpython.yaml b/.ci_support/osx_64_python3.7.____cpython.yaml deleted file mode 100644 index 92f8b11..0000000 --- a/.ci_support/osx_64_python3.7.____cpython.yaml +++ /dev/null @@ -1,44 +0,0 @@ -MACOSX_DEPLOYMENT_TARGET: -- '10.9' -boost: -- 1.74.0 -channel_sources: -- conda-forge -channel_targets: -- conda-forge main -cxx_compiler: -- clangxx -cxx_compiler_version: -- '12' -ffmpeg: -- '4.4' -giflib: -- '5.2' -jpeg: -- '9' -libpng: -- '1.6' -libtiff: -- '4' -libwebp: -- '1' -macos_machine: -- x86_64-apple-darwin13.4.0 -openexr: -- '3.1' -pin_run_as_build: - boost: - max_pin: x.x.x - jpeg: - max_pin: x - libpng: - max_pin: x.x - libtiff: - max_pin: x - python: - min_pin: x.x - max_pin: x.x -python: -- 3.7.* *_cpython -target_platform: -- osx-64 diff --git a/.ci_support/osx_64_python3.8.____cpython.yaml b/.ci_support/osx_64_python3.8.____cpython.yaml index 379d6c5..5454941 100644 --- a/.ci_support/osx_64_python3.8.____cpython.yaml +++ b/.ci_support/osx_64_python3.8.____cpython.yaml @@ -1,7 +1,7 @@ MACOSX_DEPLOYMENT_TARGET: - '10.9' boost: -- 1.74.0 +- 1.78.0 channel_sources: - conda-forge channel_targets: @@ -9,7 +9,7 @@ channel_targets: cxx_compiler: - clangxx cxx_compiler_version: -- '12' +- '14' ffmpeg: - '4.4' giflib: @@ -19,7 +19,7 @@ jpeg: libpng: - '1.6' libtiff: -- '4' +- '4.4' libwebp: - '1' macos_machine: @@ -29,12 +29,6 @@ openexr: pin_run_as_build: boost: max_pin: x.x.x - jpeg: - max_pin: x - libpng: - max_pin: x.x - libtiff: - max_pin: x python: min_pin: x.x max_pin: x.x diff --git a/.ci_support/osx_64_python3.9.____cpython.yaml b/.ci_support/osx_64_python3.9.____cpython.yaml index b005537..327a9fa 100644 --- a/.ci_support/osx_64_python3.9.____cpython.yaml +++ b/.ci_support/osx_64_python3.9.____cpython.yaml @@ -1,7 +1,7 @@ MACOSX_DEPLOYMENT_TARGET: - '10.9' boost: -- 1.74.0 +- 1.78.0 channel_sources: - conda-forge channel_targets: @@ -9,7 +9,7 @@ channel_targets: cxx_compiler: - clangxx cxx_compiler_version: -- '12' +- '14' ffmpeg: - '4.4' giflib: @@ -19,7 +19,7 @@ jpeg: libpng: - '1.6' libtiff: -- '4' +- '4.4' libwebp: - '1' macos_machine: @@ -29,12 +29,6 @@ openexr: pin_run_as_build: boost: max_pin: x.x.x - jpeg: - max_pin: x - libpng: - max_pin: x.x - libtiff: - max_pin: x python: min_pin: x.x max_pin: x.x diff --git a/.circleci/config.yml b/.circleci/config.yml index 6ad461b..8b4ef2f 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -1,13 +1,14 @@ # This file was generated automatically from conda-smithy. To update this configuration, # update the conda-forge.yml and/or the recipe/meta.yaml. -# -*- mode: yaml -*- +# -*- mode: jinja-yaml -*- version: 2 jobs: build: working_directory: ~/test - machine: true + machine: + image: ubuntu-2004:current steps: - run: # The Circle-CI build should not be active, but if this is not true for some reason, do a fast finish. diff --git a/.scripts/build_steps.sh b/.scripts/build_steps.sh index d71d6ae..71a4242 100755 --- a/.scripts/build_steps.sh +++ b/.scripts/build_steps.sh @@ -24,15 +24,18 @@ export CONFIG_FILE="${CI_SUPPORT}/${CONFIG}.yaml" cat >~/.condarc < /dev/null +if [[ -f "${FEEDSTOCK_ROOT}/LICENSE.txt" ]]; then + cp "${FEEDSTOCK_ROOT}/LICENSE.txt" "${RECIPE_ROOT}/recipe-scripts-license.txt" +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}" diff --git a/.scripts/run_osx_build.sh b/.scripts/run_osx_build.sh index 19843e0..caa788e 100755 --- a/.scripts/run_osx_build.sh +++ b/.scripts/run_osx_build.sh @@ -23,11 +23,10 @@ bash $MINIFORGE_FILE -b -p ${MINIFORGE_HOME} source ${MINIFORGE_HOME}/etc/profile.d/conda.sh conda activate base -echo -e "\n\nInstalling ['conda-forge-ci-setup=3'] and conda-build." mamba install --update-specs --quiet --yes --channel conda-forge \ - conda-build pip boa conda-forge-ci-setup=3 + conda-build pip boa conda-forge-ci-setup=3 "py-lief<0.12" mamba update --update-specs --yes --quiet --channel conda-forge \ - conda-build pip boa conda-forge-ci-setup=3 + conda-build pip boa conda-forge-ci-setup=3 "py-lief<0.12" @@ -57,6 +56,10 @@ echo -e "\n\nMaking the build clobber file" make_build_number ./ ./recipe ./.ci_support/${CONFIG}.yaml +if [[ -f LICENSE.txt ]]; then + cp LICENSE.txt "recipe/recipe-scripts-license.txt" +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}" diff --git a/.travis.yml b/.travis.yml new file mode 100644 index 0000000..ca68b6f --- /dev/null +++ b/.travis.yml @@ -0,0 +1,47 @@ +# This file was generated automatically from conda-smithy. To update this configuration, +# update the conda-forge.yml and/or the recipe/meta.yaml. + +language: generic + + + +matrix: + include: + - env: CONFIG=linux_aarch64_python3.10.____cpython UPLOAD_PACKAGES=True PLATFORM=linux-aarch64 DOCKER_IMAGE=quay.io/condaforge/linux-anvil-aarch64 + os: linux + arch: arm64 + dist: focal + + - env: CONFIG=linux_aarch64_python3.8.____cpython UPLOAD_PACKAGES=True PLATFORM=linux-aarch64 DOCKER_IMAGE=quay.io/condaforge/linux-anvil-aarch64 + os: linux + arch: arm64 + dist: focal + + - env: CONFIG=linux_aarch64_python3.9.____cpython UPLOAD_PACKAGES=True PLATFORM=linux-aarch64 DOCKER_IMAGE=quay.io/condaforge/linux-anvil-aarch64 + os: linux + arch: arm64 + dist: focal + + - env: CONFIG=linux_ppc64le_python3.10.____cpython UPLOAD_PACKAGES=True PLATFORM=linux-ppc64le DOCKER_IMAGE=quay.io/condaforge/linux-anvil-ppc64le + os: linux + arch: ppc64le + dist: focal + + - env: CONFIG=linux_ppc64le_python3.8.____cpython UPLOAD_PACKAGES=True PLATFORM=linux-ppc64le DOCKER_IMAGE=quay.io/condaforge/linux-anvil-ppc64le + os: linux + arch: ppc64le + dist: focal + + - env: CONFIG=linux_ppc64le_python3.9.____cpython UPLOAD_PACKAGES=True PLATFORM=linux-ppc64le DOCKER_IMAGE=quay.io/condaforge/linux-anvil-ppc64le + os: linux + arch: ppc64le + dist: focal + +script: + - export CI=travis + - export GIT_BRANCH="$TRAVIS_BRANCH" + - export FEEDSTOCK_NAME=$(basename ${TRAVIS_REPO_SLUG}) + - if [[ "${TRAVIS_PULL_REQUEST:-}" == "false" ]]; then export IS_PR_BUILD="False"; else export IS_PR_BUILD="True"; fi + + + - if [[ ${PLATFORM} =~ .*linux.* ]]; then CONDA_FORGE_DOCKER_RUN_ARGS="--network=host --security-opt=seccomp=unconfined" ./.scripts/run_docker_build.sh; fi \ No newline at end of file diff --git a/LICENSE.txt b/LICENSE.txt index 6ec1401..2ec51d7 100644 --- a/LICENSE.txt +++ b/LICENSE.txt @@ -1,13 +1,27 @@ -BSD 3-clause license +BSD-3-Clause license Copyright (c) 2015-2022, conda-forge contributors All rights reserved. -Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions are met: -1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer. + 1. Redistributions of source code must retain the above copyright notice, + this list of conditions and the following disclaimer. + 2. Redistributions in binary form must reproduce the above copyright + notice, this list of conditions and the following disclaimer in the + documentation and/or other materials provided with the distribution. + 3. Neither the name of the copyright holder nor the names of its + contributors may be used to endorse or promote products derived from + this software without specific prior written permission. -2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. - -3. Neither the name of the copyright holder nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. - -THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" +AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE +ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE FOR +ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL +DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR +SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER +CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT +LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY +OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH +DAMAGE. diff --git a/README.md b/README.md index d722a8b..1a73df4 100644 --- a/README.md +++ b/README.md @@ -28,7 +28,14 @@ Current build status ==================== - +
+ + + @@ -45,112 +52,84 @@ Current build status - - - - - - - - - - - - @@ -179,18 +158,43 @@ conda config --add channels conda-forge conda config --set channel_priority strict ``` -Once the `conda-forge` channel has been enabled, `openimageio, py-openimageio` can be installed with: +Once the `conda-forge` channel has been enabled, `openimageio, py-openimageio` can be installed with `conda`: ``` conda install openimageio py-openimageio ``` -It is possible to list all of the versions of `openimageio` available on your platform with: +or with `mamba`: + +``` +mamba install openimageio py-openimageio +``` + +It is possible to list all of the versions of `openimageio` available on your platform with `conda`: ``` conda search openimageio --channel conda-forge ``` +or with `mamba`: + +``` +mamba search openimageio --channel conda-forge +``` + +Alternatively, `mamba repoquery` may provide more information: + +``` +# Search all versions available on your platform: +mamba repoquery search openimageio --channel conda-forge + +# List packages depending on `openimageio`: +mamba repoquery whoneeds openimageio --channel conda-forge + +# List dependencies of `openimageio`: +mamba repoquery depends openimageio --channel conda-forge +``` + About conda-forge ================= @@ -206,10 +210,12 @@ for each of the installable packages. Such a repository is known as a *feedstock A feedstock is made up of a conda recipe (the instructions on what and how to build the package) and the necessary configurations for automatic building using freely available continuous integration services. Thanks to the awesome service provided by -[CircleCI](https://circleci.com/), [AppVeyor](https://www.appveyor.com/) -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/) channel for Linux, Windows and OSX respectively. +[Azure](https://azure.microsoft.com/en-us/services/devops/), [GitHub](https://github.com/), +[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/) +channel for Linux, Windows and OSX respectively. To manage the continuous integration and simplify feedstock maintenance [conda-smithy](https://github.com/conda-forge/conda-smithy) has been developed. @@ -261,6 +267,3 @@ Feedstock Maintainers * [@lgritz](https://github.com/lgritz/) * [@wolfv](https://github.com/wolfv/) - - - diff --git a/build-locally.py b/build-locally.py index eec38a0..3f4b7a7 100755 --- a/build-locally.py +++ b/build-locally.py @@ -86,12 +86,19 @@ def main(args=None): verify_config(ns) setup_environment(ns) - if ns.config.startswith("linux") or ( - ns.config.startswith("osx") and platform.system() == "Linux" - ): - run_docker_build(ns) - elif ns.config.startswith("osx"): - run_osx_build(ns) + try: + if ns.config.startswith("linux") or ( + ns.config.startswith("osx") and platform.system() == "Linux" + ): + run_docker_build(ns) + elif ns.config.startswith("osx"): + run_osx_build(ns) + finally: + recipe_license_file = os.path.join( + "recipe", "recipe-scripts-license.txt" + ) + if os.path.exists(recipe_license_file): + os.remove(recipe_license_file) if __name__ == "__main__": From 902124eede96c8b1b9c4f4c1c890bf623e0d7985 Mon Sep 17 00:00:00 2001 From: Mark Harfouche Date: Sun, 22 Jan 2023 18:37:21 -0500 Subject: [PATCH 03/12] Bump to 2.4.7.1 --- recipe/meta.yaml | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 751d26d..179b33d 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -1,5 +1,5 @@ {% set name = "openimageio" %} -{% set version = "2.2.18" %} +{% set version = "2.4.7.1" %} {% set sha256 = "b8dd189fbc97f1b172528e324daa904f74a166bad62c32e7166ca6c866734a29" %} package: @@ -8,11 +8,11 @@ package: source: fn: Release-{{ version }}.tar.gz - url: https://github.com/OpenImageIO/oiio/archive/Release-{{ version }}.0.tar.gz + url: https://github.com/OpenImageIO/oiio/archive/Release-{{ version }}.tar.gz sha256: {{ sha256 }} build: - number: 2 + number: 0 skip: true # [win] run_exports: - {{ pin_subpackage(name, max_pin='x.x') }} @@ -37,9 +37,6 @@ requirements: run: # boost and libwebp don't have a run_exports section - {{ pin_compatible('boost', max_pin='x.x.x') }} - - {{ pin_compatible('libwebp', max_pin='x.x') }} - # ffmpeg 3.x does not have a run-export section - - {{ pin_compatible('ffmpeg', max_pin='x.x') }} outputs: - name: openimageio From 7c838f1bf4d11ca60af00857211fe4e0470fa627 Mon Sep 17 00:00:00 2001 From: Mark Harfouche Date: Sun, 22 Jan 2023 18:47:41 -0500 Subject: [PATCH 04/12] Fix download link --- recipe/meta.yaml | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 179b33d..127394e 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -1,21 +1,18 @@ -{% set name = "openimageio" %} {% set version = "2.4.7.1" %} -{% set sha256 = "b8dd189fbc97f1b172528e324daa904f74a166bad62c32e7166ca6c866734a29" %} package: - name: {{ name }} + name: openimageio version: {{ version }} source: - fn: Release-{{ version }}.tar.gz - url: https://github.com/OpenImageIO/oiio/archive/Release-{{ version }}.tar.gz - sha256: {{ sha256 }} + url: https://github.com/OpenImageIO/oiio/archive/refs/tags/v{{ version }}.tar.gz + sha256: fd298f71e44c6776863db4b37c4a1388dba0d2eb37378afea95ab07a7cd6ecd4 build: number: 0 skip: true # [win] run_exports: - - {{ pin_subpackage(name, max_pin='x.x') }} + - {{ pin_subpackage('openimageio', max_pin='x.x') }} requirements: build: @@ -95,6 +92,8 @@ about: vast amounts of image data (tens of thousands of image files totaling multiple TB) very efficiently using only a tiny amount (tens of megabytes at most) of runtime memory. + dev_url: https://github.com/OpenImageIO/oiio + extra: recipe-maintainers: - SylvainCorlay From 9df82a8ec64da8fdeab4a58b9ab3a9bc0bcf2e67 Mon Sep 17 00:00:00 2001 From: Mark Harfouche Date: Sun, 22 Jan 2023 19:11:12 -0500 Subject: [PATCH 05/12] Update OSX SDK to 11.0 --- recipe/conda_build_config.yaml | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 recipe/conda_build_config.yaml diff --git a/recipe/conda_build_config.yaml b/recipe/conda_build_config.yaml new file mode 100644 index 0000000..1cb2a7a --- /dev/null +++ b/recipe/conda_build_config.yaml @@ -0,0 +1,3 @@ +# Required for definition of UTIME_OMIT +MACOSX_SDK_VERSION: # [osx and x86_64] + - "11.0" # [osx and x86_64] From 4ec6923cb8a0769ad7c2e123332aeb3f1853fe0d Mon Sep 17 00:00:00 2001 From: Mark Harfouche Date: Sun, 22 Jan 2023 19:11:50 -0500 Subject: [PATCH 06/12] MNT: Re-rendered with conda-build 3.23.3, conda-smithy 3.22.1, and conda-forge-pinning 2023.01.22.23.15.20 --- .ci_support/osx_64_python3.10.____cpython.yaml | 2 ++ .ci_support/osx_64_python3.8.____cpython.yaml | 2 ++ .ci_support/osx_64_python3.9.____cpython.yaml | 2 ++ README.md | 2 ++ 4 files changed, 8 insertions(+) diff --git a/.ci_support/osx_64_python3.10.____cpython.yaml b/.ci_support/osx_64_python3.10.____cpython.yaml index acce758..fdc1373 100644 --- a/.ci_support/osx_64_python3.10.____cpython.yaml +++ b/.ci_support/osx_64_python3.10.____cpython.yaml @@ -1,5 +1,7 @@ MACOSX_DEPLOYMENT_TARGET: - '10.9' +MACOSX_SDK_VERSION: +- '11.0' boost: - 1.78.0 channel_sources: diff --git a/.ci_support/osx_64_python3.8.____cpython.yaml b/.ci_support/osx_64_python3.8.____cpython.yaml index 5454941..ce8f393 100644 --- a/.ci_support/osx_64_python3.8.____cpython.yaml +++ b/.ci_support/osx_64_python3.8.____cpython.yaml @@ -1,5 +1,7 @@ MACOSX_DEPLOYMENT_TARGET: - '10.9' +MACOSX_SDK_VERSION: +- '11.0' boost: - 1.78.0 channel_sources: diff --git a/.ci_support/osx_64_python3.9.____cpython.yaml b/.ci_support/osx_64_python3.9.____cpython.yaml index 327a9fa..472fce5 100644 --- a/.ci_support/osx_64_python3.9.____cpython.yaml +++ b/.ci_support/osx_64_python3.9.____cpython.yaml @@ -1,5 +1,7 @@ MACOSX_DEPLOYMENT_TARGET: - '10.9' +MACOSX_SDK_VERSION: +- '11.0' boost: - 1.78.0 channel_sources: diff --git a/README.md b/README.md index 1a73df4..444f55f 100644 --- a/README.md +++ b/README.md @@ -9,6 +9,8 @@ Feedstock license: [BSD-3-Clause](https://github.com/conda-forge/openimageio-fee Summary: Simple but powerful APIs for reading & writing many image formats +Development: https://github.com/OpenImageIO/oiio + OpenImageIO consists of: - Simple but powerful ImageInput and ImageOutput APIs that provide an abstraction for reading and writing image files of nearly any format, without the calling From 5386299c5f6dad7d9ebd458fdcfec19ab759e47f Mon Sep 17 00:00:00 2001 From: Mark Harfouche Date: Sun, 22 Jan 2023 19:57:22 -0500 Subject: [PATCH 07/12] remove build flag. just try --- recipe/build.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipe/build.sh b/recipe/build.sh index f5eb006..f0165a7 100755 --- a/recipe/build.sh +++ b/recipe/build.sh @@ -1,6 +1,6 @@ #!/bin/bash -export CXXFLAGS="$CXXFLAGS -Wno-deprecated -DGIFLIB_MAJOR=5" +export CXXFLAGS="$CXXFLAGS -DGIFLIB_MAJOR=5" mkdir -vp ${PREFIX}/bin; mkdir build; cd build; From 74ce6d7be3dfe2099fdf194b06d26d5f58f9983b Mon Sep 17 00:00:00 2001 From: Mark Harfouche Date: Sun, 1 Oct 2023 19:54:53 -0400 Subject: [PATCH 08/12] MNT: Re-rendered with conda-build 3.25.0, conda-smithy 3.26.3, and conda-forge-pinning 2023.10.01.23.36.46 --- .azure-pipelines/azure-pipelines-linux.yml | 9 ++-- .azure-pipelines/azure-pipelines-osx.yml | 3 ++ .../linux_64_python3.10.____cpython.yaml | 10 +++-- .../linux_64_python3.11.____cpython.yaml | 40 +++++++++++++++++ .../linux_64_python3.8.____cpython.yaml | 10 +++-- .../linux_64_python3.9.____cpython.yaml | 10 +++-- .../linux_aarch64_python3.10.____cpython.yaml | 10 +++-- .../linux_aarch64_python3.11.____cpython.yaml | 44 +++++++++++++++++++ .../linux_aarch64_python3.8.____cpython.yaml | 10 +++-- .../linux_aarch64_python3.9.____cpython.yaml | 10 +++-- .../linux_ppc64le_python3.10.____cpython.yaml | 10 +++-- .../linux_ppc64le_python3.11.____cpython.yaml | 40 +++++++++++++++++ .../linux_ppc64le_python3.8.____cpython.yaml | 10 +++-- .../linux_ppc64le_python3.9.____cpython.yaml | 10 +++-- .../osx_64_python3.10.____cpython.yaml | 10 +++-- .../osx_64_python3.11.____cpython.yaml | 42 ++++++++++++++++++ .ci_support/osx_64_python3.8.____cpython.yaml | 10 +++-- .ci_support/osx_64_python3.9.____cpython.yaml | 10 +++-- .scripts/build_steps.sh | 9 ++-- .scripts/logging_utils.sh | 4 +- .scripts/run_osx_build.sh | 10 ++--- .travis.yml | 10 +++++ README.md | 36 +++++++++++++-- 23 files changed, 298 insertions(+), 69 deletions(-) create mode 100644 .ci_support/linux_64_python3.11.____cpython.yaml create mode 100644 .ci_support/linux_aarch64_python3.11.____cpython.yaml create mode 100644 .ci_support/linux_ppc64le_python3.11.____cpython.yaml create mode 100644 .ci_support/osx_64_python3.11.____cpython.yaml diff --git a/.azure-pipelines/azure-pipelines-linux.yml b/.azure-pipelines/azure-pipelines-linux.yml index 91aec1d..90be224 100755 --- a/.azure-pipelines/azure-pipelines-linux.yml +++ b/.azure-pipelines/azure-pipelines-linux.yml @@ -12,6 +12,10 @@ jobs: CONFIG: linux_64_python3.10.____cpython UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 + linux_64_python3.11.____cpython: + CONFIG: linux_64_python3.11.____cpython + UPLOAD_PACKAGES: 'True' + DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 linux_64_python3.8.____cpython: CONFIG: linux_64_python3.8.____cpython UPLOAD_PACKAGES: 'True' @@ -23,11 +27,6 @@ jobs: timeoutInMinutes: 360 steps: - - script: | - rm -rf /opt/ghc - df -h - displayName: Manage disk space - # configure qemu binfmt-misc running. This allows us to run docker containers # embedded qemu-static - script: | diff --git a/.azure-pipelines/azure-pipelines-osx.yml b/.azure-pipelines/azure-pipelines-osx.yml index 3c2bd11..6ba8295 100755 --- a/.azure-pipelines/azure-pipelines-osx.yml +++ b/.azure-pipelines/azure-pipelines-osx.yml @@ -11,6 +11,9 @@ jobs: osx_64_python3.10.____cpython: CONFIG: osx_64_python3.10.____cpython UPLOAD_PACKAGES: 'True' + osx_64_python3.11.____cpython: + CONFIG: osx_64_python3.11.____cpython + UPLOAD_PACKAGES: 'True' osx_64_python3.8.____cpython: CONFIG: osx_64_python3.8.____cpython UPLOAD_PACKAGES: 'True' diff --git a/.ci_support/linux_64_python3.10.____cpython.yaml b/.ci_support/linux_64_python3.10.____cpython.yaml index ed774e0..7dac894 100644 --- a/.ci_support/linux_64_python3.10.____cpython.yaml +++ b/.ci_support/linux_64_python3.10.____cpython.yaml @@ -9,23 +9,25 @@ channel_targets: cxx_compiler: - gxx cxx_compiler_version: -- '11' +- '12' docker_image: - quay.io/condaforge/linux-anvil-cos7-x86_64 ffmpeg: -- '4.4' +- '6' giflib: - '5.2' jpeg: - '9' libpng: - '1.6' +libraw: +- '0.21' libtiff: -- '4.4' +- '4.5' libwebp: - '1' openexr: -- '3.1' +- '3.2' pin_run_as_build: boost: max_pin: x.x.x diff --git a/.ci_support/linux_64_python3.11.____cpython.yaml b/.ci_support/linux_64_python3.11.____cpython.yaml new file mode 100644 index 0000000..e04aabe --- /dev/null +++ b/.ci_support/linux_64_python3.11.____cpython.yaml @@ -0,0 +1,40 @@ +boost: +- 1.78.0 +cdt_name: +- cos6 +channel_sources: +- conda-forge +channel_targets: +- conda-forge main +cxx_compiler: +- gxx +cxx_compiler_version: +- '12' +docker_image: +- quay.io/condaforge/linux-anvil-cos7-x86_64 +ffmpeg: +- '6' +giflib: +- '5.2' +jpeg: +- '9' +libpng: +- '1.6' +libraw: +- '0.21' +libtiff: +- '4.5' +libwebp: +- '1' +openexr: +- '3.2' +pin_run_as_build: + boost: + max_pin: x.x.x + python: + min_pin: x.x + max_pin: x.x +python: +- 3.11.* *_cpython +target_platform: +- linux-64 diff --git a/.ci_support/linux_64_python3.8.____cpython.yaml b/.ci_support/linux_64_python3.8.____cpython.yaml index 4eca22b..52ecb66 100644 --- a/.ci_support/linux_64_python3.8.____cpython.yaml +++ b/.ci_support/linux_64_python3.8.____cpython.yaml @@ -9,23 +9,25 @@ channel_targets: cxx_compiler: - gxx cxx_compiler_version: -- '11' +- '12' docker_image: - quay.io/condaforge/linux-anvil-cos7-x86_64 ffmpeg: -- '4.4' +- '6' giflib: - '5.2' jpeg: - '9' libpng: - '1.6' +libraw: +- '0.21' libtiff: -- '4.4' +- '4.5' libwebp: - '1' openexr: -- '3.1' +- '3.2' pin_run_as_build: boost: max_pin: x.x.x diff --git a/.ci_support/linux_64_python3.9.____cpython.yaml b/.ci_support/linux_64_python3.9.____cpython.yaml index 9e093ab..437f5f2 100644 --- a/.ci_support/linux_64_python3.9.____cpython.yaml +++ b/.ci_support/linux_64_python3.9.____cpython.yaml @@ -9,23 +9,25 @@ channel_targets: cxx_compiler: - gxx cxx_compiler_version: -- '11' +- '12' docker_image: - quay.io/condaforge/linux-anvil-cos7-x86_64 ffmpeg: -- '4.4' +- '6' giflib: - '5.2' jpeg: - '9' libpng: - '1.6' +libraw: +- '0.21' libtiff: -- '4.4' +- '4.5' libwebp: - '1' openexr: -- '3.1' +- '3.2' pin_run_as_build: boost: max_pin: x.x.x diff --git a/.ci_support/linux_aarch64_python3.10.____cpython.yaml b/.ci_support/linux_aarch64_python3.10.____cpython.yaml index 412f174..503aaec 100644 --- a/.ci_support/linux_aarch64_python3.10.____cpython.yaml +++ b/.ci_support/linux_aarch64_python3.10.____cpython.yaml @@ -13,23 +13,25 @@ channel_targets: cxx_compiler: - gxx cxx_compiler_version: -- '11' +- '12' docker_image: - quay.io/condaforge/linux-anvil-aarch64 ffmpeg: -- '4.4' +- '6' giflib: - '5.2' jpeg: - '9' libpng: - '1.6' +libraw: +- '0.21' libtiff: -- '4.4' +- '4.5' libwebp: - '1' openexr: -- '3.1' +- '3.2' pin_run_as_build: boost: max_pin: x.x.x diff --git a/.ci_support/linux_aarch64_python3.11.____cpython.yaml b/.ci_support/linux_aarch64_python3.11.____cpython.yaml new file mode 100644 index 0000000..11b4f86 --- /dev/null +++ b/.ci_support/linux_aarch64_python3.11.____cpython.yaml @@ -0,0 +1,44 @@ +BUILD: +- aarch64-conda_cos7-linux-gnu +boost: +- 1.78.0 +cdt_arch: +- aarch64 +cdt_name: +- cos7 +channel_sources: +- conda-forge +channel_targets: +- conda-forge main +cxx_compiler: +- gxx +cxx_compiler_version: +- '12' +docker_image: +- quay.io/condaforge/linux-anvil-aarch64 +ffmpeg: +- '6' +giflib: +- '5.2' +jpeg: +- '9' +libpng: +- '1.6' +libraw: +- '0.21' +libtiff: +- '4.5' +libwebp: +- '1' +openexr: +- '3.2' +pin_run_as_build: + boost: + max_pin: x.x.x + python: + min_pin: x.x + max_pin: x.x +python: +- 3.11.* *_cpython +target_platform: +- linux-aarch64 diff --git a/.ci_support/linux_aarch64_python3.8.____cpython.yaml b/.ci_support/linux_aarch64_python3.8.____cpython.yaml index bc37209..b925de0 100644 --- a/.ci_support/linux_aarch64_python3.8.____cpython.yaml +++ b/.ci_support/linux_aarch64_python3.8.____cpython.yaml @@ -13,23 +13,25 @@ channel_targets: cxx_compiler: - gxx cxx_compiler_version: -- '11' +- '12' docker_image: - quay.io/condaforge/linux-anvil-aarch64 ffmpeg: -- '4.4' +- '6' giflib: - '5.2' jpeg: - '9' libpng: - '1.6' +libraw: +- '0.21' libtiff: -- '4.4' +- '4.5' libwebp: - '1' openexr: -- '3.1' +- '3.2' pin_run_as_build: boost: max_pin: x.x.x diff --git a/.ci_support/linux_aarch64_python3.9.____cpython.yaml b/.ci_support/linux_aarch64_python3.9.____cpython.yaml index 5448776..aa896e1 100644 --- a/.ci_support/linux_aarch64_python3.9.____cpython.yaml +++ b/.ci_support/linux_aarch64_python3.9.____cpython.yaml @@ -13,23 +13,25 @@ channel_targets: cxx_compiler: - gxx cxx_compiler_version: -- '11' +- '12' docker_image: - quay.io/condaforge/linux-anvil-aarch64 ffmpeg: -- '4.4' +- '6' giflib: - '5.2' jpeg: - '9' libpng: - '1.6' +libraw: +- '0.21' libtiff: -- '4.4' +- '4.5' libwebp: - '1' openexr: -- '3.1' +- '3.2' pin_run_as_build: boost: max_pin: x.x.x diff --git a/.ci_support/linux_ppc64le_python3.10.____cpython.yaml b/.ci_support/linux_ppc64le_python3.10.____cpython.yaml index c461eca..b0e9bac 100644 --- a/.ci_support/linux_ppc64le_python3.10.____cpython.yaml +++ b/.ci_support/linux_ppc64le_python3.10.____cpython.yaml @@ -9,23 +9,25 @@ channel_targets: cxx_compiler: - gxx cxx_compiler_version: -- '11' +- '12' docker_image: - quay.io/condaforge/linux-anvil-ppc64le ffmpeg: -- '4.4' +- '6' giflib: - '5.2' jpeg: - '9' libpng: - '1.6' +libraw: +- '0.21' libtiff: -- '4.4' +- '4.5' libwebp: - '1' openexr: -- '3.1' +- '3.2' pin_run_as_build: boost: max_pin: x.x.x diff --git a/.ci_support/linux_ppc64le_python3.11.____cpython.yaml b/.ci_support/linux_ppc64le_python3.11.____cpython.yaml new file mode 100644 index 0000000..44812fc --- /dev/null +++ b/.ci_support/linux_ppc64le_python3.11.____cpython.yaml @@ -0,0 +1,40 @@ +boost: +- 1.78.0 +cdt_name: +- cos7 +channel_sources: +- conda-forge +channel_targets: +- conda-forge main +cxx_compiler: +- gxx +cxx_compiler_version: +- '12' +docker_image: +- quay.io/condaforge/linux-anvil-ppc64le +ffmpeg: +- '6' +giflib: +- '5.2' +jpeg: +- '9' +libpng: +- '1.6' +libraw: +- '0.21' +libtiff: +- '4.5' +libwebp: +- '1' +openexr: +- '3.2' +pin_run_as_build: + boost: + max_pin: x.x.x + python: + min_pin: x.x + max_pin: x.x +python: +- 3.11.* *_cpython +target_platform: +- linux-ppc64le diff --git a/.ci_support/linux_ppc64le_python3.8.____cpython.yaml b/.ci_support/linux_ppc64le_python3.8.____cpython.yaml index a8de1d3..d5b54ba 100644 --- a/.ci_support/linux_ppc64le_python3.8.____cpython.yaml +++ b/.ci_support/linux_ppc64le_python3.8.____cpython.yaml @@ -9,23 +9,25 @@ channel_targets: cxx_compiler: - gxx cxx_compiler_version: -- '11' +- '12' docker_image: - quay.io/condaforge/linux-anvil-ppc64le ffmpeg: -- '4.4' +- '6' giflib: - '5.2' jpeg: - '9' libpng: - '1.6' +libraw: +- '0.21' libtiff: -- '4.4' +- '4.5' libwebp: - '1' openexr: -- '3.1' +- '3.2' pin_run_as_build: boost: max_pin: x.x.x diff --git a/.ci_support/linux_ppc64le_python3.9.____cpython.yaml b/.ci_support/linux_ppc64le_python3.9.____cpython.yaml index 25cd993..a9c72a8 100644 --- a/.ci_support/linux_ppc64le_python3.9.____cpython.yaml +++ b/.ci_support/linux_ppc64le_python3.9.____cpython.yaml @@ -9,23 +9,25 @@ channel_targets: cxx_compiler: - gxx cxx_compiler_version: -- '11' +- '12' docker_image: - quay.io/condaforge/linux-anvil-ppc64le ffmpeg: -- '4.4' +- '6' giflib: - '5.2' jpeg: - '9' libpng: - '1.6' +libraw: +- '0.21' libtiff: -- '4.4' +- '4.5' libwebp: - '1' openexr: -- '3.1' +- '3.2' pin_run_as_build: boost: max_pin: x.x.x diff --git a/.ci_support/osx_64_python3.10.____cpython.yaml b/.ci_support/osx_64_python3.10.____cpython.yaml index fdc1373..2bae3a0 100644 --- a/.ci_support/osx_64_python3.10.____cpython.yaml +++ b/.ci_support/osx_64_python3.10.____cpython.yaml @@ -11,23 +11,25 @@ channel_targets: cxx_compiler: - clangxx cxx_compiler_version: -- '14' +- '15' ffmpeg: -- '4.4' +- '6' giflib: - '5.2' jpeg: - '9' libpng: - '1.6' +libraw: +- '0.21' libtiff: -- '4.4' +- '4.5' libwebp: - '1' macos_machine: - x86_64-apple-darwin13.4.0 openexr: -- '3.1' +- '3.2' pin_run_as_build: boost: max_pin: x.x.x diff --git a/.ci_support/osx_64_python3.11.____cpython.yaml b/.ci_support/osx_64_python3.11.____cpython.yaml new file mode 100644 index 0000000..98d9602 --- /dev/null +++ b/.ci_support/osx_64_python3.11.____cpython.yaml @@ -0,0 +1,42 @@ +MACOSX_DEPLOYMENT_TARGET: +- '10.9' +MACOSX_SDK_VERSION: +- '11.0' +boost: +- 1.78.0 +channel_sources: +- conda-forge +channel_targets: +- conda-forge main +cxx_compiler: +- clangxx +cxx_compiler_version: +- '15' +ffmpeg: +- '6' +giflib: +- '5.2' +jpeg: +- '9' +libpng: +- '1.6' +libraw: +- '0.21' +libtiff: +- '4.5' +libwebp: +- '1' +macos_machine: +- x86_64-apple-darwin13.4.0 +openexr: +- '3.2' +pin_run_as_build: + boost: + max_pin: x.x.x + python: + min_pin: x.x + max_pin: x.x +python: +- 3.11.* *_cpython +target_platform: +- osx-64 diff --git a/.ci_support/osx_64_python3.8.____cpython.yaml b/.ci_support/osx_64_python3.8.____cpython.yaml index ce8f393..538dc8b 100644 --- a/.ci_support/osx_64_python3.8.____cpython.yaml +++ b/.ci_support/osx_64_python3.8.____cpython.yaml @@ -11,23 +11,25 @@ channel_targets: cxx_compiler: - clangxx cxx_compiler_version: -- '14' +- '15' ffmpeg: -- '4.4' +- '6' giflib: - '5.2' jpeg: - '9' libpng: - '1.6' +libraw: +- '0.21' libtiff: -- '4.4' +- '4.5' libwebp: - '1' macos_machine: - x86_64-apple-darwin13.4.0 openexr: -- '3.1' +- '3.2' pin_run_as_build: boost: max_pin: x.x.x diff --git a/.ci_support/osx_64_python3.9.____cpython.yaml b/.ci_support/osx_64_python3.9.____cpython.yaml index 472fce5..d715ed5 100644 --- a/.ci_support/osx_64_python3.9.____cpython.yaml +++ b/.ci_support/osx_64_python3.9.____cpython.yaml @@ -11,23 +11,25 @@ channel_targets: cxx_compiler: - clangxx cxx_compiler_version: -- '14' +- '15' ffmpeg: -- '4.4' +- '6' giflib: - '5.2' jpeg: - '9' libpng: - '1.6' +libraw: +- '0.21' libtiff: -- '4.4' +- '4.5' libwebp: - '1' macos_machine: - x86_64-apple-darwin13.4.0 openexr: -- '3.1' +- '3.2' pin_run_as_build: boost: max_pin: x.x.x diff --git a/.scripts/build_steps.sh b/.scripts/build_steps.sh index 71a4242..438ed2b 100755 --- a/.scripts/build_steps.sh +++ b/.scripts/build_steps.sh @@ -31,11 +31,10 @@ pkgs_dirs: CONDARC - -mamba install --update-specs --yes --quiet --channel conda-forge \ - conda-build pip boa conda-forge-ci-setup=3 "py-lief<0.12" -mamba update --update-specs --yes --quiet --channel conda-forge \ - conda-build pip boa conda-forge-ci-setup=3 "py-lief<0.12" +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 # set up the condarc setup_conda_rc "${FEEDSTOCK_ROOT}" "${RECIPE_ROOT}" "${CONFIG_FILE}" diff --git a/.scripts/logging_utils.sh b/.scripts/logging_utils.sh index 57bc95c..aff009f 100644 --- a/.scripts/logging_utils.sh +++ b/.scripts/logging_utils.sh @@ -12,7 +12,7 @@ function startgroup { echo "##[group]$1";; travis ) echo "$1" - echo -en 'travis_fold:start:'"${1// /}"'\\r';; + echo -en 'travis_fold:start:'"${1// /}"'\r';; github_actions ) echo "::group::$1";; * ) @@ -28,7 +28,7 @@ function endgroup { azure ) echo "##[endgroup]";; travis ) - echo -en 'travis_fold:end:'"${1// /}"'\\r';; + echo -en 'travis_fold:end:'"${1// /}"'\r';; github_actions ) echo "::endgroup::";; esac diff --git a/.scripts/run_osx_build.sh b/.scripts/run_osx_build.sh index caa788e..0f0ee70 100755 --- a/.scripts/run_osx_build.sh +++ b/.scripts/run_osx_build.sh @@ -23,10 +23,10 @@ bash $MINIFORGE_FILE -b -p ${MINIFORGE_HOME} source ${MINIFORGE_HOME}/etc/profile.d/conda.sh conda activate base -mamba install --update-specs --quiet --yes --channel conda-forge \ - conda-build pip boa conda-forge-ci-setup=3 "py-lief<0.12" -mamba update --update-specs --yes --quiet --channel conda-forge \ - conda-build pip boa conda-forge-ci-setup=3 "py-lief<0.12" +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 @@ -55,7 +55,6 @@ source run_conda_forge_build_setup echo -e "\n\nMaking the build clobber file" make_build_number ./ ./recipe ./.ci_support/${CONFIG}.yaml - if [[ -f LICENSE.txt ]]; then cp LICENSE.txt "recipe/recipe-scripts-license.txt" fi @@ -71,6 +70,7 @@ if [[ "${BUILD_WITH_CONDA_DEBUG:-0}" == 1 ]]; then # Drop into an interactive shell /bin/bash else + conda mambabuild ./recipe -m ./.ci_support/${CONFIG}.yaml \ --suppress-variables ${EXTRA_CB_OPTIONS:-} \ --clobber-file ./.ci_support/clobber_${CONFIG}.yaml diff --git a/.travis.yml b/.travis.yml index ca68b6f..24e9391 100644 --- a/.travis.yml +++ b/.travis.yml @@ -12,6 +12,11 @@ matrix: arch: arm64 dist: focal + - env: CONFIG=linux_aarch64_python3.11.____cpython UPLOAD_PACKAGES=True PLATFORM=linux-aarch64 DOCKER_IMAGE=quay.io/condaforge/linux-anvil-aarch64 + os: linux + arch: arm64 + dist: focal + - env: CONFIG=linux_aarch64_python3.8.____cpython UPLOAD_PACKAGES=True PLATFORM=linux-aarch64 DOCKER_IMAGE=quay.io/condaforge/linux-anvil-aarch64 os: linux arch: arm64 @@ -27,6 +32,11 @@ matrix: arch: ppc64le dist: focal + - env: CONFIG=linux_ppc64le_python3.11.____cpython UPLOAD_PACKAGES=True PLATFORM=linux-ppc64le DOCKER_IMAGE=quay.io/condaforge/linux-anvil-ppc64le + os: linux + arch: ppc64le + dist: focal + - env: CONFIG=linux_ppc64le_python3.8.____cpython UPLOAD_PACKAGES=True PLATFORM=linux-ppc64le DOCKER_IMAGE=quay.io/condaforge/linux-anvil-ppc64le os: linux arch: ppc64le diff --git a/README.md b/README.md index 444f55f..71a05aa 100644 --- a/README.md +++ b/README.md @@ -1,12 +1,12 @@ -About openimageio -================= +About openimageio-feedstock +=========================== + +Feedstock license: [BSD-3-Clause](https://github.com/conda-forge/openimageio-feedstock/blob/main/LICENSE.txt) Home: https://sites.google.com/site/openimageio/home Package license: BSD-3-Clause -Feedstock license: [BSD-3-Clause](https://github.com/conda-forge/openimageio-feedstock/blob/main/LICENSE.txt) - Summary: Simple but powerful APIs for reading & writing many image formats Development: https://github.com/OpenImageIO/oiio @@ -57,6 +57,13 @@ Current build status variant + + + + + + + + + + + +
Travis + + linux + +
Azurelinux_64_python3.10.____cpython - variant - -
linux_64_python3.7.____cpython - - variant + variant
linux_64_python3.8.____cpython - variant + variant
linux_64_python3.9.____cpython - variant + variant
linux_aarch64_python3.10.____cpython - variant - -
linux_aarch64_python3.7.____cpython - - variant + variant
linux_aarch64_python3.8.____cpython - variant + variant
linux_aarch64_python3.9.____cpython - variant + variant
linux_ppc64le_python3.10.____cpython - variant - -
linux_ppc64le_python3.7.____cpython - - variant + variant
linux_ppc64le_python3.8.____cpython - variant + variant
linux_ppc64le_python3.9.____cpython - variant + variant
osx_64_python3.10.____cpython - variant - -
osx_64_python3.7.____cpython - - variant + variant
osx_64_python3.8.____cpython - variant + variant
osx_64_python3.9.____cpython - variant + variant
linux_64_python3.11.____cpython + + variant + +
linux_64_python3.8.____cpython @@ -78,6 +85,13 @@ Current build status variant
linux_aarch64_python3.11.____cpython + + variant + +
linux_aarch64_python3.8.____cpython @@ -99,6 +113,13 @@ Current build status variant
linux_ppc64le_python3.11.____cpython + + variant + +
linux_ppc64le_python3.8.____cpython @@ -120,6 +141,13 @@ Current build status variant
osx_64_python3.11.____cpython + + variant + +
osx_64_python3.8.____cpython From d161b686592dfb790284d0bf6ad353ac4c25d2c3 Mon Sep 17 00:00:00 2001 From: Mark Harfouche Date: Sun, 1 Oct 2023 19:57:23 -0400 Subject: [PATCH 09/12] update to 2.4.15.0 --- recipe/meta.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 127394e..d6404c1 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -1,4 +1,4 @@ -{% set version = "2.4.7.1" %} +{% set version = "2.4.15.0" %} package: name: openimageio @@ -6,7 +6,7 @@ package: source: url: https://github.com/OpenImageIO/oiio/archive/refs/tags/v{{ version }}.tar.gz - sha256: fd298f71e44c6776863db4b37c4a1388dba0d2eb37378afea95ab07a7cd6ecd4 + sha256: 67f28a1599eb942a075f23cc35c938f7de0b901a40583da6798cf9a418c56e07 build: number: 0 From 5fdd725fe4911691a102a5c77d9d73e6ef6962ba Mon Sep 17 00:00:00 2001 From: Mark Harfouche Date: Sun, 1 Oct 2023 20:02:49 -0400 Subject: [PATCH 10/12] Update to libjpeg-turbo --- recipe/meta.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index d6404c1..df43332 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -25,7 +25,7 @@ requirements: - boost - ffmpeg - giflib - - jpeg + - libjpeg-turbo - libpng - libtiff - libwebp @@ -59,7 +59,7 @@ outputs: - boost - ffmpeg - giflib - - jpeg + - libjpeg-turbo - libpng - libtiff - libwebp From 3c554d24125c6aa10f382468a849025c86bd15a6 Mon Sep 17 00:00:00 2001 From: Mark Harfouche Date: Sun, 1 Oct 2023 20:03:37 -0400 Subject: [PATCH 11/12] MNT: Re-rendered with conda-build 3.25.0, conda-smithy 3.26.3, and conda-forge-pinning 2023.10.01.23.36.46 --- .ci_support/linux_64_python3.10.____cpython.yaml | 4 ++-- .ci_support/linux_64_python3.11.____cpython.yaml | 4 ++-- .ci_support/linux_64_python3.8.____cpython.yaml | 4 ++-- .ci_support/linux_64_python3.9.____cpython.yaml | 4 ++-- .ci_support/linux_aarch64_python3.10.____cpython.yaml | 4 ++-- .ci_support/linux_aarch64_python3.11.____cpython.yaml | 4 ++-- .ci_support/linux_aarch64_python3.8.____cpython.yaml | 4 ++-- .ci_support/linux_aarch64_python3.9.____cpython.yaml | 4 ++-- .ci_support/linux_ppc64le_python3.10.____cpython.yaml | 4 ++-- .ci_support/linux_ppc64le_python3.11.____cpython.yaml | 4 ++-- .ci_support/linux_ppc64le_python3.8.____cpython.yaml | 4 ++-- .ci_support/linux_ppc64le_python3.9.____cpython.yaml | 4 ++-- .ci_support/osx_64_python3.10.____cpython.yaml | 4 ++-- .ci_support/osx_64_python3.11.____cpython.yaml | 4 ++-- .ci_support/osx_64_python3.8.____cpython.yaml | 4 ++-- .ci_support/osx_64_python3.9.____cpython.yaml | 4 ++-- 16 files changed, 32 insertions(+), 32 deletions(-) diff --git a/.ci_support/linux_64_python3.10.____cpython.yaml b/.ci_support/linux_64_python3.10.____cpython.yaml index 7dac894..88e3c25 100644 --- a/.ci_support/linux_64_python3.10.____cpython.yaml +++ b/.ci_support/linux_64_python3.10.____cpython.yaml @@ -16,8 +16,8 @@ ffmpeg: - '6' giflib: - '5.2' -jpeg: -- '9' +libjpeg_turbo: +- 2.1.5 libpng: - '1.6' libraw: diff --git a/.ci_support/linux_64_python3.11.____cpython.yaml b/.ci_support/linux_64_python3.11.____cpython.yaml index e04aabe..778605d 100644 --- a/.ci_support/linux_64_python3.11.____cpython.yaml +++ b/.ci_support/linux_64_python3.11.____cpython.yaml @@ -16,8 +16,8 @@ ffmpeg: - '6' giflib: - '5.2' -jpeg: -- '9' +libjpeg_turbo: +- 2.1.5 libpng: - '1.6' libraw: diff --git a/.ci_support/linux_64_python3.8.____cpython.yaml b/.ci_support/linux_64_python3.8.____cpython.yaml index 52ecb66..8035ca2 100644 --- a/.ci_support/linux_64_python3.8.____cpython.yaml +++ b/.ci_support/linux_64_python3.8.____cpython.yaml @@ -16,8 +16,8 @@ ffmpeg: - '6' giflib: - '5.2' -jpeg: -- '9' +libjpeg_turbo: +- 2.1.5 libpng: - '1.6' libraw: diff --git a/.ci_support/linux_64_python3.9.____cpython.yaml b/.ci_support/linux_64_python3.9.____cpython.yaml index 437f5f2..40deaa3 100644 --- a/.ci_support/linux_64_python3.9.____cpython.yaml +++ b/.ci_support/linux_64_python3.9.____cpython.yaml @@ -16,8 +16,8 @@ ffmpeg: - '6' giflib: - '5.2' -jpeg: -- '9' +libjpeg_turbo: +- 2.1.5 libpng: - '1.6' libraw: diff --git a/.ci_support/linux_aarch64_python3.10.____cpython.yaml b/.ci_support/linux_aarch64_python3.10.____cpython.yaml index 503aaec..86c891e 100644 --- a/.ci_support/linux_aarch64_python3.10.____cpython.yaml +++ b/.ci_support/linux_aarch64_python3.10.____cpython.yaml @@ -20,8 +20,8 @@ ffmpeg: - '6' giflib: - '5.2' -jpeg: -- '9' +libjpeg_turbo: +- 2.1.5 libpng: - '1.6' libraw: diff --git a/.ci_support/linux_aarch64_python3.11.____cpython.yaml b/.ci_support/linux_aarch64_python3.11.____cpython.yaml index 11b4f86..eb5a8ee 100644 --- a/.ci_support/linux_aarch64_python3.11.____cpython.yaml +++ b/.ci_support/linux_aarch64_python3.11.____cpython.yaml @@ -20,8 +20,8 @@ ffmpeg: - '6' giflib: - '5.2' -jpeg: -- '9' +libjpeg_turbo: +- 2.1.5 libpng: - '1.6' libraw: diff --git a/.ci_support/linux_aarch64_python3.8.____cpython.yaml b/.ci_support/linux_aarch64_python3.8.____cpython.yaml index b925de0..833cd37 100644 --- a/.ci_support/linux_aarch64_python3.8.____cpython.yaml +++ b/.ci_support/linux_aarch64_python3.8.____cpython.yaml @@ -20,8 +20,8 @@ ffmpeg: - '6' giflib: - '5.2' -jpeg: -- '9' +libjpeg_turbo: +- 2.1.5 libpng: - '1.6' libraw: diff --git a/.ci_support/linux_aarch64_python3.9.____cpython.yaml b/.ci_support/linux_aarch64_python3.9.____cpython.yaml index aa896e1..22f51af 100644 --- a/.ci_support/linux_aarch64_python3.9.____cpython.yaml +++ b/.ci_support/linux_aarch64_python3.9.____cpython.yaml @@ -20,8 +20,8 @@ ffmpeg: - '6' giflib: - '5.2' -jpeg: -- '9' +libjpeg_turbo: +- 2.1.5 libpng: - '1.6' libraw: diff --git a/.ci_support/linux_ppc64le_python3.10.____cpython.yaml b/.ci_support/linux_ppc64le_python3.10.____cpython.yaml index b0e9bac..a8d2fb8 100644 --- a/.ci_support/linux_ppc64le_python3.10.____cpython.yaml +++ b/.ci_support/linux_ppc64le_python3.10.____cpython.yaml @@ -16,8 +16,8 @@ ffmpeg: - '6' giflib: - '5.2' -jpeg: -- '9' +libjpeg_turbo: +- 2.1.5 libpng: - '1.6' libraw: diff --git a/.ci_support/linux_ppc64le_python3.11.____cpython.yaml b/.ci_support/linux_ppc64le_python3.11.____cpython.yaml index 44812fc..511056b 100644 --- a/.ci_support/linux_ppc64le_python3.11.____cpython.yaml +++ b/.ci_support/linux_ppc64le_python3.11.____cpython.yaml @@ -16,8 +16,8 @@ ffmpeg: - '6' giflib: - '5.2' -jpeg: -- '9' +libjpeg_turbo: +- 2.1.5 libpng: - '1.6' libraw: diff --git a/.ci_support/linux_ppc64le_python3.8.____cpython.yaml b/.ci_support/linux_ppc64le_python3.8.____cpython.yaml index d5b54ba..ed93901 100644 --- a/.ci_support/linux_ppc64le_python3.8.____cpython.yaml +++ b/.ci_support/linux_ppc64le_python3.8.____cpython.yaml @@ -16,8 +16,8 @@ ffmpeg: - '6' giflib: - '5.2' -jpeg: -- '9' +libjpeg_turbo: +- 2.1.5 libpng: - '1.6' libraw: diff --git a/.ci_support/linux_ppc64le_python3.9.____cpython.yaml b/.ci_support/linux_ppc64le_python3.9.____cpython.yaml index a9c72a8..3a4a585 100644 --- a/.ci_support/linux_ppc64le_python3.9.____cpython.yaml +++ b/.ci_support/linux_ppc64le_python3.9.____cpython.yaml @@ -16,8 +16,8 @@ ffmpeg: - '6' giflib: - '5.2' -jpeg: -- '9' +libjpeg_turbo: +- 2.1.5 libpng: - '1.6' libraw: diff --git a/.ci_support/osx_64_python3.10.____cpython.yaml b/.ci_support/osx_64_python3.10.____cpython.yaml index 2bae3a0..46826d7 100644 --- a/.ci_support/osx_64_python3.10.____cpython.yaml +++ b/.ci_support/osx_64_python3.10.____cpython.yaml @@ -16,8 +16,8 @@ ffmpeg: - '6' giflib: - '5.2' -jpeg: -- '9' +libjpeg_turbo: +- 2.1.5 libpng: - '1.6' libraw: diff --git a/.ci_support/osx_64_python3.11.____cpython.yaml b/.ci_support/osx_64_python3.11.____cpython.yaml index 98d9602..afadce9 100644 --- a/.ci_support/osx_64_python3.11.____cpython.yaml +++ b/.ci_support/osx_64_python3.11.____cpython.yaml @@ -16,8 +16,8 @@ ffmpeg: - '6' giflib: - '5.2' -jpeg: -- '9' +libjpeg_turbo: +- 2.1.5 libpng: - '1.6' libraw: diff --git a/.ci_support/osx_64_python3.8.____cpython.yaml b/.ci_support/osx_64_python3.8.____cpython.yaml index 538dc8b..e640566 100644 --- a/.ci_support/osx_64_python3.8.____cpython.yaml +++ b/.ci_support/osx_64_python3.8.____cpython.yaml @@ -16,8 +16,8 @@ ffmpeg: - '6' giflib: - '5.2' -jpeg: -- '9' +libjpeg_turbo: +- 2.1.5 libpng: - '1.6' libraw: diff --git a/.ci_support/osx_64_python3.9.____cpython.yaml b/.ci_support/osx_64_python3.9.____cpython.yaml index d715ed5..c5f197e 100644 --- a/.ci_support/osx_64_python3.9.____cpython.yaml +++ b/.ci_support/osx_64_python3.9.____cpython.yaml @@ -16,8 +16,8 @@ ffmpeg: - '6' giflib: - '5.2' -jpeg: -- '9' +libjpeg_turbo: +- 2.1.5 libpng: - '1.6' libraw: From 4b96842b45c87409adc23f718926c22fd59f5c22 Mon Sep 17 00:00:00 2001 From: Mark Harfouche Date: Sun, 1 Oct 2023 20:29:22 -0400 Subject: [PATCH 12/12] Specify CMAKE_ARGS --- recipe/build.sh | 30 ++++++++++++++++++------------ 1 file changed, 18 insertions(+), 12 deletions(-) diff --git a/recipe/build.sh b/recipe/build.sh index f0165a7..9e3a575 100755 --- a/recipe/build.sh +++ b/recipe/build.sh @@ -2,17 +2,23 @@ export CXXFLAGS="$CXXFLAGS -DGIFLIB_MAJOR=5" -mkdir -vp ${PREFIX}/bin; -mkdir build; cd build; -cmake $SRC_DIR \ - -DUSE_FFMPEG=ON \ - -DOIIO_BUILD_TOOLS=OFF \ - -DOIIO_BUILD_TESTS=OFF \ - -DUSE_PYTHON=ON \ - -DUSE_OPENCV=OFF \ - -DCMAKE_INSTALL_PREFIX=$PREFIX \ - -DCMAKE_INSTALL_LIBDIR=lib \ - -DCMAKE_BUILD_TYPE=Release \ - -DPYTHON_VERSION=$PY_VER \ +mkdir -p ${PREFIX}/bin + +mkdir build + +pushd build; +cmake ${CMAKE_ARGS} \ + -DUSE_FFMPEG=ON \ + -DOIIO_BUILD_TOOLS=OFF \ + -DOIIO_BUILD_TESTS=OFF \ + -DUSE_PYTHON=ON \ + -DUSE_OPENCV=OFF \ + -DCMAKE_INSTALL_PREFIX=$PREFIX \ + -DCMAKE_INSTALL_LIBDIR=lib \ + -DCMAKE_BUILD_TYPE=Release \ + -DPYTHON_VERSION=$PY_VER \ + .. make all -j${CPU_COUNT} + +popd