Cleanup (#85)

automerged PR by conda-forge/automerge-action
conda-forge · Oct 3, 2024 · 4be6236 · 4be6236
2 parents 93de214 + 3d66e6c
commit 4be6236
Show file tree

Hide file tree

Showing 19 changed files with 46 additions and 83 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
@@ -1,13 +1,13 @@
 c_compiler:
 - gcc
 c_compiler_version:
-- '12'
+- '13'
 c_stdlib:
 - sysroot
 c_stdlib_version:
-- '2.12'
+- '2.17'
 cdt_name:
-- cos6
+- cos7
 channel_sources:
 - conda-forge
 channel_targets:

diff --git a/.ci_support/linux_aarch64_.yaml b/.ci_support/linux_aarch64_.yaml
@@ -3,7 +3,7 @@ BUILD:
 c_compiler:
 - gcc
 c_compiler_version:
-- '12'
+- '13'
 c_stdlib:
 - sysroot
 c_stdlib_version:
@@ -17,7 +17,7 @@ channel_sources:
 channel_targets:
 - conda-forge main
 docker_image:
-- quay.io/condaforge/linux-anvil-aarch64
+- quay.io/condaforge/linux-anvil-cos7-x86_64
 target_platform:
 - linux-aarch64
 zip_keys:

diff --git a/.ci_support/linux_ppc64le_.yaml b/.ci_support/linux_ppc64le_.yaml
@@ -1,7 +1,7 @@
 c_compiler:
 - gcc
 c_compiler_version:
-- '12'
+- '13'
 c_stdlib:
 - sysroot
 c_stdlib_version:

diff --git a/.ci_support/osx_64_.yaml b/.ci_support/osx_64_.yaml
@@ -5,7 +5,7 @@ MACOSX_SDK_VERSION:
 c_compiler:
 - clang_bootstrap
 c_compiler_version:
-- '16'
+- '17'
 c_stdlib:
 - macosx_deployment_target
 c_stdlib_version:

diff --git a/.ci_support/osx_arm64_.yaml b/.ci_support/osx_arm64_.yaml
@@ -5,7 +5,7 @@ MACOSX_SDK_VERSION:
 c_compiler:
 - clang_bootstrap
 c_compiler_version:
-- '16'
+- '17'
 c_stdlib:
 - macosx_deployment_target
 c_stdlib_version:

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/.travis.yml b/.travis.yml
diff --git a/README.md b/README.md
diff --git a/build-locally.py b/build-locally.py
diff --git a/conda-forge.yml b/conda-forge.yml
@@ -1,8 +1,8 @@
-provider: {linux_aarch64: default, linux_ppc64le: default}
 conda_forge_output_validation: true
 build_platform:
-  osx_arm64: osx_64
+  linux_aarch64: linux_64
   linux_ppc64le: linux_64
+  osx_arm64: osx_64
   win_arm64: win_64
 github:
   branch_name: main

diff --git a/recipe/bld.bat b/recipe/bld.bat
@@ -70,8 +70,5 @@ copy %LIBRARY_LIB%\zlib.lib %LIBRARY_LIB%\z.lib || exit 1
 :: Qt in particular goes looking for this one (as of 4.8.7).
 copy %LIBRARY_LIB%\zlib.lib %LIBRARY_LIB%\zdll.lib || exit 1
 
-:: Copy license file to the source directory so conda-build can find it.
-copy %RECIPE_DIR%\license.txt %SRC_DIR%\license.txt || exit 1
-
 :: python>=3.10 depend on this being at %PREFIX%
 copy %LIBRARY_BIN%\zlib.dll %PREFIX%\zlib.dll || exit 1
diff --git a/recipe/build.sh b/recipe/build.sh
@@ -22,6 +22,3 @@ make install
 
 # Remove man files.
 rm -rf $PREFIX/share
-
-# Copy license file to the source directory so conda-build can find it.
-cp $RECIPE_DIR/license.txt $SRC_DIR/license.txt
diff --git a/recipe/conda_build_config.yaml b/recipe/conda_build_config.yaml
@@ -1,2 +1,3 @@
-c_compiler:   # [osx]
-  - clang_bootstrap  # [osx]
+# compiler on osx depends on zlib itself -> use the bootstrap compiler
+c_compiler:             # [osx]
+  - clang_bootstrap     # [osx]
diff --git a/recipe/license.txt b/recipe/license.txt
diff --git a/recipe/meta.yaml b/recipe/meta.yaml
@@ -1,5 +1,5 @@
 {% set version = "1.3.1" %}
-{% set build_num = 1 %}
+{% set build_num = 2 %}
 
 package:
   name: zlib-split
@@ -17,7 +17,6 @@ build:
 requirements:
   build:
     - cmake                 # [win]
-    # compiler on osx depends on zlib itself. Use the bootstrap compiler instead on osx
     - {{ compiler('c') }}
     - {{ stdlib('c') }}
     - make                  # [unix]
@@ -142,11 +141,10 @@ outputs:
 
 about:
   home: http://zlib.net/
-  # http://zlib.net/zlib_license.html
   license: Zlib
   summary: Massively spiffy yet delicately unobtrusive compression library
   license_family: Other
-  license_file: license.txt
+  license_file: LICENSE
   description: |
     zlib is designed to be a free, general-purpose, lossless data-compression
     library for use on virtually any computer hardware and operating system.