Merge pull request #6 from regro-cf-autotick-bot/rebuild-libtiff45-0-…

…1_hde4cfe Rebuild for libtiff45
conda-forge · Dec 20, 2022 · 61c4299 · 61c4299
2 parents fb8f517 + 9c91a9e
commit 61c4299
Show file tree

Hide file tree

Showing 12 changed files with 39 additions and 64 deletions.
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,7 +1,7 @@
 c_compiler:
 - gcc
 c_compiler_version:
-- '10'
+- '11'
 cdt_name:
 - cos6
 channel_sources:
@@ -11,26 +11,17 @@ channel_targets:
 cxx_compiler:
 - gxx
 cxx_compiler_version:
-- '10'
+- '11'
 docker_image:
 - quay.io/condaforge/linux-anvil-cos7-x86_64
 jpeg:
 - '9'
 libpng:
 - '1.6'
 libtiff:
-- '4'
+- '4.5'
 perl:
 - 5.32.1
-pin_run_as_build:
-  jpeg:
-    max_pin: x
-  libpng:
-    max_pin: x.x
-  libtiff:
-    max_pin: x
-  zlib:
-    max_pin: x.x
 target_platform:
 - linux-64
 zip_keys:

diff --git a/.ci_support/migrations/libtiff45.yaml b/.ci_support/migrations/libtiff45.yaml
@@ -0,0 +1,7 @@
+__migrator:
+  build_number: 1
+  kind: version
+  migration_number: 1
+libtiff:
+- '4.5'
+migrator_ts: 1671403615.5901675
diff --git a/.ci_support/osx_64_.yaml b/.ci_support/osx_64_.yaml
@@ -3,34 +3,25 @@ MACOSX_DEPLOYMENT_TARGET:
 c_compiler:
 - clang
 c_compiler_version:
-- '13'
+- '14'
 channel_sources:
 - conda-forge
 channel_targets:
 - conda-forge main
 cxx_compiler:
 - clangxx
 cxx_compiler_version:
-- '13'
+- '14'
 jpeg:
 - '9'
 libpng:
 - '1.6'
 libtiff:
-- '4'
+- '4.5'
 macos_machine:
 - x86_64-apple-darwin13.4.0
 perl:
 - 5.32.1
-pin_run_as_build:
-  jpeg:
-    max_pin: x
-  libpng:
-    max_pin: x.x
-  libtiff:
-    max_pin: x
-  zlib:
-    max_pin: x.x
 target_platform:
 - osx-64
 zip_keys:

diff --git a/.ci_support/osx_arm64_.yaml b/.ci_support/osx_arm64_.yaml
@@ -3,34 +3,25 @@ MACOSX_DEPLOYMENT_TARGET:
 c_compiler:
 - clang
 c_compiler_version:
-- '13'
+- '14'
 channel_sources:
 - conda-forge
 channel_targets:
 - conda-forge main
 cxx_compiler:
 - clangxx
 cxx_compiler_version:
-- '13'
+- '14'
 jpeg:
 - '9'
 libpng:
 - '1.6'
 libtiff:
-- '4'
+- '4.5'
 macos_machine:
 - arm64-apple-darwin20.0.0
 perl:
 - 5.32.1
-pin_run_as_build:
-  jpeg:
-    max_pin: x
-  libpng:
-    max_pin: x.x
-  libtiff:
-    max_pin: x
-  zlib:
-    max_pin: x.x
 target_platform:
 - osx-arm64
 zip_keys:

diff --git a/.ci_support/win_64_.yaml b/.ci_support/win_64_.yaml
@@ -1,28 +1,19 @@
 c_compiler:
-- vs2017
+- vs2019
 channel_sources:
 - conda-forge
 channel_targets:
 - conda-forge main
 cxx_compiler:
-- vs2017
+- vs2019
 jpeg:
 - '9'
 libpng:
 - '1.6'
 libtiff:
-- '4'
+- '4.5'
 perl:
 - 5.32.1
-pin_run_as_build:
-  jpeg:
-    max_pin: x
-  libpng:
-    max_pin: x.x
-  libtiff:
-    max_pin: x
-  zlib:
-    max_pin: x.x
 target_platform:
 - win-64
 zlib:

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/README.md b/README.md
diff --git a/conda-forge.yml b/conda-forge.yml
@@ -1,8 +1,9 @@
-build_platform: {osx_arm64: osx_64}
+build_platform:
+  osx_arm64: osx_64
+conda_build:
+  pkg_format: '2'
 conda_forge_output_validation: true
-test_on_native_only: true
 github:
   branch_name: main
   tooling_branch_name: main
-conda_build:
-  pkg_format: '2'
+test_on_native_only: true
diff --git a/recipe/meta.yaml b/recipe/meta.yaml
@@ -16,7 +16,7 @@ source:
     - patches/0005-Deifne-c2pstr-for-mac-aarch64-as-well.patch  # [osx and arm64]
 
 build:
-  number: 3
+  number: 4
   run_exports:
     - {{ pin_subpackage('libpano13', max_pin='x.x.x') }}