Merge pull request #55 from jjhelmus/v3.12.1_manual

Revert #47 and update to 3.12.1
conda-forge · May 26, 2020 · cfe1dbc · cfe1dbc
2 parents 1815dd1 + 2a6be75
commit cfe1dbc
Show file tree

Hide file tree

Showing 12 changed files with 146 additions and 116 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/.azure-pipelines/azure-pipelines-win.yml b/.azure-pipelines/azure-pipelines-win.yml
diff --git a/...compilervs2015cxx_compilervs2015vc14.yaml → .ci_support/win_.yaml b/...compilervs2015cxx_compilervs2015vc14.yaml → .ci_support/win_.yaml
@@ -1,21 +1,15 @@
 c_compiler:
-- vs2015
+- vs2017
 channel_sources:
 - conda-forge,defaults
 channel_targets:
 - conda-forge main
 cxx_compiler:
-- vs2015
+- vs2017
 pin_run_as_build:
-  vc:
-    max_pin: x
   zlib:
     max_pin: x.x
 vc:
 - '14'
-zip_keys:
-- - vc
-  - c_compiler
-  - cxx_compiler
 zlib:
 - '1.2'
diff --git a/.drone.yml b/.drone.yml
diff --git a/.gitattributes b/.gitattributes
diff --git a/.scripts/build_steps.sh b/.scripts/build_steps.sh
diff --git a/.scripts/run_docker_build.sh b/.scripts/run_docker_build.sh
diff --git a/.scripts/run_osx_build.sh b/.scripts/run_osx_build.sh
diff --git a/README.md b/README.md