Merge pull request #33 from regro-cf-autotick-bot/0.11.1_h9bd6d9

libjxl-split v0.11.1
conda-forge · Nov 27, 2024 · a396522 · a396522
2 parents 32b9811 + 901fba9
commit a396522
Show file tree

Hide file tree

Showing 15 changed files with 91 additions and 98 deletions.
diff --git a/.azure-pipelines/azure-pipelines-linux.yml b/.azure-pipelines/azure-pipelines-linux.yml
diff --git a/.azure-pipelines/azure-pipelines-win.yml b/.azure-pipelines/azure-pipelines-win.yml
diff --git a/.ci_support/linux_64_.yaml b/.ci_support/linux_64_.yaml
@@ -7,7 +7,7 @@ c_stdlib:
 c_stdlib_version:
 - '2.17'
 cdt_name:
-- cos7
+- conda
 channel_sources:
 - conda-forge
 channel_targets:
@@ -17,11 +17,9 @@ cxx_compiler:
 cxx_compiler_version:
 - '13'
 docker_image:
-- quay.io/condaforge/linux-anvil-cos7-x86_64
+- quay.io/condaforge/linux-anvil-x86_64:alma9
 giflib:
 - '5.2'
-jpeg:
-- '9'
 libhwy:
 - '1.1'
 libjpeg_turbo:
@@ -35,7 +33,5 @@ target_platform:
 zip_keys:
 - - c_compiler_version
   - cxx_compiler_version
-- - c_stdlib_version
-  - cdt_name
 zlib:
 - '1'
diff --git a/.ci_support/linux_aarch64_.yaml b/.ci_support/linux_aarch64_.yaml
@@ -1,5 +1,3 @@
-BUILD:
-- aarch64-conda_cos7-linux-gnu
 c_compiler:
 - gcc
 c_compiler_version:
@@ -8,10 +6,8 @@ c_stdlib:
 - sysroot
 c_stdlib_version:
 - '2.17'
-cdt_arch:
-- aarch64
 cdt_name:
-- cos7
+- conda
 channel_sources:
 - conda-forge
 channel_targets:
@@ -21,11 +17,9 @@ cxx_compiler:
 cxx_compiler_version:
 - '13'
 docker_image:
-- quay.io/condaforge/linux-anvil-cos7-x86_64
+- quay.io/condaforge/linux-anvil-x86_64:alma9
 giflib:
 - '5.2'
-jpeg:
-- '9'
 libhwy:
 - '1.1'
 libjpeg_turbo:
@@ -39,7 +33,5 @@ target_platform:
 zip_keys:
 - - c_compiler_version
   - cxx_compiler_version
-- - c_stdlib_version
-  - cdt_name
 zlib:
 - '1'
diff --git a/.ci_support/linux_ppc64le_.yaml b/.ci_support/linux_ppc64le_.yaml
@@ -7,7 +7,7 @@ c_stdlib:
 c_stdlib_version:
 - '2.17'
 cdt_name:
-- cos7
+- conda
 channel_sources:
 - conda-forge
 channel_targets:
@@ -17,11 +17,9 @@ cxx_compiler:
 cxx_compiler_version:
 - '18'
 docker_image:
-- quay.io/condaforge/linux-anvil-cos7-x86_64
+- quay.io/condaforge/linux-anvil-x86_64:alma9
 giflib:
 - '5.2'
-jpeg:
-- '9'
 libhwy:
 - '1.1'
 libjpeg_turbo:
@@ -35,7 +33,5 @@ target_platform:
 zip_keys:
 - - c_compiler_version
   - cxx_compiler_version
-- - c_stdlib_version
-  - cdt_name
 zlib:
 - '1'
diff --git a/.ci_support/migrations/openexr33.yaml b/.ci_support/migrations/openexr33.yaml
diff --git a/.ci_support/osx_64_.yaml b/.ci_support/osx_64_.yaml
@@ -5,7 +5,7 @@ MACOSX_SDK_VERSION:
 c_compiler:
 - clang
 c_compiler_version:
-- '17'
+- '18'
 c_stdlib:
 - macosx_deployment_target
 c_stdlib_version:
@@ -17,11 +17,9 @@ channel_targets:
 cxx_compiler:
 - clangxx
 cxx_compiler_version:
-- '17'
+- '18'
 giflib:
 - '5.2'
-jpeg:
-- '9'
 libhwy:
 - '1.1'
 libjpeg_turbo:

diff --git a/.ci_support/osx_arm64_.yaml b/.ci_support/osx_arm64_.yaml
@@ -5,7 +5,7 @@ MACOSX_SDK_VERSION:
 c_compiler:
 - clang
 c_compiler_version:
-- '17'
+- '18'
 c_stdlib:
 - macosx_deployment_target
 c_stdlib_version:
@@ -17,11 +17,9 @@ channel_targets:
 cxx_compiler:
 - clangxx
 cxx_compiler_version:
-- '17'
+- '18'
 giflib:
 - '5.2'
-jpeg:
-- '9'
 libhwy:
 - '1.1'
 libjpeg_turbo:

diff --git a/.ci_support/win_64_.yaml b/.ci_support/win_64_.yaml
@@ -10,8 +10,6 @@ cxx_compiler:
 - vs2019
 giflib:
 - '5.2'
-jpeg:
-- '9'
 libhwy:
 - '1.1'
 libjpeg_turbo:

diff --git a/.scripts/build_steps.sh b/.scripts/build_steps.sh
diff --git a/.scripts/run_osx_build.sh b/.scripts/run_osx_build.sh
diff --git a/.scripts/run_win_build.bat b/.scripts/run_win_build.bat
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
-Original file line number
+Diff line change
@@ Expand Up / @@ -10,8 +10,6 @@ cxx_compiler: @@
     - vs2019
     giflib:
     - '5.2'
-    jpeg:
-    - '9'
     libhwy:
     - '1.1'
     libjpeg_turbo:
@@ Expand Down @@