diff --git a/.ci_support/linux_64_python3.10.____cpython.yaml b/.ci_support/linux_64_python3.10.____cpython.yaml index 787f4e9..c8ab4b9 100644 --- a/.ci_support/linux_64_python3.10.____cpython.yaml +++ b/.ci_support/linux_64_python3.10.____cpython.yaml @@ -12,8 +12,8 @@ docker_image: - quay.io/condaforge/linux-anvil-cos7-x86_64 freetype: - '2' -jpeg: -- '9' +libjpeg_turbo: +- '2' libtiff: - '4' libwebp: diff --git a/.ci_support/linux_64_python3.11.____cpython.yaml b/.ci_support/linux_64_python3.11.____cpython.yaml index ee0d95e..6b17107 100644 --- a/.ci_support/linux_64_python3.11.____cpython.yaml +++ b/.ci_support/linux_64_python3.11.____cpython.yaml @@ -12,8 +12,8 @@ docker_image: - quay.io/condaforge/linux-anvil-cos7-x86_64 freetype: - '2' -jpeg: -- '9' +libjpeg_turbo: +- '2' libtiff: - '4' libwebp: diff --git a/.ci_support/linux_64_python3.8.____73_pypy.yaml b/.ci_support/linux_64_python3.8.____73_pypy.yaml index 498e439..81681d0 100644 --- a/.ci_support/linux_64_python3.8.____73_pypy.yaml +++ b/.ci_support/linux_64_python3.8.____73_pypy.yaml @@ -12,8 +12,8 @@ docker_image: - quay.io/condaforge/linux-anvil-cos7-x86_64 freetype: - '2' -jpeg: -- '9' +libjpeg_turbo: +- '2' libtiff: - '4' libwebp: diff --git a/.ci_support/linux_64_python3.8.____cpython.yaml b/.ci_support/linux_64_python3.8.____cpython.yaml index 32b28cf..0958577 100644 --- a/.ci_support/linux_64_python3.8.____cpython.yaml +++ b/.ci_support/linux_64_python3.8.____cpython.yaml @@ -12,8 +12,8 @@ docker_image: - quay.io/condaforge/linux-anvil-cos7-x86_64 freetype: - '2' -jpeg: -- '9' +libjpeg_turbo: +- '2' libtiff: - '4' libwebp: diff --git a/.ci_support/linux_64_python3.9.____73_pypy.yaml b/.ci_support/linux_64_python3.9.____73_pypy.yaml index effd972..63484b8 100644 --- a/.ci_support/linux_64_python3.9.____73_pypy.yaml +++ b/.ci_support/linux_64_python3.9.____73_pypy.yaml @@ -12,8 +12,8 @@ docker_image: - quay.io/condaforge/linux-anvil-cos7-x86_64 freetype: - '2' -jpeg: -- '9' +libjpeg_turbo: +- '2' libtiff: - '4' libwebp: diff --git a/.ci_support/linux_64_python3.9.____cpython.yaml b/.ci_support/linux_64_python3.9.____cpython.yaml index 84dd3e1..7aa652d 100644 --- a/.ci_support/linux_64_python3.9.____cpython.yaml +++ b/.ci_support/linux_64_python3.9.____cpython.yaml @@ -12,8 +12,8 @@ docker_image: - quay.io/condaforge/linux-anvil-cos7-x86_64 freetype: - '2' -jpeg: -- '9' +libjpeg_turbo: +- '2' libtiff: - '4' libwebp: diff --git a/.ci_support/linux_aarch64_python3.10.____cpython.yaml b/.ci_support/linux_aarch64_python3.10.____cpython.yaml index 492adf2..04465a6 100644 --- a/.ci_support/linux_aarch64_python3.10.____cpython.yaml +++ b/.ci_support/linux_aarch64_python3.10.____cpython.yaml @@ -16,8 +16,8 @@ docker_image: - quay.io/condaforge/linux-anvil-aarch64 freetype: - '2' -jpeg: -- '9' +libjpeg_turbo: +- '2' libtiff: - '4' libwebp: diff --git a/.ci_support/linux_aarch64_python3.11.____cpython.yaml b/.ci_support/linux_aarch64_python3.11.____cpython.yaml index 8d411a7..bc7bed4 100644 --- a/.ci_support/linux_aarch64_python3.11.____cpython.yaml +++ b/.ci_support/linux_aarch64_python3.11.____cpython.yaml @@ -16,8 +16,8 @@ docker_image: - quay.io/condaforge/linux-anvil-aarch64 freetype: - '2' -jpeg: -- '9' +libjpeg_turbo: +- '2' libtiff: - '4' libwebp: diff --git a/.ci_support/linux_aarch64_python3.8.____73_pypy.yaml b/.ci_support/linux_aarch64_python3.8.____73_pypy.yaml index 58fc484..31e9be7 100644 --- a/.ci_support/linux_aarch64_python3.8.____73_pypy.yaml +++ b/.ci_support/linux_aarch64_python3.8.____73_pypy.yaml @@ -16,8 +16,8 @@ docker_image: - quay.io/condaforge/linux-anvil-aarch64 freetype: - '2' -jpeg: -- '9' +libjpeg_turbo: +- '2' libtiff: - '4' libwebp: diff --git a/.ci_support/linux_aarch64_python3.8.____cpython.yaml b/.ci_support/linux_aarch64_python3.8.____cpython.yaml index f485da2..afb6225 100644 --- a/.ci_support/linux_aarch64_python3.8.____cpython.yaml +++ b/.ci_support/linux_aarch64_python3.8.____cpython.yaml @@ -16,8 +16,8 @@ docker_image: - quay.io/condaforge/linux-anvil-aarch64 freetype: - '2' -jpeg: -- '9' +libjpeg_turbo: +- '2' libtiff: - '4' libwebp: diff --git a/.ci_support/linux_aarch64_python3.9.____73_pypy.yaml b/.ci_support/linux_aarch64_python3.9.____73_pypy.yaml index 6445527..fa96e2c 100644 --- a/.ci_support/linux_aarch64_python3.9.____73_pypy.yaml +++ b/.ci_support/linux_aarch64_python3.9.____73_pypy.yaml @@ -16,8 +16,8 @@ docker_image: - quay.io/condaforge/linux-anvil-aarch64 freetype: - '2' -jpeg: -- '9' +libjpeg_turbo: +- '2' libtiff: - '4' libwebp: diff --git a/.ci_support/linux_aarch64_python3.9.____cpython.yaml b/.ci_support/linux_aarch64_python3.9.____cpython.yaml index 713c3e5..f6cccef 100644 --- a/.ci_support/linux_aarch64_python3.9.____cpython.yaml +++ b/.ci_support/linux_aarch64_python3.9.____cpython.yaml @@ -16,8 +16,8 @@ docker_image: - quay.io/condaforge/linux-anvil-aarch64 freetype: - '2' -jpeg: -- '9' +libjpeg_turbo: +- '2' libtiff: - '4' libwebp: diff --git a/.ci_support/linux_ppc64le_python3.10.____cpython.yaml b/.ci_support/linux_ppc64le_python3.10.____cpython.yaml index 4dfbda8..8faea28 100644 --- a/.ci_support/linux_ppc64le_python3.10.____cpython.yaml +++ b/.ci_support/linux_ppc64le_python3.10.____cpython.yaml @@ -12,8 +12,8 @@ docker_image: - quay.io/condaforge/linux-anvil-ppc64le freetype: - '2' -jpeg: -- '9' +libjpeg_turbo: +- '2' libtiff: - '4' libwebp: diff --git a/.ci_support/linux_ppc64le_python3.11.____cpython.yaml b/.ci_support/linux_ppc64le_python3.11.____cpython.yaml index 1a62c02..5e9ab5e 100644 --- a/.ci_support/linux_ppc64le_python3.11.____cpython.yaml +++ b/.ci_support/linux_ppc64le_python3.11.____cpython.yaml @@ -12,8 +12,8 @@ docker_image: - quay.io/condaforge/linux-anvil-ppc64le freetype: - '2' -jpeg: -- '9' +libjpeg_turbo: +- '2' libtiff: - '4' libwebp: diff --git a/.ci_support/linux_ppc64le_python3.8.____73_pypy.yaml b/.ci_support/linux_ppc64le_python3.8.____73_pypy.yaml index e3884b0..3345cd7 100644 --- a/.ci_support/linux_ppc64le_python3.8.____73_pypy.yaml +++ b/.ci_support/linux_ppc64le_python3.8.____73_pypy.yaml @@ -12,8 +12,8 @@ docker_image: - quay.io/condaforge/linux-anvil-ppc64le freetype: - '2' -jpeg: -- '9' +libjpeg_turbo: +- '2' libtiff: - '4' libwebp: diff --git a/.ci_support/linux_ppc64le_python3.8.____cpython.yaml b/.ci_support/linux_ppc64le_python3.8.____cpython.yaml index 9469678..47569d1 100644 --- a/.ci_support/linux_ppc64le_python3.8.____cpython.yaml +++ b/.ci_support/linux_ppc64le_python3.8.____cpython.yaml @@ -12,8 +12,8 @@ docker_image: - quay.io/condaforge/linux-anvil-ppc64le freetype: - '2' -jpeg: -- '9' +libjpeg_turbo: +- '2' libtiff: - '4' libwebp: diff --git a/.ci_support/linux_ppc64le_python3.9.____73_pypy.yaml b/.ci_support/linux_ppc64le_python3.9.____73_pypy.yaml index 3a7e4b2..37e2d86 100644 --- a/.ci_support/linux_ppc64le_python3.9.____73_pypy.yaml +++ b/.ci_support/linux_ppc64le_python3.9.____73_pypy.yaml @@ -12,8 +12,8 @@ docker_image: - quay.io/condaforge/linux-anvil-ppc64le freetype: - '2' -jpeg: -- '9' +libjpeg_turbo: +- '2' libtiff: - '4' libwebp: diff --git a/.ci_support/linux_ppc64le_python3.9.____cpython.yaml b/.ci_support/linux_ppc64le_python3.9.____cpython.yaml index 4c68aae..0f53e3b 100644 --- a/.ci_support/linux_ppc64le_python3.9.____cpython.yaml +++ b/.ci_support/linux_ppc64le_python3.9.____cpython.yaml @@ -12,8 +12,8 @@ docker_image: - quay.io/condaforge/linux-anvil-ppc64le freetype: - '2' -jpeg: -- '9' +libjpeg_turbo: +- '2' libtiff: - '4' libwebp: diff --git a/.ci_support/osx_64_python3.10.____cpython.yaml b/.ci_support/osx_64_python3.10.____cpython.yaml index 84260f5..4f8c6e8 100644 --- a/.ci_support/osx_64_python3.10.____cpython.yaml +++ b/.ci_support/osx_64_python3.10.____cpython.yaml @@ -10,8 +10,8 @@ channel_targets: - conda-forge main freetype: - '2' -jpeg: -- '9' +libjpeg_turbo: +- '2' libtiff: - '4' libwebp: diff --git a/.ci_support/osx_64_python3.11.____cpython.yaml b/.ci_support/osx_64_python3.11.____cpython.yaml index 1e9a190..c416150 100644 --- a/.ci_support/osx_64_python3.11.____cpython.yaml +++ b/.ci_support/osx_64_python3.11.____cpython.yaml @@ -10,8 +10,8 @@ channel_targets: - conda-forge main freetype: - '2' -jpeg: -- '9' +libjpeg_turbo: +- '2' libtiff: - '4' libwebp: diff --git a/.ci_support/osx_64_python3.8.____73_pypy.yaml b/.ci_support/osx_64_python3.8.____73_pypy.yaml index d23beb2..00991ad 100644 --- a/.ci_support/osx_64_python3.8.____73_pypy.yaml +++ b/.ci_support/osx_64_python3.8.____73_pypy.yaml @@ -10,8 +10,8 @@ channel_targets: - conda-forge main freetype: - '2' -jpeg: -- '9' +libjpeg_turbo: +- '2' libtiff: - '4' libwebp: diff --git a/.ci_support/osx_64_python3.8.____cpython.yaml b/.ci_support/osx_64_python3.8.____cpython.yaml index d15c83f..a1bd5ba 100644 --- a/.ci_support/osx_64_python3.8.____cpython.yaml +++ b/.ci_support/osx_64_python3.8.____cpython.yaml @@ -10,8 +10,8 @@ channel_targets: - conda-forge main freetype: - '2' -jpeg: -- '9' +libjpeg_turbo: +- '2' libtiff: - '4' libwebp: diff --git a/.ci_support/osx_64_python3.9.____73_pypy.yaml b/.ci_support/osx_64_python3.9.____73_pypy.yaml index f26fec7..f6209b1 100644 --- a/.ci_support/osx_64_python3.9.____73_pypy.yaml +++ b/.ci_support/osx_64_python3.9.____73_pypy.yaml @@ -10,8 +10,8 @@ channel_targets: - conda-forge main freetype: - '2' -jpeg: -- '9' +libjpeg_turbo: +- '2' libtiff: - '4' libwebp: diff --git a/.ci_support/osx_64_python3.9.____cpython.yaml b/.ci_support/osx_64_python3.9.____cpython.yaml index 17b7410..4874039 100644 --- a/.ci_support/osx_64_python3.9.____cpython.yaml +++ b/.ci_support/osx_64_python3.9.____cpython.yaml @@ -10,8 +10,8 @@ channel_targets: - conda-forge main freetype: - '2' -jpeg: -- '9' +libjpeg_turbo: +- '2' libtiff: - '4' libwebp: diff --git a/.ci_support/osx_arm64_python3.10.____cpython.yaml b/.ci_support/osx_arm64_python3.10.____cpython.yaml index ddb820e..1f7740b 100644 --- a/.ci_support/osx_arm64_python3.10.____cpython.yaml +++ b/.ci_support/osx_arm64_python3.10.____cpython.yaml @@ -10,8 +10,8 @@ channel_targets: - conda-forge main freetype: - '2' -jpeg: -- '9' +libjpeg_turbo: +- '2' libtiff: - '4' libwebp: diff --git a/.ci_support/osx_arm64_python3.11.____cpython.yaml b/.ci_support/osx_arm64_python3.11.____cpython.yaml index ee95134..8f4cee2 100644 --- a/.ci_support/osx_arm64_python3.11.____cpython.yaml +++ b/.ci_support/osx_arm64_python3.11.____cpython.yaml @@ -10,8 +10,8 @@ channel_targets: - conda-forge main freetype: - '2' -jpeg: -- '9' +libjpeg_turbo: +- '2' libtiff: - '4' libwebp: diff --git a/.ci_support/osx_arm64_python3.8.____cpython.yaml b/.ci_support/osx_arm64_python3.8.____cpython.yaml index 4a2e4ad..863dd3e 100644 --- a/.ci_support/osx_arm64_python3.8.____cpython.yaml +++ b/.ci_support/osx_arm64_python3.8.____cpython.yaml @@ -10,8 +10,8 @@ channel_targets: - conda-forge main freetype: - '2' -jpeg: -- '9' +libjpeg_turbo: +- '2' libtiff: - '4' libwebp: diff --git a/.ci_support/osx_arm64_python3.9.____cpython.yaml b/.ci_support/osx_arm64_python3.9.____cpython.yaml index 2e3c23c..16df84e 100644 --- a/.ci_support/osx_arm64_python3.9.____cpython.yaml +++ b/.ci_support/osx_arm64_python3.9.____cpython.yaml @@ -10,8 +10,8 @@ channel_targets: - conda-forge main freetype: - '2' -jpeg: -- '9' +libjpeg_turbo: +- '2' libtiff: - '4' libwebp: diff --git a/.ci_support/win_64_python3.10.____cpython.yaml b/.ci_support/win_64_python3.10.____cpython.yaml index 37e0978..b9aff49 100644 --- a/.ci_support/win_64_python3.10.____cpython.yaml +++ b/.ci_support/win_64_python3.10.____cpython.yaml @@ -6,8 +6,8 @@ channel_targets: - conda-forge main freetype: - '2' -jpeg: -- '9' +libjpeg_turbo: +- '2' libtiff: - '4' libwebp: diff --git a/.ci_support/win_64_python3.11.____cpython.yaml b/.ci_support/win_64_python3.11.____cpython.yaml index dd2012b..09c2882 100644 --- a/.ci_support/win_64_python3.11.____cpython.yaml +++ b/.ci_support/win_64_python3.11.____cpython.yaml @@ -6,8 +6,8 @@ channel_targets: - conda-forge main freetype: - '2' -jpeg: -- '9' +libjpeg_turbo: +- '2' libtiff: - '4' libwebp: diff --git a/.ci_support/win_64_python3.8.____73_pypy.yaml b/.ci_support/win_64_python3.8.____73_pypy.yaml index d303ef3..8b09c99 100644 --- a/.ci_support/win_64_python3.8.____73_pypy.yaml +++ b/.ci_support/win_64_python3.8.____73_pypy.yaml @@ -6,8 +6,8 @@ channel_targets: - conda-forge main freetype: - '2' -jpeg: -- '9' +libjpeg_turbo: +- '2' libtiff: - '4' libwebp: diff --git a/.ci_support/win_64_python3.8.____cpython.yaml b/.ci_support/win_64_python3.8.____cpython.yaml index ab88bec..392c02c 100644 --- a/.ci_support/win_64_python3.8.____cpython.yaml +++ b/.ci_support/win_64_python3.8.____cpython.yaml @@ -6,8 +6,8 @@ channel_targets: - conda-forge main freetype: - '2' -jpeg: -- '9' +libjpeg_turbo: +- '2' libtiff: - '4' libwebp: diff --git a/.ci_support/win_64_python3.9.____73_pypy.yaml b/.ci_support/win_64_python3.9.____73_pypy.yaml index 270c558..fa6ea1d 100644 --- a/.ci_support/win_64_python3.9.____73_pypy.yaml +++ b/.ci_support/win_64_python3.9.____73_pypy.yaml @@ -6,8 +6,8 @@ channel_targets: - conda-forge main freetype: - '2' -jpeg: -- '9' +libjpeg_turbo: +- '2' libtiff: - '4' libwebp: diff --git a/.ci_support/win_64_python3.9.____cpython.yaml b/.ci_support/win_64_python3.9.____cpython.yaml index b071455..087ec09 100644 --- a/.ci_support/win_64_python3.9.____cpython.yaml +++ b/.ci_support/win_64_python3.9.____cpython.yaml @@ -6,8 +6,8 @@ channel_targets: - conda-forge main freetype: - '2' -jpeg: -- '9' +libjpeg_turbo: +- '2' libtiff: - '4' libwebp: diff --git a/.github/workflows/automerge.yml b/.github/workflows/automerge.yml index 773b3d1..da1368a 100644 --- a/.github/workflows/automerge.yml +++ b/.github/workflows/automerge.yml @@ -10,7 +10,7 @@ jobs: name: automerge steps: - name: checkout - uses: actions/checkout@v2 + uses: actions/checkout@v3 - name: automerge-action id: automerge-action uses: conda-forge/automerge-action@main