diff --git a/.azure-pipelines/azure-pipelines-linux.yml b/.azure-pipelines/azure-pipelines-linux.yml index 215ce6d..a054f8c 100755 --- a/.azure-pipelines/azure-pipelines-linux.yml +++ b/.azure-pipelines/azure-pipelines-linux.yml @@ -11,63 +11,51 @@ jobs: linux_64_numpy1.22python3.10.____cpython: CONFIG: linux_64_numpy1.22python3.10.____cpython UPLOAD_PACKAGES: 'True' - DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - linux_64_numpy1.22python3.8.____cpython: - CONFIG: linux_64_numpy1.22python3.8.____cpython - UPLOAD_PACKAGES: 'True' - DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 + DOCKER_IMAGE: quay.io/condaforge/linux-anvil-x86_64:alma9 linux_64_numpy1.22python3.9.____cpython: CONFIG: linux_64_numpy1.22python3.9.____cpython UPLOAD_PACKAGES: 'True' - DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 + DOCKER_IMAGE: quay.io/condaforge/linux-anvil-x86_64:alma9 linux_64_numpy1.23python3.11.____cpython: CONFIG: linux_64_numpy1.23python3.11.____cpython UPLOAD_PACKAGES: 'True' - DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 + DOCKER_IMAGE: quay.io/condaforge/linux-anvil-x86_64:alma9 linux_64_numpy1.26python3.12.____cpython: CONFIG: linux_64_numpy1.26python3.12.____cpython UPLOAD_PACKAGES: 'True' - DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 + DOCKER_IMAGE: quay.io/condaforge/linux-anvil-x86_64:alma9 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 + DOCKER_IMAGE: quay.io/condaforge/linux-anvil-x86_64:alma9 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 + DOCKER_IMAGE: quay.io/condaforge/linux-anvil-x86_64:alma9 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 + DOCKER_IMAGE: quay.io/condaforge/linux-anvil-x86_64:alma9 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 + DOCKER_IMAGE: quay.io/condaforge/linux-anvil-x86_64:alma9 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 + DOCKER_IMAGE: quay.io/condaforge/linux-anvil-x86_64:alma9 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 + DOCKER_IMAGE: quay.io/condaforge/linux-anvil-x86_64:alma9 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 + DOCKER_IMAGE: quay.io/condaforge/linux-anvil-x86_64:alma9 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 + DOCKER_IMAGE: quay.io/condaforge/linux-anvil-x86_64:alma9 timeoutInMinutes: 360 variables: {} diff --git a/.azure-pipelines/azure-pipelines-osx.yml b/.azure-pipelines/azure-pipelines-osx.yml index e810526..b007a63 100755 --- a/.azure-pipelines/azure-pipelines-osx.yml +++ b/.azure-pipelines/azure-pipelines-osx.yml @@ -5,15 +5,12 @@ jobs: - job: osx pool: - vmImage: macOS-11 + vmImage: macOS-13 strategy: matrix: osx_64_numpy1.22python3.10.____cpython: CONFIG: osx_64_numpy1.22python3.10.____cpython UPLOAD_PACKAGES: 'True' - osx_64_numpy1.22python3.8.____cpython: - CONFIG: osx_64_numpy1.22python3.8.____cpython - UPLOAD_PACKAGES: 'True' osx_64_numpy1.22python3.9.____cpython: CONFIG: osx_64_numpy1.22python3.9.____cpython UPLOAD_PACKAGES: 'True' @@ -26,9 +23,6 @@ jobs: osx_arm64_numpy1.22python3.10.____cpython: CONFIG: osx_arm64_numpy1.22python3.10.____cpython UPLOAD_PACKAGES: 'True' - osx_arm64_numpy1.22python3.8.____cpython: - CONFIG: osx_arm64_numpy1.22python3.8.____cpython - UPLOAD_PACKAGES: 'True' osx_arm64_numpy1.22python3.9.____cpython: CONFIG: osx_arm64_numpy1.22python3.9.____cpython UPLOAD_PACKAGES: 'True' diff --git a/.ci_support/linux_64_numpy1.22python3.10.____cpython.yaml b/.ci_support/linux_64_numpy1.22python3.10.____cpython.yaml index b8078de..ea5a43b 100644 --- a/.ci_support/linux_64_numpy1.22python3.10.____cpython.yaml +++ b/.ci_support/linux_64_numpy1.22python3.10.____cpython.yaml @@ -1,9 +1,9 @@ c_stdlib: - sysroot c_stdlib_version: -- '2.12' +- '2.17' cdt_name: -- cos6 +- conda channel_sources: - conda-forge channel_targets: @@ -11,11 +11,11 @@ channel_targets: cxx_compiler: - gxx cxx_compiler_version: -- '12' +- '13' docker_image: -- quay.io/condaforge/linux-anvil-cos7-x86_64 +- quay.io/condaforge/linux-anvil-x86_64:alma9 ffmpeg: -- '6' +- '7' fmt: - '10' freetype: @@ -23,9 +23,11 @@ freetype: giflib: - '5.2' imath: -- 3.1.11 +- 3.1.12 libboost_devel: -- '1.84' +- '1.86' +libheif: +- '1.19' libjpeg_turbo: - '3' libpng: @@ -33,13 +35,13 @@ libpng: libraw: - '0.21' libtiff: -- '4.6' +- '4.7' libwebp: - '1' numpy: - '1.22' openexr: -- '3.2' +- '3.3' pin_run_as_build: python: min_pin: x.x @@ -48,10 +50,10 @@ python: - 3.10.* *_cpython target_platform: - linux-64 +tbb_devel: +- '2021' zip_keys: -- - c_stdlib_version - - cdt_name - - python - numpy zlib: -- '1.2' +- '1' diff --git a/.ci_support/linux_64_numpy1.22python3.8.____cpython.yaml b/.ci_support/linux_64_numpy1.22python3.8.____cpython.yaml deleted file mode 100644 index ef2c9e2..0000000 --- a/.ci_support/linux_64_numpy1.22python3.8.____cpython.yaml +++ /dev/null @@ -1,57 +0,0 @@ -c_stdlib: -- sysroot -c_stdlib_version: -- '2.12' -cdt_name: -- cos6 -channel_sources: -- conda-forge -channel_targets: -- conda-forge main -cxx_compiler: -- gxx -cxx_compiler_version: -- '12' -docker_image: -- quay.io/condaforge/linux-anvil-cos7-x86_64 -ffmpeg: -- '6' -fmt: -- '10' -freetype: -- '2' -giflib: -- '5.2' -imath: -- 3.1.11 -libboost_devel: -- '1.84' -libjpeg_turbo: -- '3' -libpng: -- '1.6' -libraw: -- '0.21' -libtiff: -- '4.6' -libwebp: -- '1' -numpy: -- '1.22' -openexr: -- '3.2' -pin_run_as_build: - python: - min_pin: x.x - max_pin: x.x -python: -- 3.8.* *_cpython -target_platform: -- linux-64 -zip_keys: -- - c_stdlib_version - - cdt_name -- - python - - numpy -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 4004dbc..0a091fa 100644 --- a/.ci_support/linux_64_numpy1.22python3.9.____cpython.yaml +++ b/.ci_support/linux_64_numpy1.22python3.9.____cpython.yaml @@ -1,9 +1,9 @@ c_stdlib: - sysroot c_stdlib_version: -- '2.12' +- '2.17' cdt_name: -- cos6 +- conda channel_sources: - conda-forge channel_targets: @@ -11,11 +11,11 @@ channel_targets: cxx_compiler: - gxx cxx_compiler_version: -- '12' +- '13' docker_image: -- quay.io/condaforge/linux-anvil-cos7-x86_64 +- quay.io/condaforge/linux-anvil-x86_64:alma9 ffmpeg: -- '6' +- '7' fmt: - '10' freetype: @@ -23,9 +23,11 @@ freetype: giflib: - '5.2' imath: -- 3.1.11 +- 3.1.12 libboost_devel: -- '1.84' +- '1.86' +libheif: +- '1.19' libjpeg_turbo: - '3' libpng: @@ -33,13 +35,13 @@ libpng: libraw: - '0.21' libtiff: -- '4.6' +- '4.7' libwebp: - '1' numpy: - '1.22' openexr: -- '3.2' +- '3.3' pin_run_as_build: python: min_pin: x.x @@ -48,10 +50,10 @@ python: - 3.9.* *_cpython target_platform: - linux-64 +tbb_devel: +- '2021' zip_keys: -- - c_stdlib_version - - cdt_name - - python - numpy zlib: -- '1.2' +- '1' diff --git a/.ci_support/linux_64_numpy1.23python3.11.____cpython.yaml b/.ci_support/linux_64_numpy1.23python3.11.____cpython.yaml index 2147900..91a31de 100644 --- a/.ci_support/linux_64_numpy1.23python3.11.____cpython.yaml +++ b/.ci_support/linux_64_numpy1.23python3.11.____cpython.yaml @@ -1,9 +1,9 @@ c_stdlib: - sysroot c_stdlib_version: -- '2.12' +- '2.17' cdt_name: -- cos6 +- conda channel_sources: - conda-forge channel_targets: @@ -11,11 +11,11 @@ channel_targets: cxx_compiler: - gxx cxx_compiler_version: -- '12' +- '13' docker_image: -- quay.io/condaforge/linux-anvil-cos7-x86_64 +- quay.io/condaforge/linux-anvil-x86_64:alma9 ffmpeg: -- '6' +- '7' fmt: - '10' freetype: @@ -23,9 +23,11 @@ freetype: giflib: - '5.2' imath: -- 3.1.11 +- 3.1.12 libboost_devel: -- '1.84' +- '1.86' +libheif: +- '1.19' libjpeg_turbo: - '3' libpng: @@ -33,13 +35,13 @@ libpng: libraw: - '0.21' libtiff: -- '4.6' +- '4.7' libwebp: - '1' numpy: - '1.23' openexr: -- '3.2' +- '3.3' pin_run_as_build: python: min_pin: x.x @@ -48,10 +50,10 @@ python: - 3.11.* *_cpython target_platform: - linux-64 +tbb_devel: +- '2021' zip_keys: -- - c_stdlib_version - - cdt_name - - python - numpy zlib: -- '1.2' +- '1' diff --git a/.ci_support/linux_64_numpy1.26python3.12.____cpython.yaml b/.ci_support/linux_64_numpy1.26python3.12.____cpython.yaml index dcf4dda..05b3bfb 100644 --- a/.ci_support/linux_64_numpy1.26python3.12.____cpython.yaml +++ b/.ci_support/linux_64_numpy1.26python3.12.____cpython.yaml @@ -1,9 +1,9 @@ c_stdlib: - sysroot c_stdlib_version: -- '2.12' +- '2.17' cdt_name: -- cos6 +- conda channel_sources: - conda-forge channel_targets: @@ -11,11 +11,11 @@ channel_targets: cxx_compiler: - gxx cxx_compiler_version: -- '12' +- '13' docker_image: -- quay.io/condaforge/linux-anvil-cos7-x86_64 +- quay.io/condaforge/linux-anvil-x86_64:alma9 ffmpeg: -- '6' +- '7' fmt: - '10' freetype: @@ -23,9 +23,11 @@ freetype: giflib: - '5.2' imath: -- 3.1.11 +- 3.1.12 libboost_devel: -- '1.84' +- '1.86' +libheif: +- '1.19' libjpeg_turbo: - '3' libpng: @@ -33,13 +35,13 @@ libpng: libraw: - '0.21' libtiff: -- '4.6' +- '4.7' libwebp: - '1' numpy: - '1.26' openexr: -- '3.2' +- '3.3' pin_run_as_build: python: min_pin: x.x @@ -48,10 +50,10 @@ python: - 3.12.* *_cpython target_platform: - linux-64 +tbb_devel: +- '2021' zip_keys: -- - c_stdlib_version - - cdt_name - - python - numpy zlib: -- '1.2' +- '1' diff --git a/.ci_support/linux_aarch64_numpy1.22python3.10.____cpython.yaml b/.ci_support/linux_aarch64_numpy1.22python3.10.____cpython.yaml index 23d6ffa..e09bee9 100644 --- a/.ci_support/linux_aarch64_numpy1.22python3.10.____cpython.yaml +++ b/.ci_support/linux_aarch64_numpy1.22python3.10.____cpython.yaml @@ -1,13 +1,9 @@ -BUILD: -- aarch64-conda_cos7-linux-gnu c_stdlib: - sysroot c_stdlib_version: - '2.17' -cdt_arch: -- aarch64 cdt_name: -- cos7 +- conda channel_sources: - conda-forge channel_targets: @@ -15,11 +11,11 @@ channel_targets: cxx_compiler: - gxx cxx_compiler_version: -- '12' +- '13' docker_image: -- quay.io/condaforge/linux-anvil-cos7-x86_64 +- quay.io/condaforge/linux-anvil-x86_64:alma9 ffmpeg: -- '6' +- '7' fmt: - '10' freetype: @@ -27,9 +23,11 @@ freetype: giflib: - '5.2' imath: -- 3.1.11 +- 3.1.12 libboost_devel: -- '1.84' +- '1.86' +libheif: +- '1.19' libjpeg_turbo: - '3' libpng: @@ -37,13 +35,13 @@ libpng: libraw: - '0.21' libtiff: -- '4.6' +- '4.7' libwebp: - '1' numpy: - '1.22' openexr: -- '3.2' +- '3.3' pin_run_as_build: python: min_pin: x.x @@ -52,10 +50,10 @@ python: - 3.10.* *_cpython target_platform: - linux-aarch64 +tbb_devel: +- '2021' zip_keys: -- - c_stdlib_version - - cdt_name - - python - numpy zlib: -- '1.2' +- '1' diff --git a/.ci_support/linux_aarch64_numpy1.22python3.8.____cpython.yaml b/.ci_support/linux_aarch64_numpy1.22python3.8.____cpython.yaml deleted file mode 100644 index b49049f..0000000 --- a/.ci_support/linux_aarch64_numpy1.22python3.8.____cpython.yaml +++ /dev/null @@ -1,61 +0,0 @@ -BUILD: -- aarch64-conda_cos7-linux-gnu -c_stdlib: -- sysroot -c_stdlib_version: -- '2.17' -cdt_arch: -- aarch64 -cdt_name: -- cos7 -channel_sources: -- conda-forge -channel_targets: -- conda-forge main -cxx_compiler: -- gxx -cxx_compiler_version: -- '12' -docker_image: -- quay.io/condaforge/linux-anvil-cos7-x86_64 -ffmpeg: -- '6' -fmt: -- '10' -freetype: -- '2' -giflib: -- '5.2' -imath: -- 3.1.11 -libboost_devel: -- '1.84' -libjpeg_turbo: -- '3' -libpng: -- '1.6' -libraw: -- '0.21' -libtiff: -- '4.6' -libwebp: -- '1' -numpy: -- '1.22' -openexr: -- '3.2' -pin_run_as_build: - python: - min_pin: x.x - max_pin: x.x -python: -- 3.8.* *_cpython -target_platform: -- linux-aarch64 -zip_keys: -- - c_stdlib_version - - cdt_name -- - python - - numpy -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 1ac4831..6492dad 100644 --- a/.ci_support/linux_aarch64_numpy1.22python3.9.____cpython.yaml +++ b/.ci_support/linux_aarch64_numpy1.22python3.9.____cpython.yaml @@ -1,13 +1,9 @@ -BUILD: -- aarch64-conda_cos7-linux-gnu c_stdlib: - sysroot c_stdlib_version: - '2.17' -cdt_arch: -- aarch64 cdt_name: -- cos7 +- conda channel_sources: - conda-forge channel_targets: @@ -15,11 +11,11 @@ channel_targets: cxx_compiler: - gxx cxx_compiler_version: -- '12' +- '13' docker_image: -- quay.io/condaforge/linux-anvil-cos7-x86_64 +- quay.io/condaforge/linux-anvil-x86_64:alma9 ffmpeg: -- '6' +- '7' fmt: - '10' freetype: @@ -27,9 +23,11 @@ freetype: giflib: - '5.2' imath: -- 3.1.11 +- 3.1.12 libboost_devel: -- '1.84' +- '1.86' +libheif: +- '1.19' libjpeg_turbo: - '3' libpng: @@ -37,13 +35,13 @@ libpng: libraw: - '0.21' libtiff: -- '4.6' +- '4.7' libwebp: - '1' numpy: - '1.22' openexr: -- '3.2' +- '3.3' pin_run_as_build: python: min_pin: x.x @@ -52,10 +50,10 @@ python: - 3.9.* *_cpython target_platform: - linux-aarch64 +tbb_devel: +- '2021' zip_keys: -- - c_stdlib_version - - cdt_name - - python - numpy zlib: -- '1.2' +- '1' diff --git a/.ci_support/linux_aarch64_numpy1.23python3.11.____cpython.yaml b/.ci_support/linux_aarch64_numpy1.23python3.11.____cpython.yaml index d7b0951..f3bdd28 100644 --- a/.ci_support/linux_aarch64_numpy1.23python3.11.____cpython.yaml +++ b/.ci_support/linux_aarch64_numpy1.23python3.11.____cpython.yaml @@ -1,13 +1,9 @@ -BUILD: -- aarch64-conda_cos7-linux-gnu c_stdlib: - sysroot c_stdlib_version: - '2.17' -cdt_arch: -- aarch64 cdt_name: -- cos7 +- conda channel_sources: - conda-forge channel_targets: @@ -15,11 +11,11 @@ channel_targets: cxx_compiler: - gxx cxx_compiler_version: -- '12' +- '13' docker_image: -- quay.io/condaforge/linux-anvil-cos7-x86_64 +- quay.io/condaforge/linux-anvil-x86_64:alma9 ffmpeg: -- '6' +- '7' fmt: - '10' freetype: @@ -27,9 +23,11 @@ freetype: giflib: - '5.2' imath: -- 3.1.11 +- 3.1.12 libboost_devel: -- '1.84' +- '1.86' +libheif: +- '1.19' libjpeg_turbo: - '3' libpng: @@ -37,13 +35,13 @@ libpng: libraw: - '0.21' libtiff: -- '4.6' +- '4.7' libwebp: - '1' numpy: - '1.23' openexr: -- '3.2' +- '3.3' pin_run_as_build: python: min_pin: x.x @@ -52,10 +50,10 @@ python: - 3.11.* *_cpython target_platform: - linux-aarch64 +tbb_devel: +- '2021' zip_keys: -- - c_stdlib_version - - cdt_name - - python - numpy zlib: -- '1.2' +- '1' diff --git a/.ci_support/linux_aarch64_numpy1.26python3.12.____cpython.yaml b/.ci_support/linux_aarch64_numpy1.26python3.12.____cpython.yaml index 5005448..8158724 100644 --- a/.ci_support/linux_aarch64_numpy1.26python3.12.____cpython.yaml +++ b/.ci_support/linux_aarch64_numpy1.26python3.12.____cpython.yaml @@ -1,13 +1,9 @@ -BUILD: -- aarch64-conda_cos7-linux-gnu c_stdlib: - sysroot c_stdlib_version: - '2.17' -cdt_arch: -- aarch64 cdt_name: -- cos7 +- conda channel_sources: - conda-forge channel_targets: @@ -15,11 +11,11 @@ channel_targets: cxx_compiler: - gxx cxx_compiler_version: -- '12' +- '13' docker_image: -- quay.io/condaforge/linux-anvil-cos7-x86_64 +- quay.io/condaforge/linux-anvil-x86_64:alma9 ffmpeg: -- '6' +- '7' fmt: - '10' freetype: @@ -27,9 +23,11 @@ freetype: giflib: - '5.2' imath: -- 3.1.11 +- 3.1.12 libboost_devel: -- '1.84' +- '1.86' +libheif: +- '1.19' libjpeg_turbo: - '3' libpng: @@ -37,13 +35,13 @@ libpng: libraw: - '0.21' libtiff: -- '4.6' +- '4.7' libwebp: - '1' numpy: - '1.26' openexr: -- '3.2' +- '3.3' pin_run_as_build: python: min_pin: x.x @@ -52,10 +50,10 @@ python: - 3.12.* *_cpython target_platform: - linux-aarch64 +tbb_devel: +- '2021' zip_keys: -- - c_stdlib_version - - cdt_name - - python - numpy zlib: -- '1.2' +- '1' diff --git a/.ci_support/linux_ppc64le_numpy1.22python3.10.____cpython.yaml b/.ci_support/linux_ppc64le_numpy1.22python3.10.____cpython.yaml index 1f6c58a..39d783f 100644 --- a/.ci_support/linux_ppc64le_numpy1.22python3.10.____cpython.yaml +++ b/.ci_support/linux_ppc64le_numpy1.22python3.10.____cpython.yaml @@ -3,7 +3,7 @@ c_stdlib: c_stdlib_version: - '2.17' cdt_name: -- cos7 +- conda channel_sources: - conda-forge channel_targets: @@ -11,11 +11,11 @@ channel_targets: cxx_compiler: - gxx cxx_compiler_version: -- '12' +- '13' docker_image: -- quay.io/condaforge/linux-anvil-cos7-x86_64 +- quay.io/condaforge/linux-anvil-x86_64:alma9 ffmpeg: -- '6' +- '7' fmt: - '10' freetype: @@ -23,9 +23,11 @@ freetype: giflib: - '5.2' imath: -- 3.1.11 +- 3.1.12 libboost_devel: -- '1.84' +- '1.86' +libheif: +- '1.19' libjpeg_turbo: - '3' libpng: @@ -33,13 +35,13 @@ libpng: libraw: - '0.21' libtiff: -- '4.6' +- '4.7' libwebp: - '1' numpy: - '1.22' openexr: -- '3.2' +- '3.3' pin_run_as_build: python: min_pin: x.x @@ -48,10 +50,10 @@ python: - 3.10.* *_cpython target_platform: - linux-ppc64le +tbb_devel: +- '2021' zip_keys: -- - c_stdlib_version - - cdt_name - - python - numpy zlib: -- '1.2' +- '1' diff --git a/.ci_support/linux_ppc64le_numpy1.22python3.8.____cpython.yaml b/.ci_support/linux_ppc64le_numpy1.22python3.8.____cpython.yaml deleted file mode 100644 index f64cc52..0000000 --- a/.ci_support/linux_ppc64le_numpy1.22python3.8.____cpython.yaml +++ /dev/null @@ -1,57 +0,0 @@ -c_stdlib: -- sysroot -c_stdlib_version: -- '2.17' -cdt_name: -- cos7 -channel_sources: -- conda-forge -channel_targets: -- conda-forge main -cxx_compiler: -- gxx -cxx_compiler_version: -- '12' -docker_image: -- quay.io/condaforge/linux-anvil-cos7-x86_64 -ffmpeg: -- '6' -fmt: -- '10' -freetype: -- '2' -giflib: -- '5.2' -imath: -- 3.1.11 -libboost_devel: -- '1.84' -libjpeg_turbo: -- '3' -libpng: -- '1.6' -libraw: -- '0.21' -libtiff: -- '4.6' -libwebp: -- '1' -numpy: -- '1.22' -openexr: -- '3.2' -pin_run_as_build: - python: - min_pin: x.x - max_pin: x.x -python: -- 3.8.* *_cpython -target_platform: -- linux-ppc64le -zip_keys: -- - c_stdlib_version - - cdt_name -- - python - - numpy -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 6d8fc21..7309714 100644 --- a/.ci_support/linux_ppc64le_numpy1.22python3.9.____cpython.yaml +++ b/.ci_support/linux_ppc64le_numpy1.22python3.9.____cpython.yaml @@ -3,7 +3,7 @@ c_stdlib: c_stdlib_version: - '2.17' cdt_name: -- cos7 +- conda channel_sources: - conda-forge channel_targets: @@ -11,11 +11,11 @@ channel_targets: cxx_compiler: - gxx cxx_compiler_version: -- '12' +- '13' docker_image: -- quay.io/condaforge/linux-anvil-cos7-x86_64 +- quay.io/condaforge/linux-anvil-x86_64:alma9 ffmpeg: -- '6' +- '7' fmt: - '10' freetype: @@ -23,9 +23,11 @@ freetype: giflib: - '5.2' imath: -- 3.1.11 +- 3.1.12 libboost_devel: -- '1.84' +- '1.86' +libheif: +- '1.19' libjpeg_turbo: - '3' libpng: @@ -33,13 +35,13 @@ libpng: libraw: - '0.21' libtiff: -- '4.6' +- '4.7' libwebp: - '1' numpy: - '1.22' openexr: -- '3.2' +- '3.3' pin_run_as_build: python: min_pin: x.x @@ -48,10 +50,10 @@ python: - 3.9.* *_cpython target_platform: - linux-ppc64le +tbb_devel: +- '2021' zip_keys: -- - c_stdlib_version - - cdt_name - - python - numpy zlib: -- '1.2' +- '1' diff --git a/.ci_support/linux_ppc64le_numpy1.23python3.11.____cpython.yaml b/.ci_support/linux_ppc64le_numpy1.23python3.11.____cpython.yaml index 62eb9dc..c28663f 100644 --- a/.ci_support/linux_ppc64le_numpy1.23python3.11.____cpython.yaml +++ b/.ci_support/linux_ppc64le_numpy1.23python3.11.____cpython.yaml @@ -3,7 +3,7 @@ c_stdlib: c_stdlib_version: - '2.17' cdt_name: -- cos7 +- conda channel_sources: - conda-forge channel_targets: @@ -11,11 +11,11 @@ channel_targets: cxx_compiler: - gxx cxx_compiler_version: -- '12' +- '13' docker_image: -- quay.io/condaforge/linux-anvil-cos7-x86_64 +- quay.io/condaforge/linux-anvil-x86_64:alma9 ffmpeg: -- '6' +- '7' fmt: - '10' freetype: @@ -23,9 +23,11 @@ freetype: giflib: - '5.2' imath: -- 3.1.11 +- 3.1.12 libboost_devel: -- '1.84' +- '1.86' +libheif: +- '1.19' libjpeg_turbo: - '3' libpng: @@ -33,13 +35,13 @@ libpng: libraw: - '0.21' libtiff: -- '4.6' +- '4.7' libwebp: - '1' numpy: - '1.23' openexr: -- '3.2' +- '3.3' pin_run_as_build: python: min_pin: x.x @@ -48,10 +50,10 @@ python: - 3.11.* *_cpython target_platform: - linux-ppc64le +tbb_devel: +- '2021' zip_keys: -- - c_stdlib_version - - cdt_name - - python - numpy zlib: -- '1.2' +- '1' diff --git a/.ci_support/linux_ppc64le_numpy1.26python3.12.____cpython.yaml b/.ci_support/linux_ppc64le_numpy1.26python3.12.____cpython.yaml index 5bdd9c8..d692514 100644 --- a/.ci_support/linux_ppc64le_numpy1.26python3.12.____cpython.yaml +++ b/.ci_support/linux_ppc64le_numpy1.26python3.12.____cpython.yaml @@ -3,7 +3,7 @@ c_stdlib: c_stdlib_version: - '2.17' cdt_name: -- cos7 +- conda channel_sources: - conda-forge channel_targets: @@ -11,11 +11,11 @@ channel_targets: cxx_compiler: - gxx cxx_compiler_version: -- '12' +- '13' docker_image: -- quay.io/condaforge/linux-anvil-cos7-x86_64 +- quay.io/condaforge/linux-anvil-x86_64:alma9 ffmpeg: -- '6' +- '7' fmt: - '10' freetype: @@ -23,9 +23,11 @@ freetype: giflib: - '5.2' imath: -- 3.1.11 +- 3.1.12 libboost_devel: -- '1.84' +- '1.86' +libheif: +- '1.19' libjpeg_turbo: - '3' libpng: @@ -33,13 +35,13 @@ libpng: libraw: - '0.21' libtiff: -- '4.6' +- '4.7' libwebp: - '1' numpy: - '1.26' openexr: -- '3.2' +- '3.3' pin_run_as_build: python: min_pin: x.x @@ -48,10 +50,10 @@ python: - 3.12.* *_cpython target_platform: - linux-ppc64le +tbb_devel: +- '2021' zip_keys: -- - c_stdlib_version - - cdt_name - - python - numpy zlib: -- '1.2' +- '1' diff --git a/.ci_support/migrations/boost1840.yaml b/.ci_support/migrations/libboost186.yaml similarity index 52% rename from .ci_support/migrations/boost1840.yaml rename to .ci_support/migrations/libboost186.yaml index 5d6e74c..7979852 100644 --- a/.ci_support/migrations/boost1840.yaml +++ b/.ci_support/migrations/libboost186.yaml @@ -1,10 +1,10 @@ __migrator: build_number: 1 kind: version - commit_message: "Rebuild for libboost 1.84" + commit_message: "Rebuild for libboost 1.86" migration_number: 1 libboost_devel: -- "1.84" +- "1.86" libboost_python_devel: -- "1.84" -migrator_ts: 1700834511.141209 +- "1.86" +migrator_ts: 1723764795.6693385 diff --git a/.ci_support/migrations/python312.yaml b/.ci_support/migrations/python312.yaml deleted file mode 100644 index af9104e..0000000 --- a/.ci_support/migrations/python312.yaml +++ /dev/null @@ -1,42 +0,0 @@ -migrator_ts: 1695046563 -__migrator: - migration_number: 1 - operation: key_add - primary_key: python - ordering: - python: - - 3.6.* *_cpython - - 3.7.* *_cpython - - 3.8.* *_cpython - - 3.9.* *_cpython - - 3.10.* *_cpython - - 3.11.* *_cpython - - 3.12.* *_cpython # new entry - - 3.6.* *_73_pypy - - 3.7.* *_73_pypy - - 3.8.* *_73_pypy - - 3.9.* *_73_pypy - paused: false - longterm: True - pr_limit: 30 - max_solver_attempts: 5 # this will make the bot retry "not solvable" stuff 5 times - exclude: - # this shouldn't attempt to modify the python feedstocks - - python - - pypy3.6 - - pypy-meta - - cross-python - - python_abi - exclude_pinned_pkgs: false - additional_zip_keys: - - channel_sources - -python: - - 3.12.* *_cpython -channel_sources: - - conda-forge/label/python_rc,conda-forge -# additional entries to add for zip_keys -numpy: - - 1.26 -python_impl: - - cpython diff --git a/.ci_support/osx_64_numpy1.22python3.10.____cpython.yaml b/.ci_support/osx_64_numpy1.22python3.10.____cpython.yaml index f90910f..68c0274 100644 --- a/.ci_support/osx_64_numpy1.22python3.10.____cpython.yaml +++ b/.ci_support/osx_64_numpy1.22python3.10.____cpython.yaml @@ -1,11 +1,11 @@ MACOSX_DEPLOYMENT_TARGET: -- '10.9' +- '10.13' MACOSX_SDK_VERSION: - '11.0' c_stdlib: - macosx_deployment_target c_stdlib_version: -- '10.9' +- '10.13' channel_sources: - conda-forge channel_targets: @@ -13,9 +13,9 @@ channel_targets: cxx_compiler: - clangxx cxx_compiler_version: -- '16' +- '18' ffmpeg: -- '6' +- '7' fmt: - '10' freetype: @@ -23,9 +23,11 @@ freetype: giflib: - '5.2' imath: -- 3.1.11 +- 3.1.12 libboost_devel: -- '1.84' +- '1.86' +libheif: +- '1.19' libjpeg_turbo: - '3' libpng: @@ -33,7 +35,7 @@ libpng: libraw: - '0.21' libtiff: -- '4.6' +- '4.7' libwebp: - '1' macos_machine: @@ -41,7 +43,7 @@ macos_machine: numpy: - '1.22' openexr: -- '3.2' +- '3.3' pin_run_as_build: python: min_pin: x.x @@ -50,8 +52,10 @@ python: - 3.10.* *_cpython target_platform: - osx-64 +tbb_devel: +- '2021' zip_keys: - - python - numpy zlib: -- '1.2' +- '1' diff --git a/.ci_support/osx_64_numpy1.22python3.8.____cpython.yaml b/.ci_support/osx_64_numpy1.22python3.8.____cpython.yaml deleted file mode 100644 index 1c23ae7..0000000 --- a/.ci_support/osx_64_numpy1.22python3.8.____cpython.yaml +++ /dev/null @@ -1,57 +0,0 @@ -MACOSX_DEPLOYMENT_TARGET: -- '10.9' -MACOSX_SDK_VERSION: -- '11.0' -c_stdlib: -- macosx_deployment_target -c_stdlib_version: -- '10.9' -channel_sources: -- conda-forge -channel_targets: -- conda-forge main -cxx_compiler: -- clangxx -cxx_compiler_version: -- '16' -ffmpeg: -- '6' -fmt: -- '10' -freetype: -- '2' -giflib: -- '5.2' -imath: -- 3.1.11 -libboost_devel: -- '1.84' -libjpeg_turbo: -- '3' -libpng: -- '1.6' -libraw: -- '0.21' -libtiff: -- '4.6' -libwebp: -- '1' -macos_machine: -- x86_64-apple-darwin13.4.0 -numpy: -- '1.22' -openexr: -- '3.2' -pin_run_as_build: - python: - min_pin: x.x - max_pin: x.x -python: -- 3.8.* *_cpython -target_platform: -- osx-64 -zip_keys: -- - python - - numpy -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 c79d6a3..3361a28 100644 --- a/.ci_support/osx_64_numpy1.22python3.9.____cpython.yaml +++ b/.ci_support/osx_64_numpy1.22python3.9.____cpython.yaml @@ -1,11 +1,11 @@ MACOSX_DEPLOYMENT_TARGET: -- '10.9' +- '10.13' MACOSX_SDK_VERSION: - '11.0' c_stdlib: - macosx_deployment_target c_stdlib_version: -- '10.9' +- '10.13' channel_sources: - conda-forge channel_targets: @@ -13,9 +13,9 @@ channel_targets: cxx_compiler: - clangxx cxx_compiler_version: -- '16' +- '18' ffmpeg: -- '6' +- '7' fmt: - '10' freetype: @@ -23,9 +23,11 @@ freetype: giflib: - '5.2' imath: -- 3.1.11 +- 3.1.12 libboost_devel: -- '1.84' +- '1.86' +libheif: +- '1.19' libjpeg_turbo: - '3' libpng: @@ -33,7 +35,7 @@ libpng: libraw: - '0.21' libtiff: -- '4.6' +- '4.7' libwebp: - '1' macos_machine: @@ -41,7 +43,7 @@ macos_machine: numpy: - '1.22' openexr: -- '3.2' +- '3.3' pin_run_as_build: python: min_pin: x.x @@ -50,8 +52,10 @@ python: - 3.9.* *_cpython target_platform: - osx-64 +tbb_devel: +- '2021' zip_keys: - - python - numpy zlib: -- '1.2' +- '1' diff --git a/.ci_support/osx_64_numpy1.23python3.11.____cpython.yaml b/.ci_support/osx_64_numpy1.23python3.11.____cpython.yaml index 3823509..ced2f11 100644 --- a/.ci_support/osx_64_numpy1.23python3.11.____cpython.yaml +++ b/.ci_support/osx_64_numpy1.23python3.11.____cpython.yaml @@ -1,11 +1,11 @@ MACOSX_DEPLOYMENT_TARGET: -- '10.9' +- '10.13' MACOSX_SDK_VERSION: - '11.0' c_stdlib: - macosx_deployment_target c_stdlib_version: -- '10.9' +- '10.13' channel_sources: - conda-forge channel_targets: @@ -13,9 +13,9 @@ channel_targets: cxx_compiler: - clangxx cxx_compiler_version: -- '16' +- '18' ffmpeg: -- '6' +- '7' fmt: - '10' freetype: @@ -23,9 +23,11 @@ freetype: giflib: - '5.2' imath: -- 3.1.11 +- 3.1.12 libboost_devel: -- '1.84' +- '1.86' +libheif: +- '1.19' libjpeg_turbo: - '3' libpng: @@ -33,7 +35,7 @@ libpng: libraw: - '0.21' libtiff: -- '4.6' +- '4.7' libwebp: - '1' macos_machine: @@ -41,7 +43,7 @@ macos_machine: numpy: - '1.23' openexr: -- '3.2' +- '3.3' pin_run_as_build: python: min_pin: x.x @@ -50,8 +52,10 @@ python: - 3.11.* *_cpython target_platform: - osx-64 +tbb_devel: +- '2021' zip_keys: - - python - numpy zlib: -- '1.2' +- '1' diff --git a/.ci_support/osx_64_numpy1.26python3.12.____cpython.yaml b/.ci_support/osx_64_numpy1.26python3.12.____cpython.yaml index 639c939..cabfa33 100644 --- a/.ci_support/osx_64_numpy1.26python3.12.____cpython.yaml +++ b/.ci_support/osx_64_numpy1.26python3.12.____cpython.yaml @@ -1,11 +1,11 @@ MACOSX_DEPLOYMENT_TARGET: -- '10.9' +- '10.13' MACOSX_SDK_VERSION: - '11.0' c_stdlib: - macosx_deployment_target c_stdlib_version: -- '10.9' +- '10.13' channel_sources: - conda-forge channel_targets: @@ -13,9 +13,9 @@ channel_targets: cxx_compiler: - clangxx cxx_compiler_version: -- '16' +- '18' ffmpeg: -- '6' +- '7' fmt: - '10' freetype: @@ -23,9 +23,11 @@ freetype: giflib: - '5.2' imath: -- 3.1.11 +- 3.1.12 libboost_devel: -- '1.84' +- '1.86' +libheif: +- '1.19' libjpeg_turbo: - '3' libpng: @@ -33,7 +35,7 @@ libpng: libraw: - '0.21' libtiff: -- '4.6' +- '4.7' libwebp: - '1' macos_machine: @@ -41,7 +43,7 @@ macos_machine: numpy: - '1.26' openexr: -- '3.2' +- '3.3' pin_run_as_build: python: min_pin: x.x @@ -50,8 +52,10 @@ python: - 3.12.* *_cpython target_platform: - osx-64 +tbb_devel: +- '2021' zip_keys: - - python - numpy zlib: -- '1.2' +- '1' diff --git a/.ci_support/osx_arm64_numpy1.22python3.10.____cpython.yaml b/.ci_support/osx_arm64_numpy1.22python3.10.____cpython.yaml index 936a741..c878f83 100644 --- a/.ci_support/osx_arm64_numpy1.22python3.10.____cpython.yaml +++ b/.ci_support/osx_arm64_numpy1.22python3.10.____cpython.yaml @@ -1,5 +1,7 @@ MACOSX_DEPLOYMENT_TARGET: - '11.0' +MACOSX_SDK_VERSION: +- '11.0' c_stdlib: - macosx_deployment_target c_stdlib_version: @@ -11,9 +13,9 @@ channel_targets: cxx_compiler: - clangxx cxx_compiler_version: -- '16' +- '18' ffmpeg: -- '6' +- '7' fmt: - '10' freetype: @@ -21,9 +23,11 @@ freetype: giflib: - '5.2' imath: -- 3.1.11 +- 3.1.12 libboost_devel: -- '1.84' +- '1.86' +libheif: +- '1.19' libjpeg_turbo: - '3' libpng: @@ -31,7 +35,7 @@ libpng: libraw: - '0.21' libtiff: -- '4.6' +- '4.7' libwebp: - '1' macos_machine: @@ -39,7 +43,7 @@ macos_machine: numpy: - '1.22' openexr: -- '3.2' +- '3.3' pin_run_as_build: python: min_pin: x.x @@ -48,8 +52,10 @@ python: - 3.10.* *_cpython target_platform: - osx-arm64 +tbb_devel: +- '2021' zip_keys: - - python - numpy zlib: -- '1.2' +- '1' diff --git a/.ci_support/osx_arm64_numpy1.22python3.8.____cpython.yaml b/.ci_support/osx_arm64_numpy1.22python3.8.____cpython.yaml deleted file mode 100644 index f760fc4..0000000 --- a/.ci_support/osx_arm64_numpy1.22python3.8.____cpython.yaml +++ /dev/null @@ -1,55 +0,0 @@ -MACOSX_DEPLOYMENT_TARGET: -- '11.0' -c_stdlib: -- macosx_deployment_target -c_stdlib_version: -- '11.0' -channel_sources: -- conda-forge -channel_targets: -- conda-forge main -cxx_compiler: -- clangxx -cxx_compiler_version: -- '16' -ffmpeg: -- '6' -fmt: -- '10' -freetype: -- '2' -giflib: -- '5.2' -imath: -- 3.1.11 -libboost_devel: -- '1.84' -libjpeg_turbo: -- '3' -libpng: -- '1.6' -libraw: -- '0.21' -libtiff: -- '4.6' -libwebp: -- '1' -macos_machine: -- arm64-apple-darwin20.0.0 -numpy: -- '1.22' -openexr: -- '3.2' -pin_run_as_build: - python: - min_pin: x.x - max_pin: x.x -python: -- 3.8.* *_cpython -target_platform: -- osx-arm64 -zip_keys: -- - python - - numpy -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 c2366ba..6b68385 100644 --- a/.ci_support/osx_arm64_numpy1.22python3.9.____cpython.yaml +++ b/.ci_support/osx_arm64_numpy1.22python3.9.____cpython.yaml @@ -1,5 +1,7 @@ MACOSX_DEPLOYMENT_TARGET: - '11.0' +MACOSX_SDK_VERSION: +- '11.0' c_stdlib: - macosx_deployment_target c_stdlib_version: @@ -11,9 +13,9 @@ channel_targets: cxx_compiler: - clangxx cxx_compiler_version: -- '16' +- '18' ffmpeg: -- '6' +- '7' fmt: - '10' freetype: @@ -21,9 +23,11 @@ freetype: giflib: - '5.2' imath: -- 3.1.11 +- 3.1.12 libboost_devel: -- '1.84' +- '1.86' +libheif: +- '1.19' libjpeg_turbo: - '3' libpng: @@ -31,7 +35,7 @@ libpng: libraw: - '0.21' libtiff: -- '4.6' +- '4.7' libwebp: - '1' macos_machine: @@ -39,7 +43,7 @@ macos_machine: numpy: - '1.22' openexr: -- '3.2' +- '3.3' pin_run_as_build: python: min_pin: x.x @@ -48,8 +52,10 @@ python: - 3.9.* *_cpython target_platform: - osx-arm64 +tbb_devel: +- '2021' zip_keys: - - python - numpy zlib: -- '1.2' +- '1' diff --git a/.ci_support/osx_arm64_numpy1.23python3.11.____cpython.yaml b/.ci_support/osx_arm64_numpy1.23python3.11.____cpython.yaml index 22f73b7..2f02331 100644 --- a/.ci_support/osx_arm64_numpy1.23python3.11.____cpython.yaml +++ b/.ci_support/osx_arm64_numpy1.23python3.11.____cpython.yaml @@ -1,5 +1,7 @@ MACOSX_DEPLOYMENT_TARGET: - '11.0' +MACOSX_SDK_VERSION: +- '11.0' c_stdlib: - macosx_deployment_target c_stdlib_version: @@ -11,9 +13,9 @@ channel_targets: cxx_compiler: - clangxx cxx_compiler_version: -- '16' +- '18' ffmpeg: -- '6' +- '7' fmt: - '10' freetype: @@ -21,9 +23,11 @@ freetype: giflib: - '5.2' imath: -- 3.1.11 +- 3.1.12 libboost_devel: -- '1.84' +- '1.86' +libheif: +- '1.19' libjpeg_turbo: - '3' libpng: @@ -31,7 +35,7 @@ libpng: libraw: - '0.21' libtiff: -- '4.6' +- '4.7' libwebp: - '1' macos_machine: @@ -39,7 +43,7 @@ macos_machine: numpy: - '1.23' openexr: -- '3.2' +- '3.3' pin_run_as_build: python: min_pin: x.x @@ -48,8 +52,10 @@ python: - 3.11.* *_cpython target_platform: - osx-arm64 +tbb_devel: +- '2021' zip_keys: - - python - numpy zlib: -- '1.2' +- '1' diff --git a/.ci_support/osx_arm64_numpy1.26python3.12.____cpython.yaml b/.ci_support/osx_arm64_numpy1.26python3.12.____cpython.yaml index 955828f..4d9f316 100644 --- a/.ci_support/osx_arm64_numpy1.26python3.12.____cpython.yaml +++ b/.ci_support/osx_arm64_numpy1.26python3.12.____cpython.yaml @@ -1,5 +1,7 @@ MACOSX_DEPLOYMENT_TARGET: - '11.0' +MACOSX_SDK_VERSION: +- '11.0' c_stdlib: - macosx_deployment_target c_stdlib_version: @@ -11,9 +13,9 @@ channel_targets: cxx_compiler: - clangxx cxx_compiler_version: -- '16' +- '18' ffmpeg: -- '6' +- '7' fmt: - '10' freetype: @@ -21,9 +23,11 @@ freetype: giflib: - '5.2' imath: -- 3.1.11 +- 3.1.12 libboost_devel: -- '1.84' +- '1.86' +libheif: +- '1.19' libjpeg_turbo: - '3' libpng: @@ -31,7 +35,7 @@ libpng: libraw: - '0.21' libtiff: -- '4.6' +- '4.7' libwebp: - '1' macos_machine: @@ -39,7 +43,7 @@ macos_machine: numpy: - '1.26' openexr: -- '3.2' +- '3.3' pin_run_as_build: python: min_pin: x.x @@ -48,8 +52,10 @@ python: - 3.12.* *_cpython target_platform: - osx-arm64 +tbb_devel: +- '2021' zip_keys: - - python - numpy zlib: -- '1.2' +- '1' diff --git a/.gitattributes b/.gitattributes index 7f32763..18f114a 100644 --- a/.gitattributes +++ b/.gitattributes @@ -20,8 +20,8 @@ bld.bat text eol=crlf .travis.yml linguist-generated=true .scripts/* linguist-generated=true .woodpecker.yml linguist-generated=true -LICENSE.txt linguist-generated=true -README.md linguist-generated=true +/LICENSE.txt linguist-generated=true +/README.md linguist-generated=true azure-pipelines.yml linguist-generated=true build-locally.py linguist-generated=true shippable.yml linguist-generated=true diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index 2bf121a..341aa8b 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -1 +1 @@ -* @JohanMabille @SylvainCorlay @lgritz @wolfv \ No newline at end of file +* @JohanMabille @SylvainCorlay @h-vetinari @lgritz @wolfv \ No newline at end of file diff --git a/.github/workflows/automerge.yml b/.github/workflows/automerge.yml deleted file mode 100644 index 0535f6a..0000000 --- a/.github/workflows/automerge.yml +++ /dev/null @@ -1,17 +0,0 @@ -on: - status: {} - check_suite: - types: - - completed - -jobs: - automerge-action: - runs-on: ubuntu-latest - name: automerge - steps: - - name: automerge-action - id: automerge-action - uses: conda-forge/automerge-action@main - with: - github_token: ${{ secrets.GITHUB_TOKEN }} - rerendering_github_token: ${{ secrets.RERENDERING_GITHUB_TOKEN }} diff --git a/.github/workflows/webservices.yml b/.github/workflows/webservices.yml deleted file mode 100644 index d6f06b5..0000000 --- a/.github/workflows/webservices.yml +++ /dev/null @@ -1,13 +0,0 @@ -on: repository_dispatch - -jobs: - webservices: - runs-on: ubuntu-latest - name: webservices - steps: - - name: webservices - id: webservices - uses: conda-forge/webservices-dispatch-action@main - with: - github_token: ${{ secrets.GITHUB_TOKEN }} - rerendering_github_token: ${{ secrets.RERENDERING_GITHUB_TOKEN }} diff --git a/.gitignore b/.gitignore index 179afe5..bb38536 100644 --- a/.gitignore +++ b/.gitignore @@ -22,3 +22,6 @@ /build_artifacts *.pyc + +# Rattler-build's artifacts are in `output` when not specifying anything. +/output diff --git a/.scripts/build_steps.sh b/.scripts/build_steps.sh index 899ba03..827a29f 100755 --- a/.scripts/build_steps.sh +++ b/.scripts/build_steps.sh @@ -31,18 +31,20 @@ pkgs_dirs: solver: libmamba CONDARC +mv /opt/conda/conda-meta/history /opt/conda/conda-meta/history.$(date +%Y-%m-%d-%H-%M-%S) +echo > /opt/conda/conda-meta/history +micromamba install --root-prefix ~/.conda --prefix /opt/conda \ + --yes --override-channels --channel conda-forge --strict-channel-priority \ + pip python=3.12 conda-build conda-forge-ci-setup=4 "conda-build>=24.1" export CONDA_LIBMAMBA_SOLVER_NO_CHANNELS_FROM_INSTALLED=1 -mamba install --update-specs --yes --quiet --channel conda-forge --strict-channel-priority \ - pip mamba conda-build conda-forge-ci-setup=4 "conda-build>=24.1" -mamba update --update-specs --yes --quiet --channel conda-forge --strict-channel-priority \ - pip mamba conda-build conda-forge-ci-setup=4 "conda-build>=24.1" - # set up the condarc setup_conda_rc "${FEEDSTOCK_ROOT}" "${RECIPE_ROOT}" "${CONFIG_FILE}" source run_conda_forge_build_setup + + # make the build number clobber make_build_number "${FEEDSTOCK_ROOT}" "${RECIPE_ROOT}" "${CONFIG_FILE}" @@ -72,6 +74,12 @@ else --suppress-variables ${EXTRA_CB_OPTIONS:-} \ --clobber-file "${CI_SUPPORT}/clobber_${CONFIG}.yaml" \ --extra-meta flow_run_id="${flow_run_id:-}" remote_url="${remote_url:-}" sha="${sha:-}" + ( startgroup "Inspecting artifacts" ) 2> /dev/null + + # inspect_artifacts was only added in conda-forge-ci-setup 4.9.4 + command -v inspect_artifacts >/dev/null 2>&1 && inspect_artifacts --recipe-dir "${RECIPE_ROOT}" -m "${CONFIG_FILE}" || echo "inspect_artifacts needs conda-forge-ci-setup >=4.9.4" + + ( endgroup "Inspecting artifacts" ) 2> /dev/null ( startgroup "Validating outputs" ) 2> /dev/null validate_recipe_outputs "${FEEDSTOCK_NAME}" diff --git a/.scripts/run_osx_build.sh b/.scripts/run_osx_build.sh index 07dff21..0e3c394 100755 --- a/.scripts/run_osx_build.sh +++ b/.scripts/run_osx_build.sh @@ -6,29 +6,41 @@ source .scripts/logging_utils.sh set -xe -MINIFORGE_HOME=${MINIFORGE_HOME:-${HOME}/miniforge3} - -( startgroup "Installing a fresh version of Miniforge" ) 2> /dev/null - -MINIFORGE_URL="https://github.com/conda-forge/miniforge/releases/latest/download" -MINIFORGE_FILE="Mambaforge-MacOSX-$(uname -m).sh" -curl -L -O "${MINIFORGE_URL}/${MINIFORGE_FILE}" -rm -rf ${MINIFORGE_HOME} -bash $MINIFORGE_FILE -b -p ${MINIFORGE_HOME} - -( endgroup "Installing a fresh version of Miniforge" ) 2> /dev/null +MINIFORGE_HOME="${MINIFORGE_HOME:-${HOME}/miniforge3}" +MINIFORGE_HOME="${MINIFORGE_HOME%/}" # remove trailing slash +export CONDA_BLD_PATH="${CONDA_BLD_PATH:-${MINIFORGE_HOME}/conda-bld}" + +( startgroup "Provisioning base env with micromamba" ) 2> /dev/null +MICROMAMBA_VERSION="1.5.10-0" +if [[ "$(uname -m)" == "arm64" ]]; then + osx_arch="osx-arm64" +else + osx_arch="osx-64" +fi +MICROMAMBA_URL="https://github.com/mamba-org/micromamba-releases/releases/download/${MICROMAMBA_VERSION}/micromamba-${osx_arch}" +MAMBA_ROOT_PREFIX="${MINIFORGE_HOME}-micromamba-$(date +%s)" +echo "Downloading micromamba ${MICROMAMBA_VERSION}" +micromamba_exe="$(mktemp -d)/micromamba" +curl -L -o "${micromamba_exe}" "${MICROMAMBA_URL}" +chmod +x "${micromamba_exe}" +echo "Creating environment" +"${micromamba_exe}" create --yes --root-prefix "${MAMBA_ROOT_PREFIX}" --prefix "${MINIFORGE_HOME}" \ + --channel conda-forge \ + pip python=3.12 conda-build conda-forge-ci-setup=4 "conda-build>=24.1" +echo "Moving pkgs cache from ${MAMBA_ROOT_PREFIX} to ${MINIFORGE_HOME}" +mv "${MAMBA_ROOT_PREFIX}/pkgs" "${MINIFORGE_HOME}" +echo "Cleaning up micromamba" +rm -rf "${MAMBA_ROOT_PREFIX}" "${micromamba_exe}" || true +( endgroup "Provisioning base env with micromamba" ) 2> /dev/null ( startgroup "Configuring conda" ) 2> /dev/null - -source ${MINIFORGE_HOME}/etc/profile.d/conda.sh +echo "Activating environment" +source "${MINIFORGE_HOME}/etc/profile.d/conda.sh" conda activate base export CONDA_SOLVER="libmamba" export CONDA_LIBMAMBA_SOLVER_NO_CHANNELS_FROM_INSTALLED=1 -mamba install --update-specs --quiet --yes --channel conda-forge --strict-channel-priority \ - pip mamba conda-build conda-forge-ci-setup=4 "conda-build>=24.1" -mamba update --update-specs --yes --quiet --channel conda-forge --strict-channel-priority \ - pip mamba conda-build conda-forge-ci-setup=4 "conda-build>=24.1" + @@ -85,6 +97,13 @@ else --suppress-variables ${EXTRA_CB_OPTIONS:-} \ --clobber-file ./.ci_support/clobber_${CONFIG}.yaml \ --extra-meta flow_run_id="$flow_run_id" remote_url="$remote_url" sha="$sha" + + ( startgroup "Inspecting artifacts" ) 2> /dev/null + + # inspect_artifacts was only added in conda-forge-ci-setup 4.9.4 + command -v inspect_artifacts >/dev/null 2>&1 && inspect_artifacts --recipe-dir ./recipe -m ./.ci_support/${CONFIG}.yaml || echo "inspect_artifacts needs conda-forge-ci-setup >=4.9.4" + + ( endgroup "Inspecting artifacts" ) 2> /dev/null ( startgroup "Validating outputs" ) 2> /dev/null validate_recipe_outputs "${FEEDSTOCK_NAME}" diff --git a/README.md b/README.md index 87f8f81..e0e74a6 100644 --- a/README.md +++ b/README.md @@ -50,13 +50,6 @@ Current build status variant - - linux_64_numpy1.22python3.8.____cpython - - - variant - - linux_64_numpy1.22python3.9.____cpython @@ -85,13 +78,6 @@ Current build status variant - - linux_aarch64_numpy1.22python3.8.____cpython - - - variant - - linux_aarch64_numpy1.22python3.9.____cpython @@ -120,13 +106,6 @@ Current build status variant - - linux_ppc64le_numpy1.22python3.8.____cpython - - - variant - - linux_ppc64le_numpy1.22python3.9.____cpython @@ -155,13 +134,6 @@ Current build status variant - - osx_64_numpy1.22python3.8.____cpython - - - variant - - osx_64_numpy1.22python3.9.____cpython @@ -190,13 +162,6 @@ Current build status variant - - osx_arm64_numpy1.22python3.8.____cpython - - - variant - - osx_arm64_numpy1.22python3.9.____cpython @@ -350,6 +315,7 @@ Feedstock Maintainers * [@JohanMabille](https://github.com/JohanMabille/) * [@SylvainCorlay](https://github.com/SylvainCorlay/) +* [@h-vetinari](https://github.com/h-vetinari/) * [@lgritz](https://github.com/lgritz/) * [@wolfv](https://github.com/wolfv/) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 33a441c..013bdc1 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -2,6 +2,31 @@ # update the conda-forge.yml and/or the recipe/meta.yaml. # -*- mode: yaml -*- -jobs: - - template: ./.azure-pipelines/azure-pipelines-linux.yml - - template: ./.azure-pipelines/azure-pipelines-osx.yml \ No newline at end of file +stages: +- stage: Check + jobs: + - job: Skip + pool: + vmImage: 'ubuntu-22.04' + variables: + DECODE_PERCENTS: 'false' + RET: 'true' + steps: + - checkout: self + fetchDepth: '2' + - bash: | + git_log=`git log --max-count=1 --skip=1 --pretty=format:"%B" | tr "\n" " "` + echo "##vso[task.setvariable variable=log]$git_log" + displayName: Obtain commit message + - bash: echo "##vso[task.setvariable variable=RET]false" + condition: and(eq(variables['Build.Reason'], 'PullRequest'), or(contains(variables.log, '[skip azp]'), contains(variables.log, '[azp skip]'), contains(variables.log, '[skip ci]'), contains(variables.log, '[ci skip]'))) + displayName: Skip build? + - bash: echo "##vso[task.setvariable variable=start_main;isOutput=true]$RET" + name: result + displayName: Export result +- stage: Build + condition: and(succeeded(), eq(dependencies.Check.outputs['Skip.result.start_main'], 'true')) + dependsOn: Check + jobs: + - template: ./.azure-pipelines/azure-pipelines-linux.yml + - template: ./.azure-pipelines/azure-pipelines-osx.yml \ No newline at end of file diff --git a/build-locally.py b/build-locally.py index e0d408d..c4a56c6 100755 --- a/build-locally.py +++ b/build-locally.py @@ -1,13 +1,16 @@ -#!/usr/bin/env python3 +#!/bin/sh +"""exec" "python3" "$0" "$@" #""" # fmt: off # fmt: on # # This file has been generated by conda-smithy in order to build the recipe # locally. # -import os +# The line above this comment is a bash / sh / zsh guard +# to stop people from running it with the wrong interpreter import glob +import os +import platform import subprocess from argparse import ArgumentParser -import platform def setup_environment(ns): @@ -23,6 +26,13 @@ def setup_environment(ns): os.path.dirname(__file__), "miniforge3" ) + # The default cache location might not be writable using docker on macOS. + if ns.config.startswith("linux") and platform.system() == "Darwin": + os.environ["CONDA_FORGE_DOCKER_RUN_ARGS"] = ( + os.environ.get("CONDA_FORGE_DOCKER_RUN_ARGS", "") + + " -e RATTLER_CACHE_DIR=/tmp/rattler_cache" + ) + def run_docker_build(ns): script = ".scripts/run_docker_build.sh" diff --git a/recipe/build.sh b/recipe/build.sh index cb3faa5..0d7b414 100755 --- a/recipe/build.sh +++ b/recipe/build.sh @@ -1,4 +1,5 @@ #!/bin/bash +set -ex export CXXFLAGS="$CXXFLAGS -DGIFLIB_MAJOR=5" @@ -22,7 +23,8 @@ else Python_EXECUTABLE=${PYTHON} fi -cmake ${CMAKE_ARGS} \ +cmake -G Ninja \ + ${CMAKE_ARGS} \ -DUSE_FFMPEG=ON \ -DOIIO_BUILD_TOOLS=OFF \ -DOIIO_BUILD_TESTS=OFF \ @@ -35,6 +37,7 @@ cmake ${CMAKE_ARGS} \ -DINTERNALIZE_FMT=OFF \ .. -make all -j${CPU_COUNT} +# Do not install, only build. +cmake --build . --config Release popd diff --git a/recipe/install_lib.sh b/recipe/install_lib.sh index d9cc53c..bb04470 100644 --- a/recipe/install_lib.sh +++ b/recipe/install_lib.sh @@ -1,5 +1,7 @@ -cd build; -make install -j${CPU_COUNT}; +#!/bin/bash +set -ex + +cmake --install ./build --prefix=$PREFIX # remove python stuff from here. -rm -rf $PREFIX/lib/python* \ No newline at end of file +rm -rf $SP_DIR/OpenImageIO diff --git a/recipe/install_python.sh b/recipe/install_python.sh index e0f5437..e435888 100644 --- a/recipe/install_python.sh +++ b/recipe/install_python.sh @@ -1,4 +1,4 @@ -cd build -make install -j${CPU_COUNT} +#!/bin/bash +set -ex -# $PYTHON $RECIPE_DIR/clean_python.py \ No newline at end of file +cmake --install ./build --prefix=$PREFIX diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 6137dd7..cdb0a44 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -1,18 +1,16 @@ -{% set version = "2.5.9.0" %} +{% set version = "2.5.18.0" %} package: - name: openimageio + name: openimageio-split version: {{ version }} source: url: https://github.com/OpenImageIO/oiio/archive/refs/tags/v{{ version }}.tar.gz - sha256: b6a68e369bc475525eb843bdc0cb8adc910cc71000825f8db9b5e136166cdc78 + sha256: f57481435cec18633d3eba9b2e8c483fc1df6f0a01c5c9f98cbae6d1c52928e5 build: - number: 1 + number: 0 skip: true # [win] - run_exports: - - {{ pin_subpackage('openimageio', max_pin='x.x') }} requirements: build: @@ -20,32 +18,66 @@ requirements: - cross-python_{{ target_platform }} # [build_platform != target_platform] - pybind11 # [build_platform != target_platform] - numpy # [build_platform != target_platform] - - cmake - - {{ compiler('cxx') }} - {{ stdlib("c") }} - - make # [unix] + - {{ compiler("cxx") }} + - cmake + - ninja host: - python - numpy - pybind11 - - libboost-devel - ffmpeg + - fmt - freetype - giflib - imath + - libboost-devel + - libheif - libjpeg-turbo - libpng + - libraw - libtiff - libwebp - openexr - - libraw - - zlib - - fmt + - openjpeg + - tbb-devel - tsl_robin_map + - zlib outputs: - name: openimageio script: install_lib.sh + build: + run_exports: + - {{ pin_subpackage('openimageio', max_pin='x.x') }} + requirements: + build: + # for strong run-exports + - {{ stdlib("c") }} + - {{ compiler("cxx") }} + - cmake + - ninja + host: + - python + - numpy + - pybind11 + - ffmpeg + - fmt + - freetype + - giflib + - imath + - libboost-devel + - libheif + - libjpeg-turbo + - libpng + - libraw + - libtiff + - libwebp + - openexr + - openjpeg + - tbb-devel + - tsl_robin_map + - zlib test: commands: - test -d ${PREFIX}/include/OpenImageIO # [unix] @@ -61,23 +93,15 @@ outputs: - cross-python_{{ target_platform }} # [build_platform != target_platform] - pybind11 # [build_platform != target_platform] - numpy # [build_platform != target_platform] - - cmake - - {{ compiler('cxx') }} + # for strong run-exports - {{ stdlib("c") }} - - make # [unix] + - {{ compiler("cxx") }} + - cmake + - ninja host: - {{ pin_subpackage('openimageio', exact=True) }} - - python - - numpy - - pybind11 - - libboost-headers - - imath - - fmt - - tsl_robin_map run: - {{ pin_subpackage('openimageio', exact=True) }} - - {{ pin_compatible('numpy') }} - - python test: imports: - OpenImageIO @@ -111,3 +135,5 @@ extra: - JohanMabille - wolfv - lgritz + - h-vetinari + feedstock-name: openimageio