diff --git a/.azure-pipelines/azure-pipelines-osx.yml b/.azure-pipelines/azure-pipelines-osx.yml index 16c1bc2..8f00930 100755 --- a/.azure-pipelines/azure-pipelines-osx.yml +++ b/.azure-pipelines/azure-pipelines-osx.yml @@ -5,7 +5,7 @@ jobs: - job: osx pool: - vmImage: macOS-12 + vmImage: macOS-13 strategy: matrix: osx_64_python3.10.____cpython: diff --git a/.ci_support/linux_64_python3.10.____cpython.yaml b/.ci_support/linux_64_python3.10.____cpython.yaml index bf29ee1..0c23ad4 100644 --- a/.ci_support/linux_64_python3.10.____cpython.yaml +++ b/.ci_support/linux_64_python3.10.____cpython.yaml @@ -16,16 +16,18 @@ docker_image: - quay.io/condaforge/linux-anvil-cos7-x86_64 freetype: - '2' +jpeg: +- '9' lcms2: - '2' libjpeg_turbo: - '3' libtiff: -- '4.6' +- '4.7' libwebp: - '1' libxcb: -- '1.16' +- '1' openjpeg: - '2' pin_run_as_build: @@ -45,6 +47,5 @@ zip_keys: - cdt_name - - python - python_impl - - channel_sources zlib: - '1' diff --git a/.ci_support/linux_64_python3.11.____cpython.yaml b/.ci_support/linux_64_python3.11.____cpython.yaml index 81eac82..0997ee9 100644 --- a/.ci_support/linux_64_python3.11.____cpython.yaml +++ b/.ci_support/linux_64_python3.11.____cpython.yaml @@ -16,16 +16,18 @@ docker_image: - quay.io/condaforge/linux-anvil-cos7-x86_64 freetype: - '2' +jpeg: +- '9' lcms2: - '2' libjpeg_turbo: - '3' libtiff: -- '4.6' +- '4.7' libwebp: - '1' libxcb: -- '1.16' +- '1' openjpeg: - '2' pin_run_as_build: @@ -45,6 +47,5 @@ zip_keys: - cdt_name - - python - python_impl - - channel_sources zlib: - '1' diff --git a/.ci_support/linux_64_python3.12.____cpython.yaml b/.ci_support/linux_64_python3.12.____cpython.yaml index 0ce8ce2..ff2cc02 100644 --- a/.ci_support/linux_64_python3.12.____cpython.yaml +++ b/.ci_support/linux_64_python3.12.____cpython.yaml @@ -16,16 +16,18 @@ docker_image: - quay.io/condaforge/linux-anvil-cos7-x86_64 freetype: - '2' +jpeg: +- '9' lcms2: - '2' libjpeg_turbo: - '3' libtiff: -- '4.6' +- '4.7' libwebp: - '1' libxcb: -- '1.16' +- '1' openjpeg: - '2' pin_run_as_build: @@ -45,6 +47,5 @@ zip_keys: - cdt_name - - python - python_impl - - channel_sources zlib: - '1' diff --git a/.ci_support/linux_64_python3.13.____cp313.yaml b/.ci_support/linux_64_python3.13.____cp313.yaml index 772d0e5..41b8988 100644 --- a/.ci_support/linux_64_python3.13.____cp313.yaml +++ b/.ci_support/linux_64_python3.13.____cp313.yaml @@ -9,23 +9,25 @@ c_stdlib_version: cdt_name: - cos7 channel_sources: -- conda-forge/label/python_rc,conda-forge +- conda-forge channel_targets: - conda-forge main docker_image: - quay.io/condaforge/linux-anvil-cos7-x86_64 freetype: - '2' +jpeg: +- '9' lcms2: - '2' libjpeg_turbo: - '3' libtiff: -- '4.6' +- '4.7' libwebp: - '1' libxcb: -- '1.16' +- '1' openjpeg: - '2' pin_run_as_build: @@ -45,6 +47,5 @@ zip_keys: - cdt_name - - python - python_impl - - channel_sources zlib: - '1' diff --git a/.ci_support/linux_64_python3.9.____cpython.yaml b/.ci_support/linux_64_python3.9.____cpython.yaml index fba6bfc..eab230e 100644 --- a/.ci_support/linux_64_python3.9.____cpython.yaml +++ b/.ci_support/linux_64_python3.9.____cpython.yaml @@ -16,16 +16,18 @@ docker_image: - quay.io/condaforge/linux-anvil-cos7-x86_64 freetype: - '2' +jpeg: +- '9' lcms2: - '2' libjpeg_turbo: - '3' libtiff: -- '4.6' +- '4.7' libwebp: - '1' libxcb: -- '1.16' +- '1' openjpeg: - '2' pin_run_as_build: @@ -45,6 +47,5 @@ zip_keys: - cdt_name - - python - python_impl - - channel_sources zlib: - '1' diff --git a/.ci_support/linux_aarch64_python3.10.____cpython.yaml b/.ci_support/linux_aarch64_python3.10.____cpython.yaml index 02cc232..557c6e5 100644 --- a/.ci_support/linux_aarch64_python3.10.____cpython.yaml +++ b/.ci_support/linux_aarch64_python3.10.____cpython.yaml @@ -20,16 +20,18 @@ docker_image: - quay.io/condaforge/linux-anvil-aarch64 freetype: - '2' +jpeg: +- '9' lcms2: - '2' libjpeg_turbo: - '3' libtiff: -- '4.6' +- '4.7' libwebp: - '1' libxcb: -- '1.16' +- '1' openjpeg: - '2' pin_run_as_build: @@ -49,6 +51,5 @@ zip_keys: - cdt_name - - python - python_impl - - channel_sources zlib: - '1' diff --git a/.ci_support/linux_aarch64_python3.11.____cpython.yaml b/.ci_support/linux_aarch64_python3.11.____cpython.yaml index d2cfd73..bf7428c 100644 --- a/.ci_support/linux_aarch64_python3.11.____cpython.yaml +++ b/.ci_support/linux_aarch64_python3.11.____cpython.yaml @@ -20,16 +20,18 @@ docker_image: - quay.io/condaforge/linux-anvil-aarch64 freetype: - '2' +jpeg: +- '9' lcms2: - '2' libjpeg_turbo: - '3' libtiff: -- '4.6' +- '4.7' libwebp: - '1' libxcb: -- '1.16' +- '1' openjpeg: - '2' pin_run_as_build: @@ -49,6 +51,5 @@ zip_keys: - cdt_name - - python - python_impl - - channel_sources zlib: - '1' diff --git a/.ci_support/linux_aarch64_python3.12.____cpython.yaml b/.ci_support/linux_aarch64_python3.12.____cpython.yaml index 57d6d62..7a6816a 100644 --- a/.ci_support/linux_aarch64_python3.12.____cpython.yaml +++ b/.ci_support/linux_aarch64_python3.12.____cpython.yaml @@ -20,16 +20,18 @@ docker_image: - quay.io/condaforge/linux-anvil-aarch64 freetype: - '2' +jpeg: +- '9' lcms2: - '2' libjpeg_turbo: - '3' libtiff: -- '4.6' +- '4.7' libwebp: - '1' libxcb: -- '1.16' +- '1' openjpeg: - '2' pin_run_as_build: @@ -49,6 +51,5 @@ zip_keys: - cdt_name - - python - python_impl - - channel_sources zlib: - '1' diff --git a/.ci_support/linux_aarch64_python3.13.____cp313.yaml b/.ci_support/linux_aarch64_python3.13.____cp313.yaml index 7800734..1ef1815 100644 --- a/.ci_support/linux_aarch64_python3.13.____cp313.yaml +++ b/.ci_support/linux_aarch64_python3.13.____cp313.yaml @@ -13,23 +13,25 @@ cdt_arch: cdt_name: - cos7 channel_sources: -- conda-forge/label/python_rc,conda-forge +- conda-forge channel_targets: - conda-forge main docker_image: - quay.io/condaforge/linux-anvil-aarch64 freetype: - '2' +jpeg: +- '9' lcms2: - '2' libjpeg_turbo: - '3' libtiff: -- '4.6' +- '4.7' libwebp: - '1' libxcb: -- '1.16' +- '1' openjpeg: - '2' pin_run_as_build: @@ -49,6 +51,5 @@ zip_keys: - cdt_name - - python - python_impl - - channel_sources zlib: - '1' diff --git a/.ci_support/linux_aarch64_python3.9.____cpython.yaml b/.ci_support/linux_aarch64_python3.9.____cpython.yaml index d8d2e81..6907a15 100644 --- a/.ci_support/linux_aarch64_python3.9.____cpython.yaml +++ b/.ci_support/linux_aarch64_python3.9.____cpython.yaml @@ -20,16 +20,18 @@ docker_image: - quay.io/condaforge/linux-anvil-aarch64 freetype: - '2' +jpeg: +- '9' lcms2: - '2' libjpeg_turbo: - '3' libtiff: -- '4.6' +- '4.7' libwebp: - '1' libxcb: -- '1.16' +- '1' openjpeg: - '2' pin_run_as_build: @@ -49,6 +51,5 @@ zip_keys: - cdt_name - - python - python_impl - - channel_sources zlib: - '1' diff --git a/.ci_support/linux_ppc64le_python3.10.____cpython.yaml b/.ci_support/linux_ppc64le_python3.10.____cpython.yaml index 857d298..7e9c08c 100644 --- a/.ci_support/linux_ppc64le_python3.10.____cpython.yaml +++ b/.ci_support/linux_ppc64le_python3.10.____cpython.yaml @@ -16,16 +16,18 @@ docker_image: - quay.io/condaforge/linux-anvil-ppc64le freetype: - '2' +jpeg: +- '9' lcms2: - '2' libjpeg_turbo: - '3' libtiff: -- '4.6' +- '4.7' libwebp: - '1' libxcb: -- '1.16' +- '1' openjpeg: - '2' pin_run_as_build: @@ -43,6 +45,5 @@ zip_keys: - cdt_name - - python - python_impl - - channel_sources zlib: - '1' diff --git a/.ci_support/linux_ppc64le_python3.11.____cpython.yaml b/.ci_support/linux_ppc64le_python3.11.____cpython.yaml index 6226376..2f56e69 100644 --- a/.ci_support/linux_ppc64le_python3.11.____cpython.yaml +++ b/.ci_support/linux_ppc64le_python3.11.____cpython.yaml @@ -16,16 +16,18 @@ docker_image: - quay.io/condaforge/linux-anvil-ppc64le freetype: - '2' +jpeg: +- '9' lcms2: - '2' libjpeg_turbo: - '3' libtiff: -- '4.6' +- '4.7' libwebp: - '1' libxcb: -- '1.16' +- '1' openjpeg: - '2' pin_run_as_build: @@ -43,6 +45,5 @@ zip_keys: - cdt_name - - python - python_impl - - channel_sources zlib: - '1' diff --git a/.ci_support/linux_ppc64le_python3.12.____cpython.yaml b/.ci_support/linux_ppc64le_python3.12.____cpython.yaml index f4c6202..7b5602e 100644 --- a/.ci_support/linux_ppc64le_python3.12.____cpython.yaml +++ b/.ci_support/linux_ppc64le_python3.12.____cpython.yaml @@ -16,16 +16,18 @@ docker_image: - quay.io/condaforge/linux-anvil-ppc64le freetype: - '2' +jpeg: +- '9' lcms2: - '2' libjpeg_turbo: - '3' libtiff: -- '4.6' +- '4.7' libwebp: - '1' libxcb: -- '1.16' +- '1' openjpeg: - '2' pin_run_as_build: @@ -43,6 +45,5 @@ zip_keys: - cdt_name - - python - python_impl - - channel_sources zlib: - '1' diff --git a/.ci_support/linux_ppc64le_python3.13.____cp313.yaml b/.ci_support/linux_ppc64le_python3.13.____cp313.yaml index a4b4934..3f26a1b 100644 --- a/.ci_support/linux_ppc64le_python3.13.____cp313.yaml +++ b/.ci_support/linux_ppc64le_python3.13.____cp313.yaml @@ -9,23 +9,25 @@ c_stdlib_version: cdt_name: - cos7 channel_sources: -- conda-forge/label/python_rc,conda-forge +- conda-forge channel_targets: - conda-forge main docker_image: - quay.io/condaforge/linux-anvil-ppc64le freetype: - '2' +jpeg: +- '9' lcms2: - '2' libjpeg_turbo: - '3' libtiff: -- '4.6' +- '4.7' libwebp: - '1' libxcb: -- '1.16' +- '1' openjpeg: - '2' pin_run_as_build: @@ -43,6 +45,5 @@ zip_keys: - cdt_name - - python - python_impl - - channel_sources zlib: - '1' diff --git a/.ci_support/linux_ppc64le_python3.9.____cpython.yaml b/.ci_support/linux_ppc64le_python3.9.____cpython.yaml index f42aced..09e9d2d 100644 --- a/.ci_support/linux_ppc64le_python3.9.____cpython.yaml +++ b/.ci_support/linux_ppc64le_python3.9.____cpython.yaml @@ -16,16 +16,18 @@ docker_image: - quay.io/condaforge/linux-anvil-ppc64le freetype: - '2' +jpeg: +- '9' lcms2: - '2' libjpeg_turbo: - '3' libtiff: -- '4.6' +- '4.7' libwebp: - '1' libxcb: -- '1.16' +- '1' openjpeg: - '2' pin_run_as_build: @@ -43,6 +45,5 @@ zip_keys: - cdt_name - - python - python_impl - - channel_sources zlib: - '1' diff --git a/.ci_support/osx_64_python3.10.____cpython.yaml b/.ci_support/osx_64_python3.10.____cpython.yaml index 166ff79..7f372ec 100644 --- a/.ci_support/osx_64_python3.10.____cpython.yaml +++ b/.ci_support/osx_64_python3.10.____cpython.yaml @@ -21,11 +21,11 @@ lcms2: libjpeg_turbo: - '3' libtiff: -- '4.6' +- '4.7' libwebp: - '1' libxcb: -- '1.16' +- '1' macos_machine: - x86_64-apple-darwin13.4.0 openjpeg: @@ -45,6 +45,5 @@ tk: zip_keys: - - python - python_impl - - channel_sources zlib: - '1' diff --git a/.ci_support/osx_64_python3.11.____cpython.yaml b/.ci_support/osx_64_python3.11.____cpython.yaml index 08f718f..95caa42 100644 --- a/.ci_support/osx_64_python3.11.____cpython.yaml +++ b/.ci_support/osx_64_python3.11.____cpython.yaml @@ -21,11 +21,11 @@ lcms2: libjpeg_turbo: - '3' libtiff: -- '4.6' +- '4.7' libwebp: - '1' libxcb: -- '1.16' +- '1' macos_machine: - x86_64-apple-darwin13.4.0 openjpeg: @@ -45,6 +45,5 @@ tk: zip_keys: - - python - python_impl - - channel_sources zlib: - '1' diff --git a/.ci_support/osx_64_python3.12.____cpython.yaml b/.ci_support/osx_64_python3.12.____cpython.yaml index c1abc95..93761d0 100644 --- a/.ci_support/osx_64_python3.12.____cpython.yaml +++ b/.ci_support/osx_64_python3.12.____cpython.yaml @@ -21,11 +21,11 @@ lcms2: libjpeg_turbo: - '3' libtiff: -- '4.6' +- '4.7' libwebp: - '1' libxcb: -- '1.16' +- '1' macos_machine: - x86_64-apple-darwin13.4.0 openjpeg: @@ -45,6 +45,5 @@ tk: zip_keys: - - python - python_impl - - channel_sources zlib: - '1' diff --git a/.ci_support/osx_64_python3.13.____cp313.yaml b/.ci_support/osx_64_python3.13.____cp313.yaml index 1368632..b3899f8 100644 --- a/.ci_support/osx_64_python3.13.____cp313.yaml +++ b/.ci_support/osx_64_python3.13.____cp313.yaml @@ -11,7 +11,7 @@ c_stdlib: c_stdlib_version: - '10.13' channel_sources: -- conda-forge/label/python_rc,conda-forge +- conda-forge channel_targets: - conda-forge main freetype: @@ -21,11 +21,11 @@ lcms2: libjpeg_turbo: - '3' libtiff: -- '4.6' +- '4.7' libwebp: - '1' libxcb: -- '1.16' +- '1' macos_machine: - x86_64-apple-darwin13.4.0 openjpeg: @@ -45,6 +45,5 @@ tk: zip_keys: - - python - python_impl - - channel_sources zlib: - '1' diff --git a/.ci_support/osx_64_python3.9.____cpython.yaml b/.ci_support/osx_64_python3.9.____cpython.yaml index 2efe7e9..2a48efc 100644 --- a/.ci_support/osx_64_python3.9.____cpython.yaml +++ b/.ci_support/osx_64_python3.9.____cpython.yaml @@ -21,11 +21,11 @@ lcms2: libjpeg_turbo: - '3' libtiff: -- '4.6' +- '4.7' libwebp: - '1' libxcb: -- '1.16' +- '1' macos_machine: - x86_64-apple-darwin13.4.0 openjpeg: @@ -45,6 +45,5 @@ tk: zip_keys: - - python - python_impl - - channel_sources zlib: - '1' diff --git a/.ci_support/osx_arm64_python3.10.____cpython.yaml b/.ci_support/osx_arm64_python3.10.____cpython.yaml index 5067daa..14f3675 100644 --- a/.ci_support/osx_arm64_python3.10.____cpython.yaml +++ b/.ci_support/osx_arm64_python3.10.____cpython.yaml @@ -21,11 +21,11 @@ lcms2: libjpeg_turbo: - '3' libtiff: -- '4.6' +- '4.7' libwebp: - '1' libxcb: -- '1.16' +- '1' macos_machine: - arm64-apple-darwin20.0.0 openjpeg: @@ -45,6 +45,5 @@ tk: zip_keys: - - python - python_impl - - channel_sources zlib: - '1' diff --git a/.ci_support/osx_arm64_python3.11.____cpython.yaml b/.ci_support/osx_arm64_python3.11.____cpython.yaml index 0d21562..9f7efb4 100644 --- a/.ci_support/osx_arm64_python3.11.____cpython.yaml +++ b/.ci_support/osx_arm64_python3.11.____cpython.yaml @@ -21,11 +21,11 @@ lcms2: libjpeg_turbo: - '3' libtiff: -- '4.6' +- '4.7' libwebp: - '1' libxcb: -- '1.16' +- '1' macos_machine: - arm64-apple-darwin20.0.0 openjpeg: @@ -45,6 +45,5 @@ tk: zip_keys: - - python - python_impl - - channel_sources zlib: - '1' diff --git a/.ci_support/osx_arm64_python3.12.____cpython.yaml b/.ci_support/osx_arm64_python3.12.____cpython.yaml index a0c4f48..9913c3c 100644 --- a/.ci_support/osx_arm64_python3.12.____cpython.yaml +++ b/.ci_support/osx_arm64_python3.12.____cpython.yaml @@ -21,11 +21,11 @@ lcms2: libjpeg_turbo: - '3' libtiff: -- '4.6' +- '4.7' libwebp: - '1' libxcb: -- '1.16' +- '1' macos_machine: - arm64-apple-darwin20.0.0 openjpeg: @@ -45,6 +45,5 @@ tk: zip_keys: - - python - python_impl - - channel_sources zlib: - '1' diff --git a/.ci_support/osx_arm64_python3.13.____cp313.yaml b/.ci_support/osx_arm64_python3.13.____cp313.yaml index cdc23d8..17d4547 100644 --- a/.ci_support/osx_arm64_python3.13.____cp313.yaml +++ b/.ci_support/osx_arm64_python3.13.____cp313.yaml @@ -11,7 +11,7 @@ c_stdlib: c_stdlib_version: - '11.0' channel_sources: -- conda-forge/label/python_rc,conda-forge +- conda-forge channel_targets: - conda-forge main freetype: @@ -21,11 +21,11 @@ lcms2: libjpeg_turbo: - '3' libtiff: -- '4.6' +- '4.7' libwebp: - '1' libxcb: -- '1.16' +- '1' macos_machine: - arm64-apple-darwin20.0.0 openjpeg: @@ -45,6 +45,5 @@ tk: zip_keys: - - python - python_impl - - channel_sources zlib: - '1' diff --git a/.ci_support/osx_arm64_python3.9.____cpython.yaml b/.ci_support/osx_arm64_python3.9.____cpython.yaml index 2d76330..8dd745b 100644 --- a/.ci_support/osx_arm64_python3.9.____cpython.yaml +++ b/.ci_support/osx_arm64_python3.9.____cpython.yaml @@ -21,11 +21,11 @@ lcms2: libjpeg_turbo: - '3' libtiff: -- '4.6' +- '4.7' libwebp: - '1' libxcb: -- '1.16' +- '1' macos_machine: - arm64-apple-darwin20.0.0 openjpeg: @@ -45,6 +45,5 @@ tk: zip_keys: - - python - python_impl - - channel_sources zlib: - '1' diff --git a/.ci_support/win_64_python3.10.____cpython.yaml b/.ci_support/win_64_python3.10.____cpython.yaml index a6e24cd..f7862f3 100644 --- a/.ci_support/win_64_python3.10.____cpython.yaml +++ b/.ci_support/win_64_python3.10.____cpython.yaml @@ -8,16 +8,18 @@ channel_targets: - conda-forge main freetype: - '2' +jpeg: +- '9' lcms2: - '2' libjpeg_turbo: - '3' libtiff: -- '4.6' +- '4.7' libwebp: - '1' libxcb: -- '1.16' +- '1' openjpeg: - '2' pin_run_as_build: @@ -35,6 +37,5 @@ tk: zip_keys: - - python - python_impl - - channel_sources zlib: - '1' diff --git a/.ci_support/win_64_python3.11.____cpython.yaml b/.ci_support/win_64_python3.11.____cpython.yaml index 3ef58e1..644c295 100644 --- a/.ci_support/win_64_python3.11.____cpython.yaml +++ b/.ci_support/win_64_python3.11.____cpython.yaml @@ -8,16 +8,18 @@ channel_targets: - conda-forge main freetype: - '2' +jpeg: +- '9' lcms2: - '2' libjpeg_turbo: - '3' libtiff: -- '4.6' +- '4.7' libwebp: - '1' libxcb: -- '1.16' +- '1' openjpeg: - '2' pin_run_as_build: @@ -35,6 +37,5 @@ tk: zip_keys: - - python - python_impl - - channel_sources zlib: - '1' diff --git a/.ci_support/win_64_python3.12.____cpython.yaml b/.ci_support/win_64_python3.12.____cpython.yaml index 003f524..fd53b5d 100644 --- a/.ci_support/win_64_python3.12.____cpython.yaml +++ b/.ci_support/win_64_python3.12.____cpython.yaml @@ -8,16 +8,18 @@ channel_targets: - conda-forge main freetype: - '2' +jpeg: +- '9' lcms2: - '2' libjpeg_turbo: - '3' libtiff: -- '4.6' +- '4.7' libwebp: - '1' libxcb: -- '1.16' +- '1' openjpeg: - '2' pin_run_as_build: @@ -35,6 +37,5 @@ tk: zip_keys: - - python - python_impl - - channel_sources zlib: - '1' diff --git a/.ci_support/win_64_python3.13.____cp313.yaml b/.ci_support/win_64_python3.13.____cp313.yaml index 709299e..b4618a5 100644 --- a/.ci_support/win_64_python3.13.____cp313.yaml +++ b/.ci_support/win_64_python3.13.____cp313.yaml @@ -3,21 +3,23 @@ c_compiler: c_stdlib: - vs channel_sources: -- conda-forge/label/python_rc,conda-forge +- conda-forge channel_targets: - conda-forge main freetype: - '2' +jpeg: +- '9' lcms2: - '2' libjpeg_turbo: - '3' libtiff: -- '4.6' +- '4.7' libwebp: - '1' libxcb: -- '1.16' +- '1' openjpeg: - '2' pin_run_as_build: @@ -35,6 +37,5 @@ tk: zip_keys: - - python - python_impl - - channel_sources zlib: - '1' diff --git a/.ci_support/win_64_python3.9.____cpython.yaml b/.ci_support/win_64_python3.9.____cpython.yaml index 39cb953..e9edfa3 100644 --- a/.ci_support/win_64_python3.9.____cpython.yaml +++ b/.ci_support/win_64_python3.9.____cpython.yaml @@ -8,16 +8,18 @@ channel_targets: - conda-forge main freetype: - '2' +jpeg: +- '9' lcms2: - '2' libjpeg_turbo: - '3' libtiff: -- '4.6' +- '4.7' libwebp: - '1' libxcb: -- '1.16' +- '1' openjpeg: - '2' pin_run_as_build: @@ -35,6 +37,5 @@ tk: zip_keys: - - python - python_impl - - channel_sources zlib: - '1' diff --git a/.scripts/build_steps.sh b/.scripts/build_steps.sh index ba4b251..856f469 100755 --- a/.scripts/build_steps.sh +++ b/.scripts/build_steps.sh @@ -43,6 +43,8 @@ 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}" diff --git a/.scripts/run_win_build.bat b/.scripts/run_win_build.bat index 65650bf..a45c34f 100755 --- a/.scripts/run_win_build.bat +++ b/.scripts/run_win_build.bat @@ -24,7 +24,7 @@ set "CONDA_LIBMAMBA_SOLVER_NO_CHANNELS_FROM_INSTALLED=1" :: Provision the necessary dependencies to build the recipe later echo Installing dependencies -mamba.exe install "python=3.10" pip mamba conda-build conda-forge-ci-setup=4 "conda-build>=24.1" -c conda-forge --strict-channel-priority --yes +mamba.exe install pip mamba conda-build conda-forge-ci-setup=4 "conda-build>=24.1" -c conda-forge --strict-channel-priority --yes if !errorlevel! neq 0 exit /b !errorlevel! :: Set basic configuration @@ -48,7 +48,7 @@ if NOT [%HOST_PLATFORM%] == [%BUILD_PLATFORM%] ( ) if NOT [%flow_run_id%] == [] ( - set "EXTRA_CB_OPTIONS=%EXTRA_CB_OPTIONS% --extra-meta flow_run_id=%flow_run_id% remote_url=%remote_url% sha=%sha%" + set "EXTRA_CB_OPTIONS=%EXTRA_CB_OPTIONS% --extra-meta flow_run_id=%flow_run_id% remote_url=%remote_url% sha=%sha%" ) call :end_group diff --git a/azure-pipelines.yml b/azure-pipelines.yml index e5306da..32da3d0 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -2,7 +2,32 @@ # 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 - - template: ./.azure-pipelines/azure-pipelines-win.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: 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 + - template: ./.azure-pipelines/azure-pipelines-win.yml \ No newline at end of file diff --git a/build-locally.py b/build-locally.py index 8ac9b84..6788aea 100755 --- a/build-locally.py +++ b/build-locally.py @@ -1,5 +1,5 @@ #!/bin/sh -"""exec' "python3" "$0" "$@" #""" # fmt: off # fmt: on +"""exec" "python3" "$0" "$@" #""" # fmt: off # fmt: on # # This file has been generated by conda-smithy in order to build the recipe # locally. diff --git a/recipe/meta.yaml b/recipe/meta.yaml index b26a2d0..c73db4a 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -1,4 +1,4 @@ -{% set version = "10.4.0" %} +{% set version = "11.0.0" %} package: name: pillow @@ -6,7 +6,7 @@ package: source: url: https://github.com/python-pillow/Pillow/archive/refs/tags/{{ version }}.tar.gz - sha256: e70284e8605a5b7ccb37e5bfd4634598ca2c43c7f2c353572351ccf72c031004 + sha256: f60959120cac783dc39be7e093bff8f9dcbb5be58bcc1372c57492f748a3b759 patches: - patches/0001-Build-without-USE_WIN32_FILEIO.patch # fix provided by upstream maintainer for failing test @@ -16,7 +16,7 @@ source: - patches/0004-work-around-case-sensitivity.patch # [win] build: - number: 1 + number: 0 skip: true # [py<38] requirements: diff --git a/recipe/patches/0001-Build-without-USE_WIN32_FILEIO.patch b/recipe/patches/0001-Build-without-USE_WIN32_FILEIO.patch index 6b8a814..9d6a635 100644 --- a/recipe/patches/0001-Build-without-USE_WIN32_FILEIO.patch +++ b/recipe/patches/0001-Build-without-USE_WIN32_FILEIO.patch @@ -1,21 +1,8 @@ -From dbaa97f48882cc627e8f147c28e8daad576dfd50 Mon Sep 17 00:00:00 2001 -From: Ryan May -Date: Wed, 5 May 2021 12:42:10 -0600 -Subject: [PATCH 1/4] Build without USE_WIN32_FILEIO - -This keeps things consistent with current conda-forge builds of tiff -(and poppler). ---- - setup.py | 6 ------ - 1 file changed, 6 deletions(-) - -diff --git a/setup.py b/setup.py -index 0abfaaddc..49f620ceb 100644 ---- a/setup.py -+++ b/setup.py -@@ -837,12 +837,6 @@ class pil_build_ext(build_ext): - if feature.tiff: - libs.append(feature.tiff) +--- Pillow-11.0.0.orig/setup.py 2024-10-15 07:55:00.000000000 +0200 ++++ Pillow-11.0.0/setup.py 2024-10-16 08:56:01.786769874 +0200 +@@ -854,12 +854,6 @@ + if feature.get("tiff"): + libs.append(feature.get("tiff")) defs.append(("HAVE_LIBTIFF", None)) - if sys.platform == "win32": - # This define needs to be defined if-and-only-if it was defined @@ -23,6 +10,6 @@ index 0abfaaddc..49f620ceb 100644 - # so we have to guess; by default it is defined in all Windows builds. - # See #4237, #5243, #5359 for more information. - defs.append(("USE_WIN32_FILEIO", None)) - if feature.jpeg: - libs.append(feature.jpeg) + if feature.get("jpeg"): + libs.append(feature.get("jpeg")) defs.append(("HAVE_LIBJPEG", None))