Merge pull request #178 from zklaus/improve-reqs

Improve requirements
conda-forge · Jul 5, 2023 · 3435c60 · 3435c60
2 parents 29076af + 43bbb75
commit 3435c60
Show file tree

Hide file tree

Showing 20 changed files with 345 additions and 88 deletions.
diff --git a/.ci_support/linux_64_mpimpich.yaml b/.ci_support/linux_64_mpimpich.yaml
@@ -10,8 +10,6 @@ channel_sources:
 - conda-forge
 channel_targets:
 - conda-forge main
-curl:
-- '8'
 cxx_compiler:
 - gxx
 cxx_compiler_version:
@@ -22,8 +20,10 @@ hdf4:
 - 4.2.15
 hdf5:
 - 1.14.1
-libjpeg_turbo:
-- 2.1.5
+libaec:
+- '1'
+libcurl:
+- '8'
 libxml2:
 - '2.11'
 libzip:

diff --git a/.ci_support/linux_64_mpinompi.yaml b/.ci_support/linux_64_mpinompi.yaml
@@ -10,8 +10,6 @@ channel_sources:
 - conda-forge
 channel_targets:
 - conda-forge main
-curl:
-- '8'
 cxx_compiler:
 - gxx
 cxx_compiler_version:
@@ -22,8 +20,10 @@ hdf4:
 - 4.2.15
 hdf5:
 - 1.14.1
-libjpeg_turbo:
-- 2.1.5
+libaec:
+- '1'
+libcurl:
+- '8'
 libxml2:
 - '2.11'
 libzip:

diff --git a/.ci_support/linux_64_mpiopenmpi.yaml b/.ci_support/linux_64_mpiopenmpi.yaml
@@ -10,8 +10,6 @@ channel_sources:
 - conda-forge
 channel_targets:
 - conda-forge main
-curl:
-- '8'
 cxx_compiler:
 - gxx
 cxx_compiler_version:
@@ -22,8 +20,10 @@ hdf4:
 - 4.2.15
 hdf5:
 - 1.14.1
-libjpeg_turbo:
-- 2.1.5
+libaec:
+- '1'
+libcurl:
+- '8'
 libxml2:
 - '2.11'
 libzip:

diff --git a/.ci_support/linux_aarch64_mpimpich.yaml b/.ci_support/linux_aarch64_mpimpich.yaml
@@ -14,8 +14,6 @@ channel_sources:
 - conda-forge
 channel_targets:
 - conda-forge main
-curl:
-- '8'
 cxx_compiler:
 - gxx
 cxx_compiler_version:
@@ -26,8 +24,10 @@ hdf4:
 - 4.2.15
 hdf5:
 - 1.14.1
-libjpeg_turbo:
-- 2.1.5
+libaec:
+- '1'
+libcurl:
+- '8'
 libxml2:
 - '2.11'
 libzip:

diff --git a/.ci_support/linux_aarch64_mpinompi.yaml b/.ci_support/linux_aarch64_mpinompi.yaml
@@ -14,8 +14,6 @@ channel_sources:
 - conda-forge
 channel_targets:
 - conda-forge main
-curl:
-- '8'
 cxx_compiler:
 - gxx
 cxx_compiler_version:
@@ -26,8 +24,10 @@ hdf4:
 - 4.2.15
 hdf5:
 - 1.14.1
-libjpeg_turbo:
-- 2.1.5
+libaec:
+- '1'
+libcurl:
+- '8'
 libxml2:
 - '2.11'
 libzip:

diff --git a/.ci_support/linux_aarch64_mpiopenmpi.yaml b/.ci_support/linux_aarch64_mpiopenmpi.yaml
@@ -14,8 +14,6 @@ channel_sources:
 - conda-forge
 channel_targets:
 - conda-forge main
-curl:
-- '8'
 cxx_compiler:
 - gxx
 cxx_compiler_version:
@@ -26,8 +24,10 @@ hdf4:
 - 4.2.15
 hdf5:
 - 1.14.1
-libjpeg_turbo:
-- 2.1.5
+libaec:
+- '1'
+libcurl:
+- '8'
 libxml2:
 - '2.11'
 libzip:

diff --git a/.ci_support/linux_ppc64le_mpimpich.yaml b/.ci_support/linux_ppc64le_mpimpich.yaml
@@ -10,8 +10,6 @@ channel_sources:
 - conda-forge
 channel_targets:
 - conda-forge main
