Rebuild for hdf51106

automerged PR by regro-cf-autotick-bot-action
conda-forge · Apr 16, 2020 · bc91691 · bc91691
2 parents 8ef4f58 + 2e12653
commit bc91691
Show file tree

Hide file tree

Showing 15 changed files with 33 additions and 52 deletions.
diff --git a/.azure-pipelines/azure-pipelines-win.yml b/.azure-pipelines/azure-pipelines-win.yml
diff --git a/.ci_support/linux_mpimpich.yaml b/.ci_support/linux_mpimpich.yaml
@@ -9,13 +9,13 @@ channel_sources:
 channel_targets:
 - conda-forge main
 curl:
-- '7.64'
+- '7'
 docker_image:
 - condaforge/linux-anvil-comp7
 hdf4:
 - '4.2'
 hdf5:
-- 1.10.5
+- 1.10.6
 jpeg:
 - '9'
 mpi:

diff --git a/.ci_support/linux_mpinompi.yaml b/.ci_support/linux_mpinompi.yaml
@@ -9,13 +9,13 @@ channel_sources:
 channel_targets:
 - conda-forge main
 curl:
-- '7.64'
+- '7'
 docker_image:
 - condaforge/linux-anvil-comp7
 hdf4:
 - '4.2'
 hdf5:
-- 1.10.5
+- 1.10.6
 jpeg:
 - '9'
 mpi:

diff --git a/.ci_support/linux_mpiopenmpi.yaml b/.ci_support/linux_mpiopenmpi.yaml
@@ -9,13 +9,13 @@ channel_sources:
 channel_targets:
 - conda-forge main
 curl:
-- '7.64'
+- '7'
 docker_image:
 - condaforge/linux-anvil-comp7
 hdf4:
 - '4.2'
 hdf5:
-- 1.10.5
+- 1.10.6
 jpeg:
 - '9'
 mpi:

diff --git a/.ci_support/linux_ppc64le_mpimpich.yaml b/.ci_support/linux_ppc64le_mpimpich.yaml
@@ -9,13 +9,13 @@ channel_sources:
 channel_targets:
 - conda-forge main
 curl:
-- '7.64'
+- '7'
 docker_image:
 - condaforge/linux-anvil-ppc64le
 hdf4:
 - '4.2'
 hdf5:
-- 1.10.5
+- 1.10.6
 jpeg:
 - '9'
 mpi:

diff --git a/.ci_support/linux_ppc64le_mpinompi.yaml b/.ci_support/linux_ppc64le_mpinompi.yaml
@@ -9,13 +9,13 @@ channel_sources:
 channel_targets:
 - conda-forge main
 curl:
-- '7.64'
+- '7'
 docker_image:
 - condaforge/linux-anvil-ppc64le
 hdf4:
 - '4.2'
 hdf5:
-- 1.10.5
+- 1.10.6
 jpeg:
 - '9'
 mpi:

diff --git a/.ci_support/linux_ppc64le_mpiopenmpi.yaml b/.ci_support/linux_ppc64le_mpiopenmpi.yaml
@@ -9,13 +9,13 @@ channel_sources:
 channel_targets:
 - conda-forge main
 curl:
-- '7.64'
+- '7'
 docker_image:
 - condaforge/linux-anvil-ppc64le
 hdf4:
 - '4.2'
 hdf5:
-- 1.10.5
+- 1.10.6
 jpeg:
 - '9'
 mpi:

diff --git a/.ci_support/migrations/hdf51106.yaml b/.ci_support/migrations/hdf51106.yaml
@@ -0,0 +1,7 @@
+__migrator:
+  build_number: 1
+  kind: version
+  migration_number: 1
+hdf5:
+- 1.10.6
+migrator_ts: 1587001869.689825
diff --git a/.ci_support/osx_mpimpich.yaml b/.ci_support/osx_mpimpich.yaml
@@ -11,11 +11,11 @@ channel_sources:
 channel_targets:
 - conda-forge main
 curl:
-- '7.64'
+- '7'
 hdf4:
 - '4.2'
 hdf5:
-- 1.10.5
+- 1.10.6
 jpeg:
 - '9'
 macos_machine:

diff --git a/.ci_support/osx_mpinompi.yaml b/.ci_support/osx_mpinompi.yaml
@@ -11,11 +11,11 @@ channel_sources:
 channel_targets:
 - conda-forge main
 curl:
-- '7.64'
+- '7'
 hdf4:
 - '4.2'
 hdf5:
-- 1.10.5
+- 1.10.6
 jpeg:
 - '9'
 macos_machine:

diff --git a/.ci_support/osx_mpiopenmpi.yaml b/.ci_support/osx_mpiopenmpi.yaml
@@ -11,11 +11,11 @@ channel_sources:
 channel_targets:
 - conda-forge main
 curl:
-- '7.64'
+- '7'
 hdf4:
 - '4.2'
 hdf5:
-- 1.10.5
+- 1.10.6
 jpeg:
 - '9'
 macos_machine:

diff --git a/.ci_support/win_.yaml b/.ci_support/win_.yaml
@@ -1,17 +1,17 @@
 bzip2:
 - '1'
 c_compiler:
