Merge pull request #27 from rhyspoulton/rebuild-cfitsio420-0-1_h241c71

Rebuild cfitsio420
conda-forge · Apr 26, 2023 · add1116 · add1116
2 parents 6ff8853 + 2a6952e
commit add1116
Show file tree

Hide file tree

Showing 17 changed files with 91 additions and 81 deletions.
diff --git a/.azure-pipelines/azure-pipelines-linux.yml b/.azure-pipelines/azure-pipelines-linux.yml
diff --git a/.azure-pipelines/azure-pipelines-osx.yml b/.azure-pipelines/azure-pipelines-osx.yml
diff --git a/.ci_support/linux_64_.yaml b/.ci_support/linux_64_.yaml
@@ -5,7 +5,7 @@ c_compiler_version:
 cdt_name:
 - cos6
 cfitsio:
-- 4.1.0
+- 4.2.0
 channel_sources:
 - conda-forge
 channel_targets:

diff --git a/.ci_support/linux_aarch64_.yaml b/.ci_support/linux_aarch64_.yaml
@@ -9,7 +9,7 @@ cdt_arch:
 cdt_name:
 - cos7
 cfitsio:
-- 4.1.0
+- 4.2.0
 channel_sources:
 - conda-forge
 channel_targets:
@@ -19,7 +19,7 @@ cxx_compiler:
 cxx_compiler_version:
 - '10'
 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
@@ -5,7 +5,7 @@ c_compiler_version:
 cdt_name:
 - cos7
 cfitsio:
-- 4.1.0
+- 4.2.0
 channel_sources:
 - conda-forge
 channel_targets:
@@ -15,7 +15,7 @@ cxx_compiler:
 cxx_compiler_version:
 - '10'
 docker_image:
-- quay.io/condaforge/linux-anvil-ppc64le
+- quay.io/condaforge/linux-anvil-cos7-x86_64
 target_platform:
 - linux-ppc64le
 zip_keys:

diff --git a/.ci_support/migrations/cfitsio410.yaml → .ci_support/migrations/cfitsio420.yaml b/.ci_support/migrations/cfitsio410.yaml → .ci_support/migrations/cfitsio420.yaml
@@ -3,5 +3,5 @@ __migrator:
   kind: version
   migration_number: 1
 cfitsio:
-- 4.1.0
-migrator_ts: 1647632980.4065666
+- 4.2.0
+migrator_ts: 1668765504.9452357
diff --git a/.ci_support/osx_64_.yaml b/.ci_support/osx_64_.yaml
@@ -3,19 +3,19 @@ MACOSX_DEPLOYMENT_TARGET:
 c_compiler:
 - clang
 c_compiler_version:
-- '12'
+- '14'
 cfitsio:
-- 4.1.0
+- 4.2.0
 channel_sources:
 - conda-forge
 channel_targets:
 - conda-forge main
 cxx_compiler:
 - clangxx
 cxx_compiler_version:
-- '12'
+- '14'
 llvm_openmp:
-- '12'
+- '14'
 macos_machine:
 - x86_64-apple-darwin13.4.0
 target_platform:

diff --git a/.ci_support/osx_arm64_.yaml b/.ci_support/osx_arm64_.yaml
@@ -3,19 +3,19 @@ MACOSX_DEPLOYMENT_TARGET:
 c_compiler:
 - clang
 c_compiler_version:
-- '12'
+- '14'
 cfitsio:
-- 4.1.0
+- 4.2.0
 channel_sources:
 - conda-forge
 channel_targets:
 - conda-forge main
 cxx_compiler:
 - clangxx
 cxx_compiler_version:
-- '12'
+- '14'
 llvm_openmp:
-- '12'
+- '14'
 macos_machine:
 - arm64-apple-darwin20.0.0
 target_platform:

diff --git a/.circleci/config.yml b/.circleci/config.yml
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/.travis.yml b/.travis.yml
diff --git a/LICENSE.txt b/LICENSE.txt
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,5 +1,9 @@
 build_platform:
+  linux_aarch64: linux_64
+  linux_ppc64le: linux_64
   osx_arm64: osx_64
+conda_build:
+  pkg_format: '2'
 conda_forge_output_validation: true
 github:
   branch_name: main
@@ -8,5 +12,3 @@ provider:
   linux_aarch64: default
   linux_ppc64le: default
 test_on_native_only: true
-conda_build:
-  pkg_format: '2'
diff --git a/recipe/meta.yaml b/recipe/meta.yaml
@@ -14,7 +14,7 @@ source:
 build:
   run_exports:
     - {{ pin_subpackage("healpix_cxx", max_pin="x.x") }}
-  number: 0
+  number: 1
   skip: true  # [win]
 
 requirements:
@@ -25,8 +25,10 @@ requirements:
     - libgomp  # [linux]
     - llvm-openmp  # [osx]
     - make
+    - pkg-config
   host:
     - cfitsio
+    - zlib  # [linux]
   run:
     - cfitsio