-curl:
-- '8'
 cxx_compiler:
 - gxx
 cxx_compiler_version:
@@ -22,8 +20,10 @@ hdf4:
 - 4.2.15
 hdf5:
 - 1.14.1
-libjpeg_turbo:
-- 2.1.5
+libaec:
+- '1'
+libcurl:
+- '8'
 libxml2:
 - '2.11'
 libzip:

diff --git a/.ci_support/linux_ppc64le_mpinompi.yaml b/.ci_support/linux_ppc64le_mpinompi.yaml
@@ -10,8 +10,6 @@ channel_sources:
 - conda-forge
 channel_targets:
 - conda-forge main
-curl:
-- '8'
 cxx_compiler:
 - gxx
 cxx_compiler_version:
@@ -22,8 +20,10 @@ hdf4:
 - 4.2.15
 hdf5:
 - 1.14.1
-libjpeg_turbo:
-- 2.1.5
+libaec:
+- '1'
+libcurl:
+- '8'
 libxml2:
 - '2.11'
 libzip:

diff --git a/.ci_support/linux_ppc64le_mpiopenmpi.yaml b/.ci_support/linux_ppc64le_mpiopenmpi.yaml
@@ -10,8 +10,6 @@ channel_sources:
 - conda-forge
 channel_targets:
 - conda-forge main
-curl:
-- '8'
 cxx_compiler:
 - gxx
 cxx_compiler_version:
@@ -22,8 +20,10 @@ hdf4:
 - 4.2.15
 hdf5:
 - 1.14.1
-libjpeg_turbo:
-- 2.1.5
+libaec:
+- '1'
+libcurl:
+- '8'
 libxml2:
 - '2.11'
 libzip:

diff --git a/.ci_support/osx_64_mpimpich.yaml b/.ci_support/osx_64_mpimpich.yaml
@@ -10,8 +10,6 @@ channel_sources:
 - conda-forge
 channel_targets:
 - conda-forge main
-curl:
-- '8'
 cxx_compiler:
 - clangxx
 cxx_compiler_version:
@@ -20,8 +18,10 @@ hdf4:
 - 4.2.15
 hdf5:
 - 1.14.1
-libjpeg_turbo:
-- 2.1.5
+libaec:
+- '1'
+libcurl:
+- '8'
 libxml2:
 - '2.11'
 libzip:

diff --git a/.ci_support/osx_64_mpinompi.yaml b/.ci_support/osx_64_mpinompi.yaml
@@ -10,8 +10,6 @@ channel_sources:
 - conda-forge
 channel_targets:
 - conda-forge main
-curl:
-- '8'
 cxx_compiler:
 - clangxx
 cxx_compiler_version:
@@ -20,8 +18,10 @@ hdf4:
 - 4.2.15
 hdf5:
 - 1.14.1
-libjpeg_turbo:
-- 2.1.5
+libaec:
+- '1'
+libcurl:
+- '8'
 libxml2:
 - '2.11'
 libzip:

diff --git a/.ci_support/osx_64_mpiopenmpi.yaml b/.ci_support/osx_64_mpiopenmpi.yaml
@@ -10,8 +10,6 @@ channel_sources:
 - conda-forge
 channel_targets:
 - conda-forge main
-curl:
-- '8'
 cxx_compiler:
 - clangxx
 cxx_compiler_version:
@@ -20,8 +18,10 @@ hdf4:
 - 4.2.15
 hdf5:
 - 1.14.1
-libjpeg_turbo:
-- 2.1.5
+libaec:
+- '1'
+libcurl:
+- '8'
 libxml2:
 - '2.11'
 libzip:

diff --git a/.ci_support/osx_arm64_mpimpich.yaml b/.ci_support/osx_arm64_mpimpich.yaml
@@ -10,8 +10,6 @@ channel_sources:
 - conda-forge
 channel_targets:
 - conda-forge main
-curl:
-- '8'
 cxx_compiler:
 - clangxx
 cxx_compiler_version:
@@ -20,8 +18,10 @@ hdf4:
 - 4.2.15
 hdf5:
 - 1.14.1
-libjpeg_turbo:
-- 2.1.5
+libaec:
+- '1'
+libcurl:
+- '8'
 libxml2:
 - '2.11'
 libzip:

diff --git a/.ci_support/osx_arm64_mpinompi.yaml b/.ci_support/osx_arm64_mpinompi.yaml
@@ -10,8 +10,6 @@ channel_sources:
 - conda-forge
 channel_targets:
 - conda-forge main
