From 4e51e869fa430fbd5ccd08dd2cd9f9d98d4d629a 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 01/14] 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 a6cda21..fea2f0e 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -9,7 +9,7 @@ source: sha256: a8cea8b6087610e5154fbbe028548ab4fc773eb36531eef44ffb42351bc0b0f0 build: - number: 0 + number: 1 skip: true # [win] run_exports: - {{ pin_subpackage('openimageio', max_pin='x.x') }} From 6ca7d5646510e3121fcac046ac9a6639e9c6a989 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:50:20 +0000 Subject: [PATCH 02/14] MNT: Re-rendered with conda-build 3.26.1, conda-smithy 3.26.3, and conda-forge-pinning 2023.10.02.03.27.19 --- .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 a5e1c02ae1a12c5b593457c7a562a97deb60ec08 Mon Sep 17 00:00:00 2001 From: Mark Harfouche Date: Mon, 2 Oct 2023 05:16:52 -0400 Subject: [PATCH 03/14] specify PYTHON_MODULE_EXTENSION --- recipe/build.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/recipe/build.sh b/recipe/build.sh index 9e3a575..90245ae 100755 --- a/recipe/build.sh +++ b/recipe/build.sh @@ -7,6 +7,8 @@ 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 +19,7 @@ cmake ${CMAKE_ARGS} \ -DCMAKE_INSTALL_LIBDIR=lib \ -DCMAKE_BUILD_TYPE=Release \ -DPYTHON_VERSION=$PY_VER \ + -DPYTHON_MODULE_EXTENSION=${PYTHON_MODULE_EXTENSION} \ .. make all -j${CPU_COUNT} From a8239b23efed87c84d9b3e8065d196c1d64d6f79 Mon Sep 17 00:00:00 2001 From: Mark Harfouche Date: Mon, 2 Oct 2023 05:18:26 -0400 Subject: [PATCH 04/14] add fmt and tsl_robin_map --- recipe/meta.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index fea2f0e..d939e13 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -39,6 +39,8 @@ requirements: - openexr - libraw - zlib + - fmt + - tsl_robin_map outputs: - name: openimageio From a244e27264a8e3d275aab2a0d4e6bca7fcedbde6 Mon Sep 17 00:00:00 2001 From: "conda-forge-webservices[bot]" <91080706+conda-forge-webservices[bot]@users.noreply.github.com> Date: Mon, 2 Oct 2023 09:20:33 +0000 Subject: [PATCH 05/14] MNT: Re-rendered with conda-build 3.26.1, conda-smithy 3.26.3, and conda-forge-pinning 2023.10.02.03.27.19 --- .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..13604b6 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: +- '9' 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..8ebab69 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: +- '9' 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..0f0c1e0 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: +- '9' 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..95131d4 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: +- '9' 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..a03a148 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: +- '9' 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..4d18400 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: +- '9' 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..dd423aa 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: +- '9' 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..63a0cde 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: +- '9' 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..d59d9f3 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: +- '9' 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..827e1c9 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: +- '9' 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..d44c82a 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: +- '9' 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..e19fa33 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: +- '9' 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..4476b70 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: +- '9' 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..02ced92 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: +- '9' 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..3d1dc03 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: +- '9' 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..3539054 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: +- '9' 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..b57088c 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: +- '9' 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..85869f7 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: +- '9' 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..4763ae9 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: +- '9' 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..bcc895c 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: +- '9' 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..3bb27e6 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: +- '9' 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..6e309d9 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: +- '9' 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..1420b2d 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: +- '9' 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..d74d4e0 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: +- '9' 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..f0aa952 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: +- '9' freetype: - '2' giflib: From 556ca94567425d5de372de90285b042cb43ac9b3 Mon Sep 17 00:00:00 2001 From: Mark Harfouche Date: Mon, 2 Oct 2023 05:23:17 -0400 Subject: [PATCH 06/14] Update build.sh --- recipe/build.sh | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/recipe/build.sh b/recipe/build.sh index 90245ae..d7658c0 100755 --- a/recipe/build.sh +++ b/recipe/build.sh @@ -7,7 +7,6 @@ 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 \ @@ -19,7 +18,7 @@ cmake ${CMAKE_ARGS} \ -DCMAKE_INSTALL_LIBDIR=lib \ -DCMAKE_BUILD_TYPE=Release \ -DPYTHON_VERSION=$PY_VER \ - -DPYTHON_MODULE_EXTENSION=${PYTHON_MODULE_EXTENSION} \ + -DPython_FIND_VIRTUALENV=First \ .. make all -j${CPU_COUNT} From 1ce35ca5cd1b38e2bf8cef7d3f8fa49952aef1de Mon Sep 17 00:00:00 2001 From: Mark Harfouche Date: Mon, 2 Oct 2023 05:24:33 -0400 Subject: [PATCH 07/14] Add fmt10 migration --- .ci_support/migrations/fmt10.yaml | 9 +++++++++ 1 file changed, 9 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 From 2de20066b3cfec5987d45a88f211ab04dfda403f Mon Sep 17 00:00:00 2001 From: Mark Harfouche Date: Mon, 2 Oct 2023 05:25:30 -0400 Subject: [PATCH 08/14] MNT: Re-rendered with conda-build 3.25.0, conda-smithy 3.26.3, and conda-forge-pinning 2023.10.02.03.27.19 --- .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, 25 insertions(+), 25 deletions(-) diff --git a/.ci_support/linux_64_numpy1.22python3.10.____cpython.yaml b/.ci_support/linux_64_numpy1.22python3.10.____cpython.yaml index 13604b6..f337b7f 100644 --- a/.ci_support/linux_64_numpy1.22python3.10.____cpython.yaml +++ b/.ci_support/linux_64_numpy1.22python3.10.____cpython.yaml @@ -13,7 +13,7 @@ docker_image: ffmpeg: - '6' fmt: -- '9' +- '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 8ebab69..fc92a1c 100644 --- a/.ci_support/linux_64_numpy1.22python3.8.____cpython.yaml +++ b/.ci_support/linux_64_numpy1.22python3.8.____cpython.yaml @@ -13,7 +13,7 @@ docker_image: ffmpeg: - '6' fmt: -- '9' +- '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 0f0c1e0..4db7989 100644 --- a/.ci_support/linux_64_numpy1.22python3.9.____cpython.yaml +++ b/.ci_support/linux_64_numpy1.22python3.9.____cpython.yaml @@ -13,7 +13,7 @@ docker_image: ffmpeg: - '6' fmt: -- '9' +- '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 95131d4..8251e16 100644 --- a/.ci_support/linux_64_numpy1.23python3.11.____cpython.yaml +++ b/.ci_support/linux_64_numpy1.23python3.11.____cpython.yaml @@ -13,7 +13,7 @@ docker_image: ffmpeg: - '6' fmt: -- '9' +- '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 a03a148..9ce57c6 100644 --- a/.ci_support/linux_64_numpy1.26python3.12.____cpython.yaml +++ b/.ci_support/linux_64_numpy1.26python3.12.____cpython.yaml @@ -13,7 +13,7 @@ docker_image: ffmpeg: - '6' fmt: -- '9' +- '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 4d18400..a7f2258 100644 --- a/.ci_support/linux_aarch64_numpy1.22python3.10.____cpython.yaml +++ b/.ci_support/linux_aarch64_numpy1.22python3.10.____cpython.yaml @@ -17,7 +17,7 @@ docker_image: ffmpeg: - '6' fmt: -- '9' +- '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 dd423aa..75b8704 100644 --- a/.ci_support/linux_aarch64_numpy1.22python3.8.____cpython.yaml +++ b/.ci_support/linux_aarch64_numpy1.22python3.8.____cpython.yaml @@ -17,7 +17,7 @@ docker_image: ffmpeg: - '6' fmt: -- '9' +- '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 63a0cde..40a4360 100644 --- a/.ci_support/linux_aarch64_numpy1.22python3.9.____cpython.yaml +++ b/.ci_support/linux_aarch64_numpy1.22python3.9.____cpython.yaml @@ -17,7 +17,7 @@ docker_image: ffmpeg: - '6' fmt: -- '9' +- '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 d59d9f3..bbb09c1 100644 --- a/.ci_support/linux_aarch64_numpy1.23python3.11.____cpython.yaml +++ b/.ci_support/linux_aarch64_numpy1.23python3.11.____cpython.yaml @@ -17,7 +17,7 @@ docker_image: ffmpeg: - '6' fmt: -- '9' +- '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 827e1c9..76f6987 100644 --- a/.ci_support/linux_aarch64_numpy1.26python3.12.____cpython.yaml +++ b/.ci_support/linux_aarch64_numpy1.26python3.12.____cpython.yaml @@ -17,7 +17,7 @@ docker_image: ffmpeg: - '6' fmt: -- '9' +- '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 d44c82a..cf64871 100644 --- a/.ci_support/linux_ppc64le_numpy1.22python3.10.____cpython.yaml +++ b/.ci_support/linux_ppc64le_numpy1.22python3.10.____cpython.yaml @@ -13,7 +13,7 @@ docker_image: ffmpeg: - '6' fmt: -- '9' +- '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 e19fa33..c68523f 100644 --- a/.ci_support/linux_ppc64le_numpy1.22python3.8.____cpython.yaml +++ b/.ci_support/linux_ppc64le_numpy1.22python3.8.____cpython.yaml @@ -13,7 +13,7 @@ docker_image: ffmpeg: - '6' fmt: -- '9' +- '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 4476b70..33de943 100644 --- a/.ci_support/linux_ppc64le_numpy1.22python3.9.____cpython.yaml +++ b/.ci_support/linux_ppc64le_numpy1.22python3.9.____cpython.yaml @@ -13,7 +13,7 @@ docker_image: ffmpeg: - '6' fmt: -- '9' +- '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 02ced92..0ccf303 100644 --- a/.ci_support/linux_ppc64le_numpy1.23python3.11.____cpython.yaml +++ b/.ci_support/linux_ppc64le_numpy1.23python3.11.____cpython.yaml @@ -13,7 +13,7 @@ docker_image: ffmpeg: - '6' fmt: -- '9' +- '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 3d1dc03..11fef2c 100644 --- a/.ci_support/linux_ppc64le_numpy1.26python3.12.____cpython.yaml +++ b/.ci_support/linux_ppc64le_numpy1.26python3.12.____cpython.yaml @@ -13,7 +13,7 @@ docker_image: ffmpeg: - '6' fmt: -- '9' +- '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 3539054..8d34aa2 100644 --- a/.ci_support/osx_64_numpy1.22python3.10.____cpython.yaml +++ b/.ci_support/osx_64_numpy1.22python3.10.____cpython.yaml @@ -13,7 +13,7 @@ cxx_compiler_version: ffmpeg: - '6' fmt: -- '9' +- '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 b57088c..f5add2a 100644 --- a/.ci_support/osx_64_numpy1.22python3.8.____cpython.yaml +++ b/.ci_support/osx_64_numpy1.22python3.8.____cpython.yaml @@ -13,7 +13,7 @@ cxx_compiler_version: ffmpeg: - '6' fmt: -- '9' +- '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 85869f7..1bfa259 100644 --- a/.ci_support/osx_64_numpy1.22python3.9.____cpython.yaml +++ b/.ci_support/osx_64_numpy1.22python3.9.____cpython.yaml @@ -13,7 +13,7 @@ cxx_compiler_version: ffmpeg: - '6' fmt: -- '9' +- '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 4763ae9..4cc131b 100644 --- a/.ci_support/osx_64_numpy1.23python3.11.____cpython.yaml +++ b/.ci_support/osx_64_numpy1.23python3.11.____cpython.yaml @@ -13,7 +13,7 @@ cxx_compiler_version: ffmpeg: - '6' fmt: -- '9' +- '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 bcc895c..ee1b72d 100644 --- a/.ci_support/osx_64_numpy1.26python3.12.____cpython.yaml +++ b/.ci_support/osx_64_numpy1.26python3.12.____cpython.yaml @@ -13,7 +13,7 @@ cxx_compiler_version: ffmpeg: - '6' fmt: -- '9' +- '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 3bb27e6..3985411 100644 --- a/.ci_support/osx_arm64_numpy1.22python3.10.____cpython.yaml +++ b/.ci_support/osx_arm64_numpy1.22python3.10.____cpython.yaml @@ -11,7 +11,7 @@ cxx_compiler_version: ffmpeg: - '6' fmt: -- '9' +- '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 6e309d9..d2ca55c 100644 --- a/.ci_support/osx_arm64_numpy1.22python3.8.____cpython.yaml +++ b/.ci_support/osx_arm64_numpy1.22python3.8.____cpython.yaml @@ -11,7 +11,7 @@ cxx_compiler_version: ffmpeg: - '6' fmt: -- '9' +- '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 1420b2d..1b018fd 100644 --- a/.ci_support/osx_arm64_numpy1.22python3.9.____cpython.yaml +++ b/.ci_support/osx_arm64_numpy1.22python3.9.____cpython.yaml @@ -11,7 +11,7 @@ cxx_compiler_version: ffmpeg: - '6' fmt: -- '9' +- '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 d74d4e0..07d65f6 100644 --- a/.ci_support/osx_arm64_numpy1.23python3.11.____cpython.yaml +++ b/.ci_support/osx_arm64_numpy1.23python3.11.____cpython.yaml @@ -11,7 +11,7 @@ cxx_compiler_version: ffmpeg: - '6' fmt: -- '9' +- '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 f0aa952..a820c7a 100644 --- a/.ci_support/osx_arm64_numpy1.26python3.12.____cpython.yaml +++ b/.ci_support/osx_arm64_numpy1.26python3.12.____cpython.yaml @@ -11,7 +11,7 @@ cxx_compiler_version: ffmpeg: - '6' fmt: -- '9' +- '10' freetype: - '2' giflib: From 8e5a772e275f84cad91117b758493a9b2b249216 Mon Sep 17 00:00:00 2001 From: Mark Harfouche Date: Mon, 2 Oct 2023 05:54:26 -0400 Subject: [PATCH 09/14] add tsl robinmap to py-openimageio build --- recipe/meta.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index d939e13..a8209be 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -70,6 +70,9 @@ outputs: - pybind11 - libboost-headers - imath + # header only, so re-added here so cmake thinks it is the same + # environment as before + - tsl_robin_map run: - {{ pin_subpackage('openimageio', exact=True) }} - {{ pin_compatible('numpy') }} From eae9e78c1ce65c1b39e626d08bb0cc52591b9f8a Mon Sep 17 00:00:00 2001 From: h-vetinari Date: Mon, 2 Oct 2023 12:08:58 +0200 Subject: [PATCH 10/14] Set `Python_FIND_STRAGEGY=LOCATION` Co-authored-by: Mark Harfouche --- recipe/build.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipe/build.sh b/recipe/build.sh index d7658c0..6337dc4 100755 --- a/recipe/build.sh +++ b/recipe/build.sh @@ -18,7 +18,7 @@ cmake ${CMAKE_ARGS} \ -DCMAKE_INSTALL_LIBDIR=lib \ -DCMAKE_BUILD_TYPE=Release \ -DPYTHON_VERSION=$PY_VER \ - -DPython_FIND_VIRTUALENV=First \ + -DPython_FIND_STRATEGY=LOCATION \ .. make all -j${CPU_COUNT} From 372ed0fb72c375702e4259ef0214872cf2af994a Mon Sep 17 00:00:00 2001 From: Mark Harfouche Date: Mon, 2 Oct 2023 07:38:52 -0400 Subject: [PATCH 11/14] Update recipe/build.sh --- recipe/build.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/recipe/build.sh b/recipe/build.sh index 6337dc4..1fc7870 100755 --- a/recipe/build.sh +++ b/recipe/build.sh @@ -19,6 +19,7 @@ cmake ${CMAKE_ARGS} \ -DCMAKE_BUILD_TYPE=Release \ -DPYTHON_VERSION=$PY_VER \ -DPython_FIND_STRATEGY=LOCATION \ + -DPython_FIND_VIRTUALENV=First \ .. make all -j${CPU_COUNT} From 86adc9be30f73406ab2d68d92089b3c5888dc524 Mon Sep 17 00:00:00 2001 From: Mark Harfouche Date: Mon, 2 Oct 2023 07:57:04 -0400 Subject: [PATCH 12/14] PYTHON_MODULE_EXTENSION --- recipe/build.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/recipe/build.sh b/recipe/build.sh index 1fc7870..2a2328f 100755 --- a/recipe/build.sh +++ b/recipe/build.sh @@ -8,6 +8,8 @@ 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 \ @@ -18,6 +20,7 @@ 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 \ .. From 3c42197811d43a31578c263375a1ab1e2c0ab216 Mon Sep 17 00:00:00 2001 From: Mark Harfouche Date: Mon, 2 Oct 2023 09:03:35 -0400 Subject: [PATCH 13/14] Add patch to use modern find python --- recipe/4000-findpython.patch | 101 +++++++++++++++++++++++++++++++++++ recipe/meta.yaml | 3 ++ 2 files changed, 104 insertions(+) create mode 100644 recipe/4000-findpython.patch 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 a8209be..34564fc 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: a8cea8b6087610e5154fbbe028548ab4fc773eb36531eef44ffb42351bc0b0f0 + patches: + # https://github.com/AcademySoftwareFoundation/OpenImageIO/pull/4000 + - 4000-findpython.patch build: number: 1 From 33c570f606d23c7de43d1cff09baf6cefd6bb526 Mon Sep 17 00:00:00 2001 From: Mark Harfouche Date: Tue, 3 Oct 2023 08:38:42 -0400 Subject: [PATCH 14/14] Do cmake twice --- recipe/build.sh | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/recipe/build.sh b/recipe/build.sh index 2a2328f..282ca74 100755 --- a/recipe/build.sh +++ b/recipe/build.sh @@ -10,6 +10,21 @@ 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 \ + -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 \ + .. + cmake ${CMAKE_ARGS} \ -DUSE_FFMPEG=ON \ -DOIIO_BUILD_TOOLS=OFF \
Azure