From 27cb7d02835a54017e7f0751bac55a060ac3c75a Mon Sep 17 00:00:00 2001 From: regro-cf-autotick-bot <36490558+regro-cf-autotick-bot@users.noreply.github.com> Date: Mon, 2 Oct 2023 10:11:40 +0000 Subject: [PATCH 01/15] updated v2.5.4.0 --- recipe/meta.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index a6cda21..1e219a7 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -1,4 +1,4 @@ -{% set version = "2.4.16.0" %} +{% set version = "2.5.4.0" %} package: name: openimageio @@ -6,7 +6,7 @@ package: source: url: https://github.com/OpenImageIO/oiio/archive/refs/tags/v{{ version }}.tar.gz - sha256: a8cea8b6087610e5154fbbe028548ab4fc773eb36531eef44ffb42351bc0b0f0 + sha256: 2e262ae5e5281f839651cd706e417c83c58294a26527ec184b466a2ba6ca31dc build: number: 0 From a897c17758f3ae889bdd1b0c25529afeb680d656 Mon Sep 17 00:00:00 2001 From: Mark Harfouche Date: Mon, 2 Oct 2023 09:03:35 -0400 Subject: [PATCH 02/15] Add patch to use modern find python --- recipe/4000-findpython.patch | 101 ++++++++++++++++++++++++++++++ recipe/meta.yaml | 3 + recipe/recipe-scripts-license.txt | 27 ++++++++ 3 files changed, 131 insertions(+) create mode 100644 recipe/4000-findpython.patch create mode 100644 recipe/recipe-scripts-license.txt diff --git a/recipe/4000-findpython.patch b/recipe/4000-findpython.patch new file mode 100644 index 0000000..31d9e30 --- /dev/null +++ b/recipe/4000-findpython.patch @@ -0,0 +1,101 @@ +From 485244087a5bd2fea5803d6eb4c9b0f2312bdb91 Mon Sep 17 00:00:00 2001 +From: Mark Harfouche +Date: Mon, 2 Oct 2023 08:57:10 -0400 +Subject: [PATCH] Use modern FindPython from CMake 3.12 + +This really helps with cross compilation and virtual environments +--- + src/cmake/externalpackages.cmake | 3 +- + src/cmake/pythonutils.cmake | 50 ++------------------------------ + 2 files changed, 4 insertions(+), 49 deletions(-) + +diff --git a/src/cmake/externalpackages.cmake b/src/cmake/externalpackages.cmake +index d9a18aa2d..2df164455 100644 +--- a/src/cmake/externalpackages.cmake ++++ b/src/cmake/externalpackages.cmake +@@ -156,8 +156,7 @@ else () + message (STATUS "Using internal PugiXML") + endif() + +-# From pythonutils.cmake +-find_python() ++find_package(Python COMPONENTS Interpreter Development) + + + ########################################################################### +diff --git a/src/cmake/pythonutils.cmake b/src/cmake/pythonutils.cmake +index 5799e29f2..a882bf80c 100644 +--- a/src/cmake/pythonutils.cmake ++++ b/src/cmake/pythonutils.cmake +@@ -4,7 +4,6 @@ + + # Python-related options. + option (USE_PYTHON "Build the Python bindings" ON) +-set (PYTHON_VERSION "" CACHE STRING "Target version of python to find") + option (PYLIB_INCLUDE_SONAME "If ON, soname/soversion will be set for Python module library" OFF) + option (PYLIB_LIB_PREFIX "If ON, prefix the Python module with 'lib'" OFF) + set (PYMODULE_SUFFIX "" CACHE STRING "Suffix to add to Python module init namespace") +@@ -15,49 +14,6 @@ else () + endif () + + +-# Find Python. This macro should only be called if python is required. If +-# Python cannot be found, it will be a fatal error. +-macro (find_python) +- if (NOT VERBOSE) +- set (PythonInterp_FIND_QUIETLY true) +- set (PythonLibs_FIND_QUIETLY true) +- endif () +- +- # Attempt to find the desired version, but fall back to other +- # additional versions. +- unset (_req) +- if (USE_PYTHON) +- set (_req REQUIRED) +- if (PYTHON_VERSION) +- list (APPEND _req EXACT) +- endif () +- endif () +- checked_find_package (Python ${PYTHON_VERSION} +- ${_req} +- COMPONENTS Interpreter Development +- PRINT Python_VERSION Python_EXECUTABLE +- Python_LIBRARIES +- Python_Development_FOUND +- Python_Interpreter_FOUND ) +- +- # The version that was found may not be the default or user +- # defined one. +- set (PYTHON_VERSION_FOUND ${Python_VERSION_MAJOR}.${Python_VERSION_MINOR}) +- +- # Give hints to subsequent pybind11 searching to ensure that it finds +- # exactly the same version that we found. +- set (PythonInterp_FIND_VERSION PYTHON_VERSION_FOUND) +- set (PythonInterp_FIND_VERSION_MAJOR ${Python_VERSION_MAJOR}) +- +- if (NOT DEFINED PYTHON_SITE_DIR) +- set (PYTHON_SITE_DIR "${CMAKE_INSTALL_LIBDIR}/python${PYTHON_VERSION_FOUND}/site-packages/OpenImageIO") +- endif () +- message (VERBOSE " Python site packages dir ${PYTHON_SITE_DIR}") +- message (VERBOSE " Python to include 'lib' prefix: ${PYLIB_LIB_PREFIX}") +- message (VERBOSE " Python to include SO version: ${PYLIB_INCLUDE_SONAME}") +-endmacro() +- +- + ########################################################################### + # pybind11 + +@@ -133,10 +89,10 @@ macro (setup_python_module) + ) + + install (TARGETS ${target_name} +- RUNTIME DESTINATION ${PYTHON_SITE_DIR} COMPONENT user +- LIBRARY DESTINATION ${PYTHON_SITE_DIR} COMPONENT user) ++ RUNTIME DESTINATION ${Python_SITELIB} COMPONENT user ++ LIBRARY DESTINATION ${Python_SITELIB} COMPONENT user) + +- install(FILES __init__.py DESTINATION ${PYTHON_SITE_DIR}) ++ install(FILES __init__.py DESTINATION ${Python_SITELIB}) + + endmacro () + diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 1e219a7..4a7a7a8 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -7,6 +7,9 @@ package: source: url: https://github.com/OpenImageIO/oiio/archive/refs/tags/v{{ version }}.tar.gz sha256: 2e262ae5e5281f839651cd706e417c83c58294a26527ec184b466a2ba6ca31dc + patches: + # https://github.com/AcademySoftwareFoundation/OpenImageIO/pull/4000 + - 4000-findpython.patch build: number: 0 diff --git a/recipe/recipe-scripts-license.txt b/recipe/recipe-scripts-license.txt new file mode 100644 index 0000000..2ec51d7 --- /dev/null +++ b/recipe/recipe-scripts-license.txt @@ -0,0 +1,27 @@ +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: + + 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. + +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. From 807e8fe26a7cc7916728e02e8c14cf7ff71902c1 Mon Sep 17 00:00:00 2001 From: regro-cf-autotick-bot <36490558+regro-cf-autotick-bot@users.noreply.github.com> Date: Mon, 2 Oct 2023 08:49:51 +0000 Subject: [PATCH 03/15] Rebuild for python312 --- conda-forge.yml | 2 ++ recipe/meta.yaml | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/conda-forge.yml b/conda-forge.yml index edab33f..2c603b9 100644 --- a/conda-forge.yml +++ b/conda-forge.yml @@ -1,4 +1,6 @@ build_platform: + linux_aarch64: linux_64 + linux_ppc64le: linux_64 osx_arm64: osx_64 conda_build: pkg_format: '2' diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 4a7a7a8..32f2542 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -12,7 +12,7 @@ source: - 4000-findpython.patch build: - number: 0 + number: 1 skip: true # [win] run_exports: - {{ pin_subpackage('openimageio', max_pin='x.x') }} From 02f2eaadd5b6d4dd75aa2a81843d5d7285a9807f Mon Sep 17 00:00:00 2001 From: Mark Harfouche Date: Mon, 2 Oct 2023 09:26:17 -0400 Subject: [PATCH 04/15] Update recipe --- recipe/build.sh | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/recipe/build.sh b/recipe/build.sh index 9e3a575..2a2328f 100755 --- a/recipe/build.sh +++ b/recipe/build.sh @@ -7,6 +7,9 @@ mkdir -p ${PREFIX}/bin mkdir build pushd build; + +PYTHON_MODULE_EXTENSION=$(python -c "import sysconfig; print(sysconfig.get_config_var('EXT_SUFFIX'))") + cmake ${CMAKE_ARGS} \ -DUSE_FFMPEG=ON \ -DOIIO_BUILD_TOOLS=OFF \ @@ -17,6 +20,9 @@ cmake ${CMAKE_ARGS} \ -DCMAKE_INSTALL_LIBDIR=lib \ -DCMAKE_BUILD_TYPE=Release \ -DPYTHON_VERSION=$PY_VER \ + -DPYTHON_MODULE_EXTENSION=${PYTHON_MODULE_EXTENSION} \ + -DPython_FIND_STRATEGY=LOCATION \ + -DPython_FIND_VIRTUALENV=First \ .. make all -j${CPU_COUNT} From 1d06b633d035816b8ae834ccc5b71924f979ee89 Mon Sep 17 00:00:00 2001 From: Mark Harfouche Date: Mon, 2 Oct 2023 09:27:13 -0400 Subject: [PATCH 05/15] MNT: Re-rendered with conda-build 3.25.0, conda-smithy 3.26.3, and conda-forge-pinning 2023.10.02.11.43.13 --- .azure-pipelines/azure-pipelines-linux.yml | 40 +++++++++++ ...rch64_numpy1.22python3.10.____cpython.yaml | 2 +- ...arch64_numpy1.22python3.8.____cpython.yaml | 2 +- ...arch64_numpy1.22python3.9.____cpython.yaml | 2 +- ...rch64_numpy1.23python3.11.____cpython.yaml | 2 +- ...rch64_numpy1.26python3.12.____cpython.yaml | 2 +- ...c64le_numpy1.22python3.10.____cpython.yaml | 2 +- ...pc64le_numpy1.22python3.8.____cpython.yaml | 2 +- ...pc64le_numpy1.22python3.9.____cpython.yaml | 2 +- ...c64le_numpy1.23python3.11.____cpython.yaml | 2 +- ...c64le_numpy1.26python3.12.____cpython.yaml | 2 +- .travis.yml | 67 ------------------- README.md | 9 +-- 13 files changed, 51 insertions(+), 85 deletions(-) delete mode 100644 .travis.yml diff --git a/.azure-pipelines/azure-pipelines-linux.yml b/.azure-pipelines/azure-pipelines-linux.yml index 5baf4d6..64c4c1c 100755 --- a/.azure-pipelines/azure-pipelines-linux.yml +++ b/.azure-pipelines/azure-pipelines-linux.yml @@ -28,6 +28,46 @@ jobs: CONFIG: linux_64_numpy1.26python3.12.____cpython UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 + linux_aarch64_numpy1.22python3.10.____cpython: + CONFIG: linux_aarch64_numpy1.22python3.10.____cpython + UPLOAD_PACKAGES: 'True' + DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 + linux_aarch64_numpy1.22python3.8.____cpython: + CONFIG: linux_aarch64_numpy1.22python3.8.____cpython + UPLOAD_PACKAGES: 'True' + DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 + linux_aarch64_numpy1.22python3.9.____cpython: + CONFIG: linux_aarch64_numpy1.22python3.9.____cpython + UPLOAD_PACKAGES: 'True' + DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 + linux_aarch64_numpy1.23python3.11.____cpython: + CONFIG: linux_aarch64_numpy1.23python3.11.____cpython + UPLOAD_PACKAGES: 'True' + DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 + linux_aarch64_numpy1.26python3.12.____cpython: + CONFIG: linux_aarch64_numpy1.26python3.12.____cpython + UPLOAD_PACKAGES: 'True' + DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 + linux_ppc64le_numpy1.22python3.10.____cpython: + CONFIG: linux_ppc64le_numpy1.22python3.10.____cpython + UPLOAD_PACKAGES: 'True' + DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 + linux_ppc64le_numpy1.22python3.8.____cpython: + CONFIG: linux_ppc64le_numpy1.22python3.8.____cpython + UPLOAD_PACKAGES: 'True' + DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 + linux_ppc64le_numpy1.22python3.9.____cpython: + CONFIG: linux_ppc64le_numpy1.22python3.9.____cpython + UPLOAD_PACKAGES: 'True' + DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 + linux_ppc64le_numpy1.23python3.11.____cpython: + CONFIG: linux_ppc64le_numpy1.23python3.11.____cpython + UPLOAD_PACKAGES: 'True' + DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 + linux_ppc64le_numpy1.26python3.12.____cpython: + CONFIG: linux_ppc64le_numpy1.26python3.12.____cpython + UPLOAD_PACKAGES: 'True' + DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 timeoutInMinutes: 360 steps: diff --git a/.ci_support/linux_aarch64_numpy1.22python3.10.____cpython.yaml b/.ci_support/linux_aarch64_numpy1.22python3.10.____cpython.yaml index 7693881..f7ed10d 100644 --- a/.ci_support/linux_aarch64_numpy1.22python3.10.____cpython.yaml +++ b/.ci_support/linux_aarch64_numpy1.22python3.10.____cpython.yaml @@ -13,7 +13,7 @@ cxx_compiler: cxx_compiler_version: - '12' docker_image: -- quay.io/condaforge/linux-anvil-aarch64 +- quay.io/condaforge/linux-anvil-cos7-x86_64 ffmpeg: - '6' freetype: diff --git a/.ci_support/linux_aarch64_numpy1.22python3.8.____cpython.yaml b/.ci_support/linux_aarch64_numpy1.22python3.8.____cpython.yaml index 8429c02..239aea3 100644 --- a/.ci_support/linux_aarch64_numpy1.22python3.8.____cpython.yaml +++ b/.ci_support/linux_aarch64_numpy1.22python3.8.____cpython.yaml @@ -13,7 +13,7 @@ cxx_compiler: cxx_compiler_version: - '12' docker_image: -- quay.io/condaforge/linux-anvil-aarch64 +- quay.io/condaforge/linux-anvil-cos7-x86_64 ffmpeg: - '6' freetype: diff --git a/.ci_support/linux_aarch64_numpy1.22python3.9.____cpython.yaml b/.ci_support/linux_aarch64_numpy1.22python3.9.____cpython.yaml index fc73b5f..801255e 100644 --- a/.ci_support/linux_aarch64_numpy1.22python3.9.____cpython.yaml +++ b/.ci_support/linux_aarch64_numpy1.22python3.9.____cpython.yaml @@ -13,7 +13,7 @@ cxx_compiler: cxx_compiler_version: - '12' docker_image: -- quay.io/condaforge/linux-anvil-aarch64 +- quay.io/condaforge/linux-anvil-cos7-x86_64 ffmpeg: - '6' freetype: diff --git a/.ci_support/linux_aarch64_numpy1.23python3.11.____cpython.yaml b/.ci_support/linux_aarch64_numpy1.23python3.11.____cpython.yaml index 3fc5b48..ce22d8c 100644 --- a/.ci_support/linux_aarch64_numpy1.23python3.11.____cpython.yaml +++ b/.ci_support/linux_aarch64_numpy1.23python3.11.____cpython.yaml @@ -13,7 +13,7 @@ cxx_compiler: cxx_compiler_version: - '12' docker_image: -- quay.io/condaforge/linux-anvil-aarch64 +- quay.io/condaforge/linux-anvil-cos7-x86_64 ffmpeg: - '6' freetype: diff --git a/.ci_support/linux_aarch64_numpy1.26python3.12.____cpython.yaml b/.ci_support/linux_aarch64_numpy1.26python3.12.____cpython.yaml index 7481a11..cc7bac1 100644 --- a/.ci_support/linux_aarch64_numpy1.26python3.12.____cpython.yaml +++ b/.ci_support/linux_aarch64_numpy1.26python3.12.____cpython.yaml @@ -13,7 +13,7 @@ cxx_compiler: cxx_compiler_version: - '12' docker_image: -- quay.io/condaforge/linux-anvil-aarch64 +- quay.io/condaforge/linux-anvil-cos7-x86_64 ffmpeg: - '6' freetype: diff --git a/.ci_support/linux_ppc64le_numpy1.22python3.10.____cpython.yaml b/.ci_support/linux_ppc64le_numpy1.22python3.10.____cpython.yaml index ace9d49..2e61bab 100644 --- a/.ci_support/linux_ppc64le_numpy1.22python3.10.____cpython.yaml +++ b/.ci_support/linux_ppc64le_numpy1.22python3.10.____cpython.yaml @@ -9,7 +9,7 @@ cxx_compiler: cxx_compiler_version: - '12' docker_image: -- quay.io/condaforge/linux-anvil-ppc64le +- quay.io/condaforge/linux-anvil-cos7-x86_64 ffmpeg: - '6' freetype: diff --git a/.ci_support/linux_ppc64le_numpy1.22python3.8.____cpython.yaml b/.ci_support/linux_ppc64le_numpy1.22python3.8.____cpython.yaml index bbb0c7a..4c8c13b 100644 --- a/.ci_support/linux_ppc64le_numpy1.22python3.8.____cpython.yaml +++ b/.ci_support/linux_ppc64le_numpy1.22python3.8.____cpython.yaml @@ -9,7 +9,7 @@ cxx_compiler: cxx_compiler_version: - '12' docker_image: -- quay.io/condaforge/linux-anvil-ppc64le +- quay.io/condaforge/linux-anvil-cos7-x86_64 ffmpeg: - '6' freetype: diff --git a/.ci_support/linux_ppc64le_numpy1.22python3.9.____cpython.yaml b/.ci_support/linux_ppc64le_numpy1.22python3.9.____cpython.yaml index 46b2e4d..a5ae574 100644 --- a/.ci_support/linux_ppc64le_numpy1.22python3.9.____cpython.yaml +++ b/.ci_support/linux_ppc64le_numpy1.22python3.9.____cpython.yaml @@ -9,7 +9,7 @@ cxx_compiler: cxx_compiler_version: - '12' docker_image: -- quay.io/condaforge/linux-anvil-ppc64le +- quay.io/condaforge/linux-anvil-cos7-x86_64 ffmpeg: - '6' freetype: diff --git a/.ci_support/linux_ppc64le_numpy1.23python3.11.____cpython.yaml b/.ci_support/linux_ppc64le_numpy1.23python3.11.____cpython.yaml index 9663bdf..e8483ee 100644 --- a/.ci_support/linux_ppc64le_numpy1.23python3.11.____cpython.yaml +++ b/.ci_support/linux_ppc64le_numpy1.23python3.11.____cpython.yaml @@ -9,7 +9,7 @@ cxx_compiler: cxx_compiler_version: - '12' docker_image: -- quay.io/condaforge/linux-anvil-ppc64le +- quay.io/condaforge/linux-anvil-cos7-x86_64 ffmpeg: - '6' freetype: diff --git a/.ci_support/linux_ppc64le_numpy1.26python3.12.____cpython.yaml b/.ci_support/linux_ppc64le_numpy1.26python3.12.____cpython.yaml index 1f6b71f..4679647 100644 --- a/.ci_support/linux_ppc64le_numpy1.26python3.12.____cpython.yaml +++ b/.ci_support/linux_ppc64le_numpy1.26python3.12.____cpython.yaml @@ -9,7 +9,7 @@ cxx_compiler: cxx_compiler_version: - '12' docker_image: -- quay.io/condaforge/linux-anvil-ppc64le +- quay.io/condaforge/linux-anvil-cos7-x86_64 ffmpeg: - '6' freetype: diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index 84d2e06..0000000 --- a/.travis.yml +++ /dev/null @@ -1,67 +0,0 @@ -# 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_numpy1.22python3.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_numpy1.22python3.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_numpy1.22python3.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_aarch64_numpy1.23python3.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_numpy1.26python3.12.____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_numpy1.22python3.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_numpy1.22python3.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_numpy1.22python3.9.____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_numpy1.23python3.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_numpy1.26python3.12.____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/README.md b/README.md index 98c5473..14874f9 100644 --- a/README.md +++ b/README.md @@ -30,14 +30,7 @@ Current build status ==================== - - - - +
Travis - - linux - -
From c2f4b34139414c8fd7c262425ecc84d0759bd45c Mon Sep 17 00:00:00 2001 From: Mark Harfouche Date: Mon, 2 Oct 2023 21:30:41 -0400 Subject: [PATCH 06/15] Add fmt and migration --- .ci_support/migrations/fmt10.yaml | 9 +++++++++ recipe/meta.yaml | 4 ++++ 2 files changed, 13 insertions(+) create mode 100644 .ci_support/migrations/fmt10.yaml diff --git a/.ci_support/migrations/fmt10.yaml b/.ci_support/migrations/fmt10.yaml new file mode 100644 index 0000000..992aca8 --- /dev/null +++ b/.ci_support/migrations/fmt10.yaml @@ -0,0 +1,9 @@ +__migrator: + build_number: 1 + kind: version + migration_number: 1 +fmt: +- '10' +spdlog: +- '1.12' +migrator_ts: 1683802784.4940007 diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 32f2542..860079e 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -42,6 +42,8 @@ requirements: - openexr - libraw - zlib + - fmt + - tsl_robin_map outputs: - name: openimageio @@ -71,6 +73,8 @@ outputs: - pybind11 - libboost-headers - imath + - fmt + - tsl_robin_map run: - {{ pin_subpackage('openimageio', exact=True) }} - {{ pin_compatible('numpy') }} From 82935356237f262cf259dffb6067ad031d60281f Mon Sep 17 00:00:00 2001 From: Mark Harfouche Date: Mon, 2 Oct 2023 21:31:36 -0400 Subject: [PATCH 07/15] MNT: Re-rendered with conda-build 3.25.0, conda-smithy 3.26.3, and conda-forge-pinning 2023.10.02.21.07.04 --- .ci_support/linux_64_numpy1.22python3.10.____cpython.yaml | 2 ++ .ci_support/linux_64_numpy1.22python3.8.____cpython.yaml | 2 ++ .ci_support/linux_64_numpy1.22python3.9.____cpython.yaml | 2 ++ .ci_support/linux_64_numpy1.23python3.11.____cpython.yaml | 2 ++ .ci_support/linux_64_numpy1.26python3.12.____cpython.yaml | 2 ++ .ci_support/linux_aarch64_numpy1.22python3.10.____cpython.yaml | 2 ++ .ci_support/linux_aarch64_numpy1.22python3.8.____cpython.yaml | 2 ++ .ci_support/linux_aarch64_numpy1.22python3.9.____cpython.yaml | 2 ++ .ci_support/linux_aarch64_numpy1.23python3.11.____cpython.yaml | 2 ++ .ci_support/linux_aarch64_numpy1.26python3.12.____cpython.yaml | 2 ++ .ci_support/linux_ppc64le_numpy1.22python3.10.____cpython.yaml | 2 ++ .ci_support/linux_ppc64le_numpy1.22python3.8.____cpython.yaml | 2 ++ .ci_support/linux_ppc64le_numpy1.22python3.9.____cpython.yaml | 2 ++ .ci_support/linux_ppc64le_numpy1.23python3.11.____cpython.yaml | 2 ++ .ci_support/linux_ppc64le_numpy1.26python3.12.____cpython.yaml | 2 ++ .ci_support/osx_64_numpy1.22python3.10.____cpython.yaml | 2 ++ .ci_support/osx_64_numpy1.22python3.8.____cpython.yaml | 2 ++ .ci_support/osx_64_numpy1.22python3.9.____cpython.yaml | 2 ++ .ci_support/osx_64_numpy1.23python3.11.____cpython.yaml | 2 ++ .ci_support/osx_64_numpy1.26python3.12.____cpython.yaml | 2 ++ .ci_support/osx_arm64_numpy1.22python3.10.____cpython.yaml | 2 ++ .ci_support/osx_arm64_numpy1.22python3.8.____cpython.yaml | 2 ++ .ci_support/osx_arm64_numpy1.22python3.9.____cpython.yaml | 2 ++ .ci_support/osx_arm64_numpy1.23python3.11.____cpython.yaml | 2 ++ .ci_support/osx_arm64_numpy1.26python3.12.____cpython.yaml | 2 ++ 25 files changed, 50 insertions(+) diff --git a/.ci_support/linux_64_numpy1.22python3.10.____cpython.yaml b/.ci_support/linux_64_numpy1.22python3.10.____cpython.yaml index 9992ac8..f337b7f 100644 --- a/.ci_support/linux_64_numpy1.22python3.10.____cpython.yaml +++ b/.ci_support/linux_64_numpy1.22python3.10.____cpython.yaml @@ -12,6 +12,8 @@ docker_image: - quay.io/condaforge/linux-anvil-cos7-x86_64 ffmpeg: - '6' +fmt: +- '10' freetype: - '2' giflib: diff --git a/.ci_support/linux_64_numpy1.22python3.8.____cpython.yaml b/.ci_support/linux_64_numpy1.22python3.8.____cpython.yaml index 534a5e3..fc92a1c 100644 --- a/.ci_support/linux_64_numpy1.22python3.8.____cpython.yaml +++ b/.ci_support/linux_64_numpy1.22python3.8.____cpython.yaml @@ -12,6 +12,8 @@ docker_image: - quay.io/condaforge/linux-anvil-cos7-x86_64 ffmpeg: - '6' +fmt: +- '10' freetype: - '2' giflib: diff --git a/.ci_support/linux_64_numpy1.22python3.9.____cpython.yaml b/.ci_support/linux_64_numpy1.22python3.9.____cpython.yaml index 5d7671f..4db7989 100644 --- a/.ci_support/linux_64_numpy1.22python3.9.____cpython.yaml +++ b/.ci_support/linux_64_numpy1.22python3.9.____cpython.yaml @@ -12,6 +12,8 @@ docker_image: - quay.io/condaforge/linux-anvil-cos7-x86_64 ffmpeg: - '6' +fmt: +- '10' freetype: - '2' giflib: diff --git a/.ci_support/linux_64_numpy1.23python3.11.____cpython.yaml b/.ci_support/linux_64_numpy1.23python3.11.____cpython.yaml index bc3ad14..8251e16 100644 --- a/.ci_support/linux_64_numpy1.23python3.11.____cpython.yaml +++ b/.ci_support/linux_64_numpy1.23python3.11.____cpython.yaml @@ -12,6 +12,8 @@ docker_image: - quay.io/condaforge/linux-anvil-cos7-x86_64 ffmpeg: - '6' +fmt: +- '10' freetype: - '2' giflib: diff --git a/.ci_support/linux_64_numpy1.26python3.12.____cpython.yaml b/.ci_support/linux_64_numpy1.26python3.12.____cpython.yaml index daab1fc..9ce57c6 100644 --- a/.ci_support/linux_64_numpy1.26python3.12.____cpython.yaml +++ b/.ci_support/linux_64_numpy1.26python3.12.____cpython.yaml @@ -12,6 +12,8 @@ docker_image: - quay.io/condaforge/linux-anvil-cos7-x86_64 ffmpeg: - '6' +fmt: +- '10' freetype: - '2' giflib: diff --git a/.ci_support/linux_aarch64_numpy1.22python3.10.____cpython.yaml b/.ci_support/linux_aarch64_numpy1.22python3.10.____cpython.yaml index f7ed10d..a7f2258 100644 --- a/.ci_support/linux_aarch64_numpy1.22python3.10.____cpython.yaml +++ b/.ci_support/linux_aarch64_numpy1.22python3.10.____cpython.yaml @@ -16,6 +16,8 @@ docker_image: - quay.io/condaforge/linux-anvil-cos7-x86_64 ffmpeg: - '6' +fmt: +- '10' freetype: - '2' giflib: diff --git a/.ci_support/linux_aarch64_numpy1.22python3.8.____cpython.yaml b/.ci_support/linux_aarch64_numpy1.22python3.8.____cpython.yaml index 239aea3..75b8704 100644 --- a/.ci_support/linux_aarch64_numpy1.22python3.8.____cpython.yaml +++ b/.ci_support/linux_aarch64_numpy1.22python3.8.____cpython.yaml @@ -16,6 +16,8 @@ docker_image: - quay.io/condaforge/linux-anvil-cos7-x86_64 ffmpeg: - '6' +fmt: +- '10' freetype: - '2' giflib: diff --git a/.ci_support/linux_aarch64_numpy1.22python3.9.____cpython.yaml b/.ci_support/linux_aarch64_numpy1.22python3.9.____cpython.yaml index 801255e..40a4360 100644 --- a/.ci_support/linux_aarch64_numpy1.22python3.9.____cpython.yaml +++ b/.ci_support/linux_aarch64_numpy1.22python3.9.____cpython.yaml @@ -16,6 +16,8 @@ docker_image: - quay.io/condaforge/linux-anvil-cos7-x86_64 ffmpeg: - '6' +fmt: +- '10' freetype: - '2' giflib: diff --git a/.ci_support/linux_aarch64_numpy1.23python3.11.____cpython.yaml b/.ci_support/linux_aarch64_numpy1.23python3.11.____cpython.yaml index ce22d8c..bbb09c1 100644 --- a/.ci_support/linux_aarch64_numpy1.23python3.11.____cpython.yaml +++ b/.ci_support/linux_aarch64_numpy1.23python3.11.____cpython.yaml @@ -16,6 +16,8 @@ docker_image: - quay.io/condaforge/linux-anvil-cos7-x86_64 ffmpeg: - '6' +fmt: +- '10' freetype: - '2' giflib: diff --git a/.ci_support/linux_aarch64_numpy1.26python3.12.____cpython.yaml b/.ci_support/linux_aarch64_numpy1.26python3.12.____cpython.yaml index cc7bac1..76f6987 100644 --- a/.ci_support/linux_aarch64_numpy1.26python3.12.____cpython.yaml +++ b/.ci_support/linux_aarch64_numpy1.26python3.12.____cpython.yaml @@ -16,6 +16,8 @@ docker_image: - quay.io/condaforge/linux-anvil-cos7-x86_64 ffmpeg: - '6' +fmt: +- '10' freetype: - '2' giflib: diff --git a/.ci_support/linux_ppc64le_numpy1.22python3.10.____cpython.yaml b/.ci_support/linux_ppc64le_numpy1.22python3.10.____cpython.yaml index 2e61bab..cf64871 100644 --- a/.ci_support/linux_ppc64le_numpy1.22python3.10.____cpython.yaml +++ b/.ci_support/linux_ppc64le_numpy1.22python3.10.____cpython.yaml @@ -12,6 +12,8 @@ docker_image: - quay.io/condaforge/linux-anvil-cos7-x86_64 ffmpeg: - '6' +fmt: +- '10' freetype: - '2' giflib: diff --git a/.ci_support/linux_ppc64le_numpy1.22python3.8.____cpython.yaml b/.ci_support/linux_ppc64le_numpy1.22python3.8.____cpython.yaml index 4c8c13b..c68523f 100644 --- a/.ci_support/linux_ppc64le_numpy1.22python3.8.____cpython.yaml +++ b/.ci_support/linux_ppc64le_numpy1.22python3.8.____cpython.yaml @@ -12,6 +12,8 @@ docker_image: - quay.io/condaforge/linux-anvil-cos7-x86_64 ffmpeg: - '6' +fmt: +- '10' freetype: - '2' giflib: diff --git a/.ci_support/linux_ppc64le_numpy1.22python3.9.____cpython.yaml b/.ci_support/linux_ppc64le_numpy1.22python3.9.____cpython.yaml index a5ae574..33de943 100644 --- a/.ci_support/linux_ppc64le_numpy1.22python3.9.____cpython.yaml +++ b/.ci_support/linux_ppc64le_numpy1.22python3.9.____cpython.yaml @@ -12,6 +12,8 @@ docker_image: - quay.io/condaforge/linux-anvil-cos7-x86_64 ffmpeg: - '6' +fmt: +- '10' freetype: - '2' giflib: diff --git a/.ci_support/linux_ppc64le_numpy1.23python3.11.____cpython.yaml b/.ci_support/linux_ppc64le_numpy1.23python3.11.____cpython.yaml index e8483ee..0ccf303 100644 --- a/.ci_support/linux_ppc64le_numpy1.23python3.11.____cpython.yaml +++ b/.ci_support/linux_ppc64le_numpy1.23python3.11.____cpython.yaml @@ -12,6 +12,8 @@ docker_image: - quay.io/condaforge/linux-anvil-cos7-x86_64 ffmpeg: - '6' +fmt: +- '10' freetype: - '2' giflib: diff --git a/.ci_support/linux_ppc64le_numpy1.26python3.12.____cpython.yaml b/.ci_support/linux_ppc64le_numpy1.26python3.12.____cpython.yaml index 4679647..11fef2c 100644 --- a/.ci_support/linux_ppc64le_numpy1.26python3.12.____cpython.yaml +++ b/.ci_support/linux_ppc64le_numpy1.26python3.12.____cpython.yaml @@ -12,6 +12,8 @@ docker_image: - quay.io/condaforge/linux-anvil-cos7-x86_64 ffmpeg: - '6' +fmt: +- '10' freetype: - '2' giflib: diff --git a/.ci_support/osx_64_numpy1.22python3.10.____cpython.yaml b/.ci_support/osx_64_numpy1.22python3.10.____cpython.yaml index 0689770..8d34aa2 100644 --- a/.ci_support/osx_64_numpy1.22python3.10.____cpython.yaml +++ b/.ci_support/osx_64_numpy1.22python3.10.____cpython.yaml @@ -12,6 +12,8 @@ cxx_compiler_version: - '15' ffmpeg: - '6' +fmt: +- '10' freetype: - '2' giflib: diff --git a/.ci_support/osx_64_numpy1.22python3.8.____cpython.yaml b/.ci_support/osx_64_numpy1.22python3.8.____cpython.yaml index 80b1832..f5add2a 100644 --- a/.ci_support/osx_64_numpy1.22python3.8.____cpython.yaml +++ b/.ci_support/osx_64_numpy1.22python3.8.____cpython.yaml @@ -12,6 +12,8 @@ cxx_compiler_version: - '15' ffmpeg: - '6' +fmt: +- '10' freetype: - '2' giflib: diff --git a/.ci_support/osx_64_numpy1.22python3.9.____cpython.yaml b/.ci_support/osx_64_numpy1.22python3.9.____cpython.yaml index 7ba4ff9..1bfa259 100644 --- a/.ci_support/osx_64_numpy1.22python3.9.____cpython.yaml +++ b/.ci_support/osx_64_numpy1.22python3.9.____cpython.yaml @@ -12,6 +12,8 @@ cxx_compiler_version: - '15' ffmpeg: - '6' +fmt: +- '10' freetype: - '2' giflib: diff --git a/.ci_support/osx_64_numpy1.23python3.11.____cpython.yaml b/.ci_support/osx_64_numpy1.23python3.11.____cpython.yaml index 5f67765..4cc131b 100644 --- a/.ci_support/osx_64_numpy1.23python3.11.____cpython.yaml +++ b/.ci_support/osx_64_numpy1.23python3.11.____cpython.yaml @@ -12,6 +12,8 @@ cxx_compiler_version: - '15' ffmpeg: - '6' +fmt: +- '10' freetype: - '2' giflib: diff --git a/.ci_support/osx_64_numpy1.26python3.12.____cpython.yaml b/.ci_support/osx_64_numpy1.26python3.12.____cpython.yaml index 15ba81b..ee1b72d 100644 --- a/.ci_support/osx_64_numpy1.26python3.12.____cpython.yaml +++ b/.ci_support/osx_64_numpy1.26python3.12.____cpython.yaml @@ -12,6 +12,8 @@ cxx_compiler_version: - '15' ffmpeg: - '6' +fmt: +- '10' freetype: - '2' giflib: diff --git a/.ci_support/osx_arm64_numpy1.22python3.10.____cpython.yaml b/.ci_support/osx_arm64_numpy1.22python3.10.____cpython.yaml index b2b7af4..3985411 100644 --- a/.ci_support/osx_arm64_numpy1.22python3.10.____cpython.yaml +++ b/.ci_support/osx_arm64_numpy1.22python3.10.____cpython.yaml @@ -10,6 +10,8 @@ cxx_compiler_version: - '15' ffmpeg: - '6' +fmt: +- '10' freetype: - '2' giflib: diff --git a/.ci_support/osx_arm64_numpy1.22python3.8.____cpython.yaml b/.ci_support/osx_arm64_numpy1.22python3.8.____cpython.yaml index d5d3d71..d2ca55c 100644 --- a/.ci_support/osx_arm64_numpy1.22python3.8.____cpython.yaml +++ b/.ci_support/osx_arm64_numpy1.22python3.8.____cpython.yaml @@ -10,6 +10,8 @@ cxx_compiler_version: - '15' ffmpeg: - '6' +fmt: +- '10' freetype: - '2' giflib: diff --git a/.ci_support/osx_arm64_numpy1.22python3.9.____cpython.yaml b/.ci_support/osx_arm64_numpy1.22python3.9.____cpython.yaml index abef417..1b018fd 100644 --- a/.ci_support/osx_arm64_numpy1.22python3.9.____cpython.yaml +++ b/.ci_support/osx_arm64_numpy1.22python3.9.____cpython.yaml @@ -10,6 +10,8 @@ cxx_compiler_version: - '15' ffmpeg: - '6' +fmt: +- '10' freetype: - '2' giflib: diff --git a/.ci_support/osx_arm64_numpy1.23python3.11.____cpython.yaml b/.ci_support/osx_arm64_numpy1.23python3.11.____cpython.yaml index d186f18..07d65f6 100644 --- a/.ci_support/osx_arm64_numpy1.23python3.11.____cpython.yaml +++ b/.ci_support/osx_arm64_numpy1.23python3.11.____cpython.yaml @@ -10,6 +10,8 @@ cxx_compiler_version: - '15' ffmpeg: - '6' +fmt: +- '10' freetype: - '2' giflib: diff --git a/.ci_support/osx_arm64_numpy1.26python3.12.____cpython.yaml b/.ci_support/osx_arm64_numpy1.26python3.12.____cpython.yaml index 4cb0911..a820c7a 100644 --- a/.ci_support/osx_arm64_numpy1.26python3.12.____cpython.yaml +++ b/.ci_support/osx_arm64_numpy1.26python3.12.____cpython.yaml @@ -10,6 +10,8 @@ cxx_compiler_version: - '15' ffmpeg: - '6' +fmt: +- '10' freetype: - '2' giflib: From 838dadf11ef09e0e00a9fb1e41da44e7051cae6a Mon Sep 17 00:00:00 2001 From: Mark Harfouche Date: Mon, 2 Oct 2023 21:38:41 -0400 Subject: [PATCH 08/15] Call conda build twice.... --- recipe/build.sh | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/recipe/build.sh b/recipe/build.sh index 2a2328f..92fc5ca 100755 --- a/recipe/build.sh +++ b/recipe/build.sh @@ -23,6 +23,25 @@ cmake ${CMAKE_ARGS} \ -DPYTHON_MODULE_EXTENSION=${PYTHON_MODULE_EXTENSION} \ -DPython_FIND_STRATEGY=LOCATION \ -DPython_FIND_VIRTUALENV=First \ + -DBUILD_MISSING_FMT=OFF \ + -DINTERNALIZE_FMT=OFF \ + .. + +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 \ + -DPYTHON_MODULE_EXTENSION=${PYTHON_MODULE_EXTENSION} \ + -DPython_FIND_STRATEGY=LOCATION \ + -DPython_FIND_VIRTUALENV=First \ + -DBUILD_MISSING_FMT=OFF \ + -DINTERNALIZE_FMT=OFF \ .. make all -j${CPU_COUNT} From bca51e6e0965ab2033b05e527181f2aee0ece033 Mon Sep 17 00:00:00 2001 From: Mark Harfouche Date: Mon, 2 Oct 2023 21:43:23 -0400 Subject: [PATCH 09/15] Use different patch --- recipe/meta.yaml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 860079e..5accd0e 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -9,7 +9,8 @@ source: sha256: 2e262ae5e5281f839651cd706e417c83c58294a26527ec184b466a2ba6ca31dc patches: # https://github.com/AcademySoftwareFoundation/OpenImageIO/pull/4000 - - 4000-findpython.patch + # - 4000-findpython.patch + - print_module_extension.patch build: number: 1 From 61574674e93b51225bbc33b0a8c04deff60e31ff Mon Sep 17 00:00:00 2001 From: Mark Harfouche Date: Tue, 3 Oct 2023 08:35:57 -0400 Subject: [PATCH 10/15] Add patch --- recipe/print_module_extension.patch | 12 ++++++++++++ 1 file changed, 12 insertions(+) create mode 100644 recipe/print_module_extension.patch diff --git a/recipe/print_module_extension.patch b/recipe/print_module_extension.patch new file mode 100644 index 0000000..60558cb --- /dev/null +++ b/recipe/print_module_extension.patch @@ -0,0 +1,12 @@ +diff --git a/src/cmake/pythonutils.cmake b/src/cmake/pythonutils.cmake +index 5799e29f2..271d354d5 100644 +--- a/src/cmake/pythonutils.cmake ++++ b/src/cmake/pythonutils.cmake +@@ -73,6 +73,7 @@ macro (setup_python_module) + endif () + + pybind11_add_module(${target_name} ${PYLIB_LIB_TYPE} ${lib_SOURCES}) ++ message("PYTHON_MODULE_EXTENSION = ${PYTHON_MODULE_EXTENSION}") + + # # Add the library itself + # add_library (${target_name} MODULE ${lib_SOURCES}) From 325cb8646ca0b56a1cf81d056c382c755b68e8c6 Mon Sep 17 00:00:00 2001 From: Mark Harfouche Date: Tue, 3 Oct 2023 08:36:46 -0400 Subject: [PATCH 11/15] Add libtiff46 migration --- .ci_support/migrations/libtiff46.yaml | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 .ci_support/migrations/libtiff46.yaml diff --git a/.ci_support/migrations/libtiff46.yaml b/.ci_support/migrations/libtiff46.yaml new file mode 100644 index 0000000..473b7bf --- /dev/null +++ b/.ci_support/migrations/libtiff46.yaml @@ -0,0 +1,7 @@ +__migrator: + build_number: 1 + kind: version + migration_number: 1 +libtiff: +- '4.6' +migrator_ts: 1694631046.2977061 From fae1cedf0b82028d9ae4ba28bb4a57a67a2a74ef Mon Sep 17 00:00:00 2001 From: Mark Harfouche Date: Tue, 3 Oct 2023 08:37:53 -0400 Subject: [PATCH 12/15] Remove recipe licesnes --- recipe/recipe-scripts-license.txt | 27 --------------------------- 1 file changed, 27 deletions(-) delete mode 100644 recipe/recipe-scripts-license.txt diff --git a/recipe/recipe-scripts-license.txt b/recipe/recipe-scripts-license.txt deleted file mode 100644 index 2ec51d7..0000000 --- a/recipe/recipe-scripts-license.txt +++ /dev/null @@ -1,27 +0,0 @@ -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: - - 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. - -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. From ce892ad072b3f40a518a27d8a2d2b2c96c5183da Mon Sep 17 00:00:00 2001 From: Mark Harfouche Date: Tue, 3 Oct 2023 08:38:56 -0400 Subject: [PATCH 13/15] MNT: Re-rendered with conda-build 3.25.0, conda-smithy 3.26.3, and conda-forge-pinning 2023.10.03.12.33.16 --- .ci_support/linux_64_numpy1.22python3.10.____cpython.yaml | 3 +-- .ci_support/linux_64_numpy1.22python3.8.____cpython.yaml | 3 +-- .ci_support/linux_64_numpy1.22python3.9.____cpython.yaml | 3 +-- .ci_support/linux_64_numpy1.23python3.11.____cpython.yaml | 3 +-- .ci_support/linux_64_numpy1.26python3.12.____cpython.yaml | 5 ++--- .../linux_aarch64_numpy1.22python3.10.____cpython.yaml | 3 +-- .../linux_aarch64_numpy1.22python3.8.____cpython.yaml | 3 +-- .../linux_aarch64_numpy1.22python3.9.____cpython.yaml | 3 +-- .../linux_aarch64_numpy1.23python3.11.____cpython.yaml | 3 +-- .../linux_aarch64_numpy1.26python3.12.____cpython.yaml | 5 ++--- .../linux_ppc64le_numpy1.22python3.10.____cpython.yaml | 3 +-- .../linux_ppc64le_numpy1.22python3.8.____cpython.yaml | 3 +-- .../linux_ppc64le_numpy1.22python3.9.____cpython.yaml | 3 +-- .../linux_ppc64le_numpy1.23python3.11.____cpython.yaml | 3 +-- .../linux_ppc64le_numpy1.26python3.12.____cpython.yaml | 5 ++--- .ci_support/osx_64_numpy1.22python3.10.____cpython.yaml | 3 +-- .ci_support/osx_64_numpy1.22python3.8.____cpython.yaml | 3 +-- .ci_support/osx_64_numpy1.22python3.9.____cpython.yaml | 3 +-- .ci_support/osx_64_numpy1.23python3.11.____cpython.yaml | 3 +-- .ci_support/osx_64_numpy1.26python3.12.____cpython.yaml | 5 ++--- .ci_support/osx_arm64_numpy1.22python3.10.____cpython.yaml | 3 +-- .ci_support/osx_arm64_numpy1.22python3.8.____cpython.yaml | 3 +-- .ci_support/osx_arm64_numpy1.22python3.9.____cpython.yaml | 3 +-- .ci_support/osx_arm64_numpy1.23python3.11.____cpython.yaml | 3 +-- .ci_support/osx_arm64_numpy1.26python3.12.____cpython.yaml | 5 ++--- 25 files changed, 30 insertions(+), 55 deletions(-) diff --git a/.ci_support/linux_64_numpy1.22python3.10.____cpython.yaml b/.ci_support/linux_64_numpy1.22python3.10.____cpython.yaml index f337b7f..86f7825 100644 --- a/.ci_support/linux_64_numpy1.22python3.10.____cpython.yaml +++ b/.ci_support/linux_64_numpy1.22python3.10.____cpython.yaml @@ -29,7 +29,7 @@ libpng: libraw: - '0.21' libtiff: -- '4.5' +- '4.6' libwebp: - '1' numpy: @@ -47,6 +47,5 @@ target_platform: zip_keys: - - python - numpy - - channel_sources zlib: - '1.2' diff --git a/.ci_support/linux_64_numpy1.22python3.8.____cpython.yaml b/.ci_support/linux_64_numpy1.22python3.8.____cpython.yaml index fc92a1c..1fc8923 100644 --- a/.ci_support/linux_64_numpy1.22python3.8.____cpython.yaml +++ b/.ci_support/linux_64_numpy1.22python3.8.____cpython.yaml @@ -29,7 +29,7 @@ libpng: libraw: - '0.21' libtiff: -- '4.5' +- '4.6' libwebp: - '1' numpy: @@ -47,6 +47,5 @@ target_platform: zip_keys: - - python - numpy - - channel_sources zlib: - '1.2' diff --git a/.ci_support/linux_64_numpy1.22python3.9.____cpython.yaml b/.ci_support/linux_64_numpy1.22python3.9.____cpython.yaml index 4db7989..767a89a 100644 --- a/.ci_support/linux_64_numpy1.22python3.9.____cpython.yaml +++ b/.ci_support/linux_64_numpy1.22python3.9.____cpython.yaml @@ -29,7 +29,7 @@ libpng: libraw: - '0.21' libtiff: -- '4.5' +- '4.6' libwebp: - '1' numpy: @@ -47,6 +47,5 @@ target_platform: zip_keys: - - python - numpy - - channel_sources zlib: - '1.2' diff --git a/.ci_support/linux_64_numpy1.23python3.11.____cpython.yaml b/.ci_support/linux_64_numpy1.23python3.11.____cpython.yaml index 8251e16..4d052a4 100644 --- a/.ci_support/linux_64_numpy1.23python3.11.____cpython.yaml +++ b/.ci_support/linux_64_numpy1.23python3.11.____cpython.yaml @@ -29,7 +29,7 @@ libpng: libraw: - '0.21' libtiff: -- '4.5' +- '4.6' libwebp: - '1' numpy: @@ -47,6 +47,5 @@ target_platform: zip_keys: - - python - numpy - - channel_sources zlib: - '1.2' diff --git a/.ci_support/linux_64_numpy1.26python3.12.____cpython.yaml b/.ci_support/linux_64_numpy1.26python3.12.____cpython.yaml index 9ce57c6..6104226 100644 --- a/.ci_support/linux_64_numpy1.26python3.12.____cpython.yaml +++ b/.ci_support/linux_64_numpy1.26python3.12.____cpython.yaml @@ -1,7 +1,7 @@ cdt_name: - cos6 channel_sources: -- conda-forge/label/python_rc,conda-forge +- conda-forge channel_targets: - conda-forge main cxx_compiler: @@ -29,7 +29,7 @@ libpng: libraw: - '0.21' libtiff: -- '4.5' +- '4.6' libwebp: - '1' numpy: @@ -47,6 +47,5 @@ target_platform: zip_keys: - - python - numpy - - channel_sources zlib: - '1.2' diff --git a/.ci_support/linux_aarch64_numpy1.22python3.10.____cpython.yaml b/.ci_support/linux_aarch64_numpy1.22python3.10.____cpython.yaml index a7f2258..2f475f9 100644 --- a/.ci_support/linux_aarch64_numpy1.22python3.10.____cpython.yaml +++ b/.ci_support/linux_aarch64_numpy1.22python3.10.____cpython.yaml @@ -33,7 +33,7 @@ libpng: libraw: - '0.21' libtiff: -- '4.5' +- '4.6' libwebp: - '1' numpy: @@ -51,6 +51,5 @@ target_platform: zip_keys: - - python - numpy - - channel_sources zlib: - '1.2' diff --git a/.ci_support/linux_aarch64_numpy1.22python3.8.____cpython.yaml b/.ci_support/linux_aarch64_numpy1.22python3.8.____cpython.yaml index 75b8704..43e7b42 100644 --- a/.ci_support/linux_aarch64_numpy1.22python3.8.____cpython.yaml +++ b/.ci_support/linux_aarch64_numpy1.22python3.8.____cpython.yaml @@ -33,7 +33,7 @@ libpng: libraw: - '0.21' libtiff: -- '4.5' +- '4.6' libwebp: - '1' numpy: @@ -51,6 +51,5 @@ target_platform: zip_keys: - - python - numpy - - channel_sources zlib: - '1.2' diff --git a/.ci_support/linux_aarch64_numpy1.22python3.9.____cpython.yaml b/.ci_support/linux_aarch64_numpy1.22python3.9.____cpython.yaml index 40a4360..1deec2e 100644 --- a/.ci_support/linux_aarch64_numpy1.22python3.9.____cpython.yaml +++ b/.ci_support/linux_aarch64_numpy1.22python3.9.____cpython.yaml @@ -33,7 +33,7 @@ libpng: libraw: - '0.21' libtiff: -- '4.5' +- '4.6' libwebp: - '1' numpy: @@ -51,6 +51,5 @@ target_platform: zip_keys: - - python - numpy - - channel_sources zlib: - '1.2' diff --git a/.ci_support/linux_aarch64_numpy1.23python3.11.____cpython.yaml b/.ci_support/linux_aarch64_numpy1.23python3.11.____cpython.yaml index bbb09c1..f1400b5 100644 --- a/.ci_support/linux_aarch64_numpy1.23python3.11.____cpython.yaml +++ b/.ci_support/linux_aarch64_numpy1.23python3.11.____cpython.yaml @@ -33,7 +33,7 @@ libpng: libraw: - '0.21' libtiff: -- '4.5' +- '4.6' libwebp: - '1' numpy: @@ -51,6 +51,5 @@ target_platform: zip_keys: - - python - numpy - - channel_sources zlib: - '1.2' diff --git a/.ci_support/linux_aarch64_numpy1.26python3.12.____cpython.yaml b/.ci_support/linux_aarch64_numpy1.26python3.12.____cpython.yaml index 76f6987..fef8a9c 100644 --- a/.ci_support/linux_aarch64_numpy1.26python3.12.____cpython.yaml +++ b/.ci_support/linux_aarch64_numpy1.26python3.12.____cpython.yaml @@ -5,7 +5,7 @@ cdt_arch: cdt_name: - cos7 channel_sources: -- conda-forge/label/python_rc,conda-forge +- conda-forge channel_targets: - conda-forge main cxx_compiler: @@ -33,7 +33,7 @@ libpng: libraw: - '0.21' libtiff: -- '4.5' +- '4.6' libwebp: - '1' numpy: @@ -51,6 +51,5 @@ target_platform: zip_keys: - - python - numpy - - channel_sources zlib: - '1.2' diff --git a/.ci_support/linux_ppc64le_numpy1.22python3.10.____cpython.yaml b/.ci_support/linux_ppc64le_numpy1.22python3.10.____cpython.yaml index cf64871..1ac64b4 100644 --- a/.ci_support/linux_ppc64le_numpy1.22python3.10.____cpython.yaml +++ b/.ci_support/linux_ppc64le_numpy1.22python3.10.____cpython.yaml @@ -29,7 +29,7 @@ libpng: libraw: - '0.21' libtiff: -- '4.5' +- '4.6' libwebp: - '1' numpy: @@ -47,6 +47,5 @@ target_platform: zip_keys: - - python - numpy - - channel_sources zlib: - '1.2' diff --git a/.ci_support/linux_ppc64le_numpy1.22python3.8.____cpython.yaml b/.ci_support/linux_ppc64le_numpy1.22python3.8.____cpython.yaml index c68523f..f40b7ff 100644 --- a/.ci_support/linux_ppc64le_numpy1.22python3.8.____cpython.yaml +++ b/.ci_support/linux_ppc64le_numpy1.22python3.8.____cpython.yaml @@ -29,7 +29,7 @@ libpng: libraw: - '0.21' libtiff: -- '4.5' +- '4.6' libwebp: - '1' numpy: @@ -47,6 +47,5 @@ target_platform: zip_keys: - - python - numpy - - channel_sources zlib: - '1.2' diff --git a/.ci_support/linux_ppc64le_numpy1.22python3.9.____cpython.yaml b/.ci_support/linux_ppc64le_numpy1.22python3.9.____cpython.yaml index 33de943..456cb15 100644 --- a/.ci_support/linux_ppc64le_numpy1.22python3.9.____cpython.yaml +++ b/.ci_support/linux_ppc64le_numpy1.22python3.9.____cpython.yaml @@ -29,7 +29,7 @@ libpng: libraw: - '0.21' libtiff: -- '4.5' +- '4.6' libwebp: - '1' numpy: @@ -47,6 +47,5 @@ target_platform: zip_keys: - - python - numpy - - channel_sources zlib: - '1.2' diff --git a/.ci_support/linux_ppc64le_numpy1.23python3.11.____cpython.yaml b/.ci_support/linux_ppc64le_numpy1.23python3.11.____cpython.yaml index 0ccf303..b7f6d96 100644 --- a/.ci_support/linux_ppc64le_numpy1.23python3.11.____cpython.yaml +++ b/.ci_support/linux_ppc64le_numpy1.23python3.11.____cpython.yaml @@ -29,7 +29,7 @@ libpng: libraw: - '0.21' libtiff: -- '4.5' +- '4.6' libwebp: - '1' numpy: @@ -47,6 +47,5 @@ target_platform: zip_keys: - - python - numpy - - channel_sources zlib: - '1.2' diff --git a/.ci_support/linux_ppc64le_numpy1.26python3.12.____cpython.yaml b/.ci_support/linux_ppc64le_numpy1.26python3.12.____cpython.yaml index 11fef2c..850a943 100644 --- a/.ci_support/linux_ppc64le_numpy1.26python3.12.____cpython.yaml +++ b/.ci_support/linux_ppc64le_numpy1.26python3.12.____cpython.yaml @@ -1,7 +1,7 @@ cdt_name: - cos7 channel_sources: -- conda-forge/label/python_rc,conda-forge +- conda-forge channel_targets: - conda-forge main cxx_compiler: @@ -29,7 +29,7 @@ libpng: libraw: - '0.21' libtiff: -- '4.5' +- '4.6' libwebp: - '1' numpy: @@ -47,6 +47,5 @@ target_platform: zip_keys: - - python - numpy - - channel_sources zlib: - '1.2' diff --git a/.ci_support/osx_64_numpy1.22python3.10.____cpython.yaml b/.ci_support/osx_64_numpy1.22python3.10.____cpython.yaml index 8d34aa2..2850353 100644 --- a/.ci_support/osx_64_numpy1.22python3.10.____cpython.yaml +++ b/.ci_support/osx_64_numpy1.22python3.10.____cpython.yaml @@ -29,7 +29,7 @@ libpng: libraw: - '0.21' libtiff: -- '4.5' +- '4.6' libwebp: - '1' macos_machine: @@ -49,6 +49,5 @@ target_platform: zip_keys: - - python - numpy - - channel_sources zlib: - '1.2' diff --git a/.ci_support/osx_64_numpy1.22python3.8.____cpython.yaml b/.ci_support/osx_64_numpy1.22python3.8.____cpython.yaml index f5add2a..12db044 100644 --- a/.ci_support/osx_64_numpy1.22python3.8.____cpython.yaml +++ b/.ci_support/osx_64_numpy1.22python3.8.____cpython.yaml @@ -29,7 +29,7 @@ libpng: libraw: - '0.21' libtiff: -- '4.5' +- '4.6' libwebp: - '1' macos_machine: @@ -49,6 +49,5 @@ target_platform: zip_keys: - - python - numpy - - channel_sources zlib: - '1.2' diff --git a/.ci_support/osx_64_numpy1.22python3.9.____cpython.yaml b/.ci_support/osx_64_numpy1.22python3.9.____cpython.yaml index 1bfa259..3c4c022 100644 --- a/.ci_support/osx_64_numpy1.22python3.9.____cpython.yaml +++ b/.ci_support/osx_64_numpy1.22python3.9.____cpython.yaml @@ -29,7 +29,7 @@ libpng: libraw: - '0.21' libtiff: -- '4.5' +- '4.6' libwebp: - '1' macos_machine: @@ -49,6 +49,5 @@ target_platform: zip_keys: - - python - numpy - - channel_sources zlib: - '1.2' diff --git a/.ci_support/osx_64_numpy1.23python3.11.____cpython.yaml b/.ci_support/osx_64_numpy1.23python3.11.____cpython.yaml index 4cc131b..21f41fc 100644 --- a/.ci_support/osx_64_numpy1.23python3.11.____cpython.yaml +++ b/.ci_support/osx_64_numpy1.23python3.11.____cpython.yaml @@ -29,7 +29,7 @@ libpng: libraw: - '0.21' libtiff: -- '4.5' +- '4.6' libwebp: - '1' macos_machine: @@ -49,6 +49,5 @@ target_platform: zip_keys: - - python - numpy - - channel_sources zlib: - '1.2' diff --git a/.ci_support/osx_64_numpy1.26python3.12.____cpython.yaml b/.ci_support/osx_64_numpy1.26python3.12.____cpython.yaml index ee1b72d..fc2a117 100644 --- a/.ci_support/osx_64_numpy1.26python3.12.____cpython.yaml +++ b/.ci_support/osx_64_numpy1.26python3.12.____cpython.yaml @@ -3,7 +3,7 @@ MACOSX_DEPLOYMENT_TARGET: MACOSX_SDK_VERSION: - '11.0' channel_sources: -- conda-forge/label/python_rc,conda-forge +- conda-forge channel_targets: - conda-forge main cxx_compiler: @@ -29,7 +29,7 @@ libpng: libraw: - '0.21' libtiff: -- '4.5' +- '4.6' libwebp: - '1' macos_machine: @@ -49,6 +49,5 @@ target_platform: zip_keys: - - python - numpy - - channel_sources zlib: - '1.2' diff --git a/.ci_support/osx_arm64_numpy1.22python3.10.____cpython.yaml b/.ci_support/osx_arm64_numpy1.22python3.10.____cpython.yaml index 3985411..08027e8 100644 --- a/.ci_support/osx_arm64_numpy1.22python3.10.____cpython.yaml +++ b/.ci_support/osx_arm64_numpy1.22python3.10.____cpython.yaml @@ -27,7 +27,7 @@ libpng: libraw: - '0.21' libtiff: -- '4.5' +- '4.6' libwebp: - '1' macos_machine: @@ -47,6 +47,5 @@ target_platform: zip_keys: - - python - numpy - - channel_sources zlib: - '1.2' diff --git a/.ci_support/osx_arm64_numpy1.22python3.8.____cpython.yaml b/.ci_support/osx_arm64_numpy1.22python3.8.____cpython.yaml index d2ca55c..55c6533 100644 --- a/.ci_support/osx_arm64_numpy1.22python3.8.____cpython.yaml +++ b/.ci_support/osx_arm64_numpy1.22python3.8.____cpython.yaml @@ -27,7 +27,7 @@ libpng: libraw: - '0.21' libtiff: -- '4.5' +- '4.6' libwebp: - '1' macos_machine: @@ -47,6 +47,5 @@ target_platform: zip_keys: - - python - numpy - - channel_sources zlib: - '1.2' diff --git a/.ci_support/osx_arm64_numpy1.22python3.9.____cpython.yaml b/.ci_support/osx_arm64_numpy1.22python3.9.____cpython.yaml index 1b018fd..caea7b0 100644 --- a/.ci_support/osx_arm64_numpy1.22python3.9.____cpython.yaml +++ b/.ci_support/osx_arm64_numpy1.22python3.9.____cpython.yaml @@ -27,7 +27,7 @@ libpng: libraw: - '0.21' libtiff: -- '4.5' +- '4.6' libwebp: - '1' macos_machine: @@ -47,6 +47,5 @@ target_platform: zip_keys: - - python - numpy - - channel_sources zlib: - '1.2' diff --git a/.ci_support/osx_arm64_numpy1.23python3.11.____cpython.yaml b/.ci_support/osx_arm64_numpy1.23python3.11.____cpython.yaml index 07d65f6..76a8dff 100644 --- a/.ci_support/osx_arm64_numpy1.23python3.11.____cpython.yaml +++ b/.ci_support/osx_arm64_numpy1.23python3.11.____cpython.yaml @@ -27,7 +27,7 @@ libpng: libraw: - '0.21' libtiff: -- '4.5' +- '4.6' libwebp: - '1' macos_machine: @@ -47,6 +47,5 @@ target_platform: zip_keys: - - python - numpy - - channel_sources zlib: - '1.2' diff --git a/.ci_support/osx_arm64_numpy1.26python3.12.____cpython.yaml b/.ci_support/osx_arm64_numpy1.26python3.12.____cpython.yaml index a820c7a..e8768cf 100644 --- a/.ci_support/osx_arm64_numpy1.26python3.12.____cpython.yaml +++ b/.ci_support/osx_arm64_numpy1.26python3.12.____cpython.yaml @@ -1,7 +1,7 @@ MACOSX_DEPLOYMENT_TARGET: - '11.0' channel_sources: -- conda-forge/label/python_rc,conda-forge +- conda-forge channel_targets: - conda-forge main cxx_compiler: @@ -27,7 +27,7 @@ libpng: libraw: - '0.21' libtiff: -- '4.5' +- '4.6' libwebp: - '1' macos_machine: @@ -47,6 +47,5 @@ target_platform: zip_keys: - - python - numpy - - channel_sources zlib: - '1.2' From 6fd337036fa4da821dd89e128bc53df79bf100b5 Mon Sep 17 00:00:00 2001 From: Mark Harfouche Date: Tue, 3 Oct 2023 23:15:51 -0400 Subject: [PATCH 14/15] final form --- recipe/build.sh | 33 ++++++++++----------------------- 1 file changed, 10 insertions(+), 23 deletions(-) diff --git a/recipe/build.sh b/recipe/build.sh index 92fc5ca..0123266 100755 --- a/recipe/build.sh +++ b/recipe/build.sh @@ -8,7 +8,15 @@ mkdir build pushd build; -PYTHON_MODULE_EXTENSION=$(python -c "import sysconfig; print(sysconfig.get_config_var('EXT_SUFFIX'))") +if [[ "${target_platform}" != "${build_platform}" ]]; then + # PyBind11 will find python3.X which returns a different + # value for the "EXT_SUFFIX" which is inconsistent with + # cross compilation + # https://github.com/conda-forge/cross-python-feedstock/issues/75 + Python_EXECUTABLE=${BUILD_PREFIX}/bin/python +else + Python_EXECUTABLE=${PYTHON} +fi cmake ${CMAKE_ARGS} \ -DUSE_FFMPEG=ON \ @@ -16,30 +24,9 @@ cmake ${CMAKE_ARGS} \ -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 \ - -DPYTHON_MODULE_EXTENSION=${PYTHON_MODULE_EXTENSION} \ - -DPython_FIND_STRATEGY=LOCATION \ - -DPython_FIND_VIRTUALENV=First \ - -DBUILD_MISSING_FMT=OFF \ - -DINTERNALIZE_FMT=OFF \ - .. - -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 \ - -DPYTHON_MODULE_EXTENSION=${PYTHON_MODULE_EXTENSION} \ - -DPython_FIND_STRATEGY=LOCATION \ - -DPython_FIND_VIRTUALENV=First \ + -DPython_EXECUTABLE=${Python_EXECUTABLE} \ -DBUILD_MISSING_FMT=OFF \ -DINTERNALIZE_FMT=OFF \ .. From d7519c04023960f88131dc3229cd7e8e772518ee Mon Sep 17 00:00:00 2001 From: Mark Harfouche Date: Tue, 3 Oct 2023 23:43:25 -0400 Subject: [PATCH 15/15] Remove patches --- recipe/4000-findpython.patch | 101 ---------------------------- recipe/meta.yaml | 4 -- recipe/print_module_extension.patch | 12 ---- 3 files changed, 117 deletions(-) delete mode 100644 recipe/4000-findpython.patch delete mode 100644 recipe/print_module_extension.patch diff --git a/recipe/4000-findpython.patch b/recipe/4000-findpython.patch deleted file mode 100644 index 31d9e30..0000000 --- a/recipe/4000-findpython.patch +++ /dev/null @@ -1,101 +0,0 @@ -From 485244087a5bd2fea5803d6eb4c9b0f2312bdb91 Mon Sep 17 00:00:00 2001 -From: Mark Harfouche -Date: Mon, 2 Oct 2023 08:57:10 -0400 -Subject: [PATCH] Use modern FindPython from CMake 3.12 - -This really helps with cross compilation and virtual environments ---- - src/cmake/externalpackages.cmake | 3 +- - src/cmake/pythonutils.cmake | 50 ++------------------------------ - 2 files changed, 4 insertions(+), 49 deletions(-) - -diff --git a/src/cmake/externalpackages.cmake b/src/cmake/externalpackages.cmake -index d9a18aa2d..2df164455 100644 ---- a/src/cmake/externalpackages.cmake -+++ b/src/cmake/externalpackages.cmake -@@ -156,8 +156,7 @@ else () - message (STATUS "Using internal PugiXML") - endif() - --# From pythonutils.cmake --find_python() -+find_package(Python COMPONENTS Interpreter Development) - - - ########################################################################### -diff --git a/src/cmake/pythonutils.cmake b/src/cmake/pythonutils.cmake -index 5799e29f2..a882bf80c 100644 ---- a/src/cmake/pythonutils.cmake -+++ b/src/cmake/pythonutils.cmake -@@ -4,7 +4,6 @@ - - # Python-related options. - option (USE_PYTHON "Build the Python bindings" ON) --set (PYTHON_VERSION "" CACHE STRING "Target version of python to find") - option (PYLIB_INCLUDE_SONAME "If ON, soname/soversion will be set for Python module library" OFF) - option (PYLIB_LIB_PREFIX "If ON, prefix the Python module with 'lib'" OFF) - set (PYMODULE_SUFFIX "" CACHE STRING "Suffix to add to Python module init namespace") -@@ -15,49 +14,6 @@ else () - endif () - - --# Find Python. This macro should only be called if python is required. If --# Python cannot be found, it will be a fatal error. --macro (find_python) -- if (NOT VERBOSE) -- set (PythonInterp_FIND_QUIETLY true) -- set (PythonLibs_FIND_QUIETLY true) -- endif () -- -- # Attempt to find the desired version, but fall back to other -- # additional versions. -- unset (_req) -- if (USE_PYTHON) -- set (_req REQUIRED) -- if (PYTHON_VERSION) -- list (APPEND _req EXACT) -- endif () -- endif () -- checked_find_package (Python ${PYTHON_VERSION} -- ${_req} -- COMPONENTS Interpreter Development -- PRINT Python_VERSION Python_EXECUTABLE -- Python_LIBRARIES -- Python_Development_FOUND -- Python_Interpreter_FOUND ) -- -- # The version that was found may not be the default or user -- # defined one. -- set (PYTHON_VERSION_FOUND ${Python_VERSION_MAJOR}.${Python_VERSION_MINOR}) -- -- # Give hints to subsequent pybind11 searching to ensure that it finds -- # exactly the same version that we found. -- set (PythonInterp_FIND_VERSION PYTHON_VERSION_FOUND) -- set (PythonInterp_FIND_VERSION_MAJOR ${Python_VERSION_MAJOR}) -- -- if (NOT DEFINED PYTHON_SITE_DIR) -- set (PYTHON_SITE_DIR "${CMAKE_INSTALL_LIBDIR}/python${PYTHON_VERSION_FOUND}/site-packages/OpenImageIO") -- endif () -- message (VERBOSE " Python site packages dir ${PYTHON_SITE_DIR}") -- message (VERBOSE " Python to include 'lib' prefix: ${PYLIB_LIB_PREFIX}") -- message (VERBOSE " Python to include SO version: ${PYLIB_INCLUDE_SONAME}") --endmacro() -- -- - ########################################################################### - # pybind11 - -@@ -133,10 +89,10 @@ macro (setup_python_module) - ) - - install (TARGETS ${target_name} -- RUNTIME DESTINATION ${PYTHON_SITE_DIR} COMPONENT user -- LIBRARY DESTINATION ${PYTHON_SITE_DIR} COMPONENT user) -+ RUNTIME DESTINATION ${Python_SITELIB} COMPONENT user -+ LIBRARY DESTINATION ${Python_SITELIB} COMPONENT user) - -- install(FILES __init__.py DESTINATION ${PYTHON_SITE_DIR}) -+ install(FILES __init__.py DESTINATION ${Python_SITELIB}) - - endmacro () - diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 5accd0e..acfa36f 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -7,10 +7,6 @@ package: source: url: https://github.com/OpenImageIO/oiio/archive/refs/tags/v{{ version }}.tar.gz sha256: 2e262ae5e5281f839651cd706e417c83c58294a26527ec184b466a2ba6ca31dc - patches: - # https://github.com/AcademySoftwareFoundation/OpenImageIO/pull/4000 - # - 4000-findpython.patch - - print_module_extension.patch build: number: 1 diff --git a/recipe/print_module_extension.patch b/recipe/print_module_extension.patch deleted file mode 100644 index 60558cb..0000000 --- a/recipe/print_module_extension.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/src/cmake/pythonutils.cmake b/src/cmake/pythonutils.cmake -index 5799e29f2..271d354d5 100644 ---- a/src/cmake/pythonutils.cmake -+++ b/src/cmake/pythonutils.cmake -@@ -73,6 +73,7 @@ macro (setup_python_module) - endif () - - pybind11_add_module(${target_name} ${PYLIB_LIB_TYPE} ${lib_SOURCES}) -+ message("PYTHON_MODULE_EXTENSION = ${PYTHON_MODULE_EXTENSION}") - - # # Add the library itself - # add_library (${target_name} MODULE ${lib_SOURCES})
Azure