-curl:
-- '8'
 cxx_compiler:
 - clangxx
 cxx_compiler_version:
@@ -20,8 +18,10 @@ hdf4:
 - 4.2.15
 hdf5:
 - 1.14.1
-libjpeg_turbo:
-- 2.1.5
+libaec:
+- '1'
+libcurl:
+- '8'
 libxml2:
 - '2.11'
 libzip:

diff --git a/.ci_support/osx_arm64_mpiopenmpi.yaml b/.ci_support/osx_arm64_mpiopenmpi.yaml
@@ -10,8 +10,6 @@ channel_sources:
 - conda-forge
 channel_targets:
 - conda-forge main
-curl:
-- '8'
 cxx_compiler:
 - clangxx
 cxx_compiler_version:
@@ -20,8 +18,10 @@ hdf4:
 - 4.2.15
 hdf5:
 - 1.14.1
-libjpeg_turbo:
-- 2.1.5
+libaec:
+- '1'
+libcurl:
+- '8'
 libxml2:
 - '2.11'
 libzip:

diff --git a/.ci_support/win_64_.yaml b/.ci_support/win_64_.yaml
@@ -6,16 +6,16 @@ channel_sources:
 - conda-forge
 channel_targets:
 - conda-forge main
-curl:
-- '8'
 cxx_compiler:
 - vs2019
 hdf4:
 - 4.2.15
 hdf5:
 - 1.14.1
-libjpeg_turbo:
-- 2.1.5
+libaec:
+- '1'
+libcurl:
+- '8'
 libxml2:
 - '2.11'
 libzip:

diff --git a/recipe/bld.bat b/recipe/bld.bat
@@ -5,25 +5,37 @@ set BUILD_TYPE=Release
 :: set BUILD_TYPE=RelWithDebInfo
 :: set BUILD_TYPE=Debug
 
+rem to be filled with mpi options
+set PARALLEL=""
+
 rem manually specify hdf5 paths to work-around https://github.com/Unidata/netcdf-c/issues/1444
 cmake -LAH -G "NMake Makefiles" ^
+      %CMAKE_ARGS% ^
       -DCMAKE_INSTALL_PREFIX="%LIBRARY_PREFIX%" ^
+      -DCMAKE_PREFIX_PATH="%LIBRARY_PREFIX%" ^
+      -DCMAKE_BUILD_TYPE=%BUILD_TYPE% ^
       -DBUILD_SHARED_LIBS=ON ^
-      -DPLUGIN_INSTALL_DIR=YES ^
+      -DBUILD_UTILITIES=ON ^
+      -DENABLE_DOXYGEN=OFF ^
       -DENABLE_TESTS=ON ^
+      -DENABLE_EXTERNAL_SERVER_TESTS=OFF ^
+      -DENABLE_DAP=ON ^
+      -DENABLE_DAP_REMOTE_TESTS=OFF ^
       -DENABLE_HDF4=ON ^
-      -DCMAKE_PREFIX_PATH="%LIBRARY_PREFIX%" ^
-      -DCMAKE_BUILD_TYPE=%BUILD_TYPE% ^
+      -DENABLE_NETCDF_4=ON ^
+      -DENABLE_PLUGIN_INSTALL=ON ^
+      -DPLUGIN_INSTALL_DIR=YES ^
       -DENABLE_CDF5=ON ^
       -DENABLE_BYTERANGE=ON ^
+      -DENABLE_NCZARR=on ^
+      -DENABLE_NCZARR_ZIP=on ^
+      -DENABLE_NCZARR_S3=off ^
+      -DENABLE_NCZARR_S3_TESTS=off ^
       -DHDF5_C_LIBRARY="%LIBRARY_LIB:\=/%/hdf5.lib" ^
       -DHDF5_HL_LIBRARY="%LIBRARY_LIB:\=/%/hdf5_hl.lib" ^
       -DHDF5_INCLUDE_DIR="%LIBRARY_INC:\=/%" ^
       -DCMAKE_C_FLAGS="-DH5_BUILT_AS_DYNAMIC_LIB" ^
-      -DENABLE_NCZARR=on ^
-      -DENABLE_NCZARR_S3=off ^
-      -DENABLE_NCZARR_S3_TESTS=off ^
-      -DENABLE_EXTERNAL_SERVER_TESTS=OFF ^
+      %PARALLEL% ^
       %SRC_DIR%
 if errorlevel 1 exit \b 1