-- vs2015
+- vs2017
 channel_sources:
 - conda-forge,defaults
 channel_targets:
 - conda-forge main
 curl:
-- '7.64'
+- '7'
 hdf4:
 - '4.2'
 hdf5:
-- 1.10.5
+- 1.10.6
 jpeg:
 - '9'
 mpi:
@@ -25,8 +25,6 @@ pin_run_as_build:
     max_pin: x.x
   jpeg:
     max_pin: x
-  vc:
-    max_pin: x
   zlib:
     max_pin: x.x
 vc:

diff --git a/recipe/bld.bat b/recipe/bld.bat
@@ -38,21 +38,3 @@ ctest -VV
 
 cmake --build . --config %BUILD_TYPE% --target install
 if errorlevel 1 exit \b 1
-
-:: Please do not remove this.
-echo If you need to debug this in Visual Studio, set BUILD_TYPE=RelWithDebInfo then:
-echo set PATH=%CD%\liblib\%BUILD_TYPE%;%CD%\liblib;%PREFIX%\Library\bin;%ORIG_PATH%
-if "%vc%" == "9" goto vc9_build2
-echo "C:\Program Files (x86)\Microsoft Visual Studio\2017\Professional\Common7\IDE\devenv.exe" /debugexe %CD%\ncdump\%BUILD_TYPE%\ncdump.exe -h http://geoport-dev.whoi.edu/thredds/dodsC/estofs/atlantic
-goto end_build2
-:vc9_build2
-echo "C:\Program Files (x86)\Microsoft Visual Studio 9.0\Common7\IDE\devenv.exe" /debugexe %CD%\ncdump\%BUILD_TYPE%\ncdump.exe -h http://geoport-dev.whoi.edu/thredds/dodsC/estofs/atlantic
-:end_build2
-
-:: Also leave this test where it is. ATM, conda-build deletes host prefixes by the time it runs the
-:: package tests which makes investigating problems very tricky. Pinging @msarahan about that.
-:: Release builds do not get put in build subfolders for some reason:
-if exist ncdump\%BUILD_TYPE%\ncdump.exe ncdump\%BUILD_TYPE%\ncdump.exe -L 100 -h http://geoport-dev.whoi.edu/thredds/dodsC/estofs/atlantic
-if exist ncdump\ncdump.exe ncdump\ncdump.exe -L 100 -h http://geoport-dev.whoi.edu/thredds/dodsC/estofs/atlantic
-
-if errorlevel 1 exit \b 1
diff --git a/recipe/build.sh b/recipe/build.sh
@@ -94,10 +94,6 @@ make -j${CPU_COUNT} ${VERBOSE_CM}
 make install -j${CPU_COUNT}
 ctest -VV --output-on-failure
 
-# Leave this test where it is. ATM, conda-build deletes host prefixes by the time it runs the
-# package tests which makes investigating problems very tricky. Pinging @msarahan about that.
-ncdump/ncdump -h http://geoport-dev.whoi.edu/thredds/dodsC/estofs/atlantic || exit $?
-
 if [[ ${c_compiler} != "toolchain_c" ]]; then
     # Fix build paths in cmake artifacts
     for fname in `ls ${PREFIX}/lib/cmake/netCDF/*`; do

diff --git a/recipe/meta.yaml b/recipe/meta.yaml
@@ -1,5 +1,5 @@
 {% set version = "4.7.4" %}
-{% set build = 1 %}
+{% set build = 2 %}
 
 # recipe-lint fails if mpi is undefined
 {% set mpi = mpi or 'nompi' %}
@@ -88,12 +88,6 @@ test:
     - test -f ${PREFIX}/lib/libnetcdf.a  # [not win]
     - test -f ${PREFIX}/lib/libnetcdf${SHLIB_EXT}  # [not win]
     - nc-config --all  # [not win]
-    # All these endpotins failed at some point due to various reasons.
-    #- ncdump -h "http://geoport-dev.whoi.edu/thredds/dodsC/estofs/atlantic"
-    #- ncdump -h "https://data.nodc.noaa.gov/thredds/dodsC/ioos/sccoos/scripps_pier/scripps_pier-2016.nc"
-    #- ncdump -h "http://oos.soest.hawaii.edu/thredds/dodsC/hioos/model/atm/ncep_pac/NCEP_Pacific_Atmospheric_Model_best.ncd"
-    #- ncdump -h "http://oos.soest.hawaii.edu/thredds/dodsC/usgs_dem_10m_tinian"
-    #- ncdump -h "https://www.ncei.noaa.gov/thredds/dodsC/namanl/201609/20160929/namanl_218_20160929_1800_006.grb"
 
 about:
   home: http://www.unidata.ucar.edu/software/netcdf/
-Original file line number
+Diff line change
@@ Expand Up / @@ -11,11 +11,11 @@ channel_sources: @@
     channel_targets:
     - conda-forge main
     curl:
-    - '7.64'
+    - '7'
     hdf4:
     - '4.2'
     hdf5:
-    - 1.10.5
+    - 1.10.6
     jpeg:
     - '9'
     macos_machine:
@@ Expand Down @@