Merge pull request #22 from brianv0/unvendor_zlib

Unvendor zlib
conda-forge · Apr 27, 2020 · a9401dd · a9401dd
2 parents 0c229c8 + f1c746a
commit a9401dd
Show file tree

Hide file tree

Showing 21 changed files with 196 additions and 261 deletions.
diff --git a/.appveyor.yml b/.appveyor.yml
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/.azure-pipelines/azure-pipelines-win.yml b/.azure-pipelines/azure-pipelines-win.yml
diff --git a/.ci_support/linux_.yaml b/.ci_support/linux_.yaml
@@ -15,9 +15,13 @@ fortran_compiler:
 fortran_compiler_version:
 - '7'
 libcurl:
-- '7.64'
+- '7'
 pin_run_as_build:
   bzip2:
     max_pin: x
   libcurl:
     max_pin: x
+  zlib:
+    max_pin: x.x
+zlib:
+- '1.2'
diff --git a/.ci_support/linux_aarch64_.yaml b/.ci_support/linux_aarch64_.yaml
@@ -11,7 +11,7 @@ cdt_arch:
 cdt_name:
 - cos7
 channel_sources:
-- conda-forge,c4aarch64,defaults
+- conda-forge
 channel_targets:
 - conda-forge main
 docker_image:
@@ -21,9 +21,13 @@ fortran_compiler:
 fortran_compiler_version:
 - '7'
 libcurl:
-- '7.64'
+- '7'
 pin_run_as_build:
   bzip2:
     max_pin: x
   libcurl:
     max_pin: x
+  zlib:
+    max_pin: x.x
+zlib:
+- '1.2'
diff --git a/.ci_support/linux_ppc64le_.yaml b/.ci_support/linux_ppc64le_.yaml
@@ -15,9 +15,13 @@ fortran_compiler:
 fortran_compiler_version:
 - '8'
 libcurl:
-- '7.64'
+- '7'
 pin_run_as_build:
   bzip2:
     max_pin: x
   libcurl:
     max_pin: x
+  zlib:
+    max_pin: x.x
+zlib:
+- '1.2'
diff --git a/...upport/osx_fortran_compiler_version7.yaml → .ci_support/osx_.yaml b/...upport/osx_fortran_compiler_version7.yaml → .ci_support/osx_.yaml
@@ -5,7 +5,7 @@ bzip2:
 c_compiler:
 - clang
 c_compiler_version:
-- '4'
+- '9'
 channel_sources:
 - conda-forge,defaults
 channel_targets:
@@ -15,7 +15,7 @@ fortran_compiler:
 fortran_compiler_version:
 - '7'
 libcurl:
-- '7.64'
+- '7'
 macos_machine:
 - x86_64-apple-darwin13.4.0
 macos_min_version:
@@ -25,3 +25,7 @@ pin_run_as_build:
     max_pin: x
   libcurl:
     max_pin: x
+  zlib:
+    max_pin: x.x
+zlib:
+- '1.2'
diff --git a/.ci_support/osx_fortran_compiler_version4.yaml b/.ci_support/osx_fortran_compiler_version4.yaml
diff --git a/.ci_support/win_c_compilervs2015.yaml → .ci_support/win_.yaml b/.ci_support/win_c_compilervs2015.yaml → .ci_support/win_.yaml
@@ -1,5 +1,5 @@
 c_compiler:
-- vs2015
+- vs2017
 channel_sources:
 - conda-forge,defaults
 channel_targets:

diff --git a/.drone.yml b/.drone.yml
diff --git a/.gitattributes b/.gitattributes
diff --git a/.azure-pipelines/build_steps.sh → .scripts/build_steps.sh b/.azure-pipelines/build_steps.sh → .scripts/build_steps.sh