Merge pull request #180 from zklaus/feature-s3

Add S3 support
conda-forge · Jul 17, 2023 · 71e9afd · 71e9afd
2 parents 3435c60 + 8d185b8
commit 71e9afd
Show file tree

Hide file tree

Showing 19 changed files with 68 additions and 3 deletions.
diff --git a/.ci_support/linux_64_mpimpich.yaml b/.ci_support/linux_64_mpimpich.yaml
@@ -1,3 +1,5 @@
+aws_sdk_cpp:
+- 1.10.57
 bzip2:
 - '1'
 c_compiler:
@@ -34,6 +36,8 @@ mpich:
 - '4'
 openmpi:
 - '4'
+openssl:
+- '3'
 target_platform:
 - linux-64
 zip_keys:

diff --git a/.ci_support/linux_64_mpinompi.yaml b/.ci_support/linux_64_mpinompi.yaml
@@ -1,3 +1,5 @@
+aws_sdk_cpp:
+- 1.10.57
 bzip2:
 - '1'
 c_compiler:
@@ -34,6 +36,8 @@ mpich:
 - '4'
 openmpi:
 - '4'
+openssl:
+- '3'
 target_platform:
 - linux-64
 zip_keys:

diff --git a/.ci_support/linux_64_mpiopenmpi.yaml b/.ci_support/linux_64_mpiopenmpi.yaml
@@ -1,3 +1,5 @@
+aws_sdk_cpp:
+- 1.10.57
 bzip2:
 - '1'
 c_compiler:
@@ -34,6 +36,8 @@ mpich:
 - '4'
 openmpi:
 - '4'
+openssl:
+- '3'
 target_platform:
 - linux-64
 zip_keys:

diff --git a/.ci_support/linux_aarch64_mpimpich.yaml b/.ci_support/linux_aarch64_mpimpich.yaml
@@ -1,5 +1,7 @@
 BUILD:
 - aarch64-conda_cos7-linux-gnu
+aws_sdk_cpp:
+- 1.10.57
 bzip2:
 - '1'
 c_compiler:
@@ -38,6 +40,8 @@ mpich:
 - '4'
 openmpi:
 - '4'
+openssl:
+- '3'
 target_platform:
 - linux-aarch64
 zip_keys:

diff --git a/.ci_support/linux_aarch64_mpinompi.yaml b/.ci_support/linux_aarch64_mpinompi.yaml
@@ -1,5 +1,7 @@
 BUILD:
 - aarch64-conda_cos7-linux-gnu
+aws_sdk_cpp:
+- 1.10.57
 bzip2:
 - '1'
 c_compiler:
@@ -38,6 +40,8 @@ mpich:
 - '4'
 openmpi:
 - '4'
+openssl:
+- '3'
 target_platform:
 - linux-aarch64
 zip_keys:

diff --git a/.ci_support/linux_aarch64_mpiopenmpi.yaml b/.ci_support/linux_aarch64_mpiopenmpi.yaml
@@ -1,5 +1,7 @@
 BUILD:
 - aarch64-conda_cos7-linux-gnu
+aws_sdk_cpp:
+- 1.10.57
 bzip2:
 - '1'
 c_compiler:
@@ -38,6 +40,8 @@ mpich:
 - '4'
 openmpi:
 - '4'
+openssl:
+- '3'
 target_platform:
 - linux-aarch64
 zip_keys:

diff --git a/.ci_support/linux_ppc64le_mpimpich.yaml b/.ci_support/linux_ppc64le_mpimpich.yaml
@@ -1,3 +1,5 @@
+aws_sdk_cpp:
+- 1.10.57
 bzip2:
 - '1'
 c_compiler:
@@ -34,6 +36,8 @@ mpich:
 - '4'
 openmpi:
 - '4'
+openssl:
+- '3'
 target_platform:
 - linux-ppc64le
 zip_keys:

diff --git a/.ci_support/linux_ppc64le_mpinompi.yaml b/.ci_support/linux_ppc64le_mpinompi.yaml
@@ -1,3 +1,5 @@
+aws_sdk_cpp:
+- 1.10.57
 bzip2:
 - '1'
 c_compiler:
@@ -34,6 +36,8 @@ mpich:
 - '4'
 openmpi:
 - '4'
+openssl:
+- '3'
 target_platform:
 - linux-ppc64le
 zip_keys:

diff --git a/.ci_support/linux_ppc64le_mpiopenmpi.yaml b/.ci_support/linux_ppc64le_mpiopenmpi.yaml
@@ -1,3 +1,5 @@
+aws_sdk_cpp:
+- 1.10.57
 bzip2:
 - '1'
 c_compiler:
@@ -34,6 +36,8 @@ mpich:
 - '4'
 openmpi:
 - '4'
+openssl:
+- '3'
 target_platform:
 - linux-ppc64le
 zip_keys:

diff --git a/.ci_support/osx_64_mpimpich.yaml b/.ci_support/osx_64_mpimpich.yaml
@@ -1,5 +1,7 @@
 MACOSX_DEPLOYMENT_TARGET:
 - '10.9'
+aws_sdk_cpp:
+- 1.10.57
 bzip2:
 - '1'
 c_compiler:
@@ -34,6 +36,8 @@ mpich:
 - '4'
 openmpi:
 - '4'
+openssl:
+- '3'
 target_platform:
 - osx-64
 zip_keys:

diff --git a/.ci_support/osx_64_mpinompi.yaml b/.ci_support/osx_64_mpinompi.yaml
@@ -1,5 +1,7 @@
 MACOSX_DEPLOYMENT_TARGET:
 - '10.9'
+aws_sdk_cpp:
+- 1.10.57
 bzip2:
 - '1'
 c_compiler:
@@ -34,6 +36,8 @@ mpich:
 - '4'
 openmpi:
 - '4'
+openssl:
+- '3'
 target_platform:
 - osx-64
 zip_keys:

diff --git a/.ci_support/osx_64_mpiopenmpi.yaml b/.ci_support/osx_64_mpiopenmpi.yaml
@@ -1,5 +1,7 @@
 MACOSX_DEPLOYMENT_TARGET:
 - '10.9'
+aws_sdk_cpp:
+- 1.10.57
 bzip2:
 - '1'
 c_compiler:
@@ -34,6 +36,8 @@ mpich:
 - '4'
 openmpi:
 - '4'
+openssl:
+- '3'
 target_platform:
 - osx-64
 zip_keys:

diff --git a/.ci_support/osx_arm64_mpimpich.yaml b/.ci_support/osx_arm64_mpimpich.yaml
@@ -1,5 +1,7 @@
 MACOSX_DEPLOYMENT_TARGET:
 - '11.0'
+aws_sdk_cpp:
+- 1.10.57
 bzip2:
 - '1'
 c_compiler:
@@ -34,6 +36,8 @@ mpich:
 - '4'
 openmpi:
 - '4'
+openssl:
+- '3'
 target_platform:
 - osx-arm64
 zip_keys:

diff --git a/.ci_support/osx_arm64_mpinompi.yaml b/.ci_support/osx_arm64_mpinompi.yaml
@@ -1,5 +1,7 @@
 MACOSX_DEPLOYMENT_TARGET:
 - '11.0'
+aws_sdk_cpp:
+- 1.10.57
 bzip2:
 - '1'
 c_compiler:
@@ -34,6 +36,8 @@ mpich:
 - '4'
 openmpi:
 - '4'
+openssl:
+- '3'
 target_platform:
 - osx-arm64
 zip_keys:

diff --git a/.ci_support/osx_arm64_mpiopenmpi.yaml b/.ci_support/osx_arm64_mpiopenmpi.yaml
@@ -1,5 +1,7 @@
 MACOSX_DEPLOYMENT_TARGET:
 - '11.0'
+aws_sdk_cpp:
+- 1.10.57
 bzip2:
 - '1'
 c_compiler:
@@ -34,6 +36,8 @@ mpich:
 - '4'
 openmpi:
 - '4'
+openssl:
+- '3'
 target_platform:
 - osx-arm64
 zip_keys:

diff --git a/.ci_support/win_64_.yaml b/.ci_support/win_64_.yaml
@@ -1,3 +1,5 @@
+aws_sdk_cpp:
+- 1.10.57
 bzip2:
 - '1'
 c_compiler:

diff --git a/recipe/bld.bat b/recipe/bld.bat
@@ -29,8 +29,9 @@ cmake -LAH -G "NMake Makefiles" ^
       -DENABLE_BYTERANGE=ON ^
       -DENABLE_NCZARR=on ^
       -DENABLE_NCZARR_ZIP=on ^
-      -DENABLE_NCZARR_S3=off ^
+      -DENABLE_NCZARR_S3=on ^
       -DENABLE_NCZARR_S3_TESTS=off ^
+      -DENABLE_S3_SDK=on ^
       -DHDF5_C_LIBRARY="%LIBRARY_LIB:\=/%/hdf5.lib" ^
       -DHDF5_HL_LIBRARY="%LIBRARY_LIB:\=/%/hdf5_hl.lib" ^
       -DHDF5_INCLUDE_DIR="%LIBRARY_INC:\=/%" ^

diff --git a/recipe/build.sh b/recipe/build.sh
@@ -80,8 +80,9 @@ cmake ${CMAKE_ARGS} \
       -DENABLE_BYTERANGE=ON \
       -DENABLE_NCZARR=on \
       -DENABLE_NCZARR_ZIP=on \
-      -DENABLE_NCZARR_S3=off \
+      -DENABLE_NCZARR_S3=on \
       -DENABLE_NCZARR_S3_TESTS=off \
+      -DENABLE_S3_SDK=on \
       ${PARALLEL} \
       ${SRC_DIR}
 make install -j${CPU_COUNT} ${VERBOSE_CM}

diff --git a/recipe/meta.yaml b/recipe/meta.yaml
@@ -1,5 +1,5 @@
 {% set version = "4.9.2" %}
-{% set build = 7 %}
+{% set build = 8 %}
 
 # recipe-lint fails if mpi is undefined
 {% set mpi = mpi or 'nompi' %}
@@ -83,6 +83,7 @@ requirements:
     - openssl  # [unix]
     - zlib
     - zstd
+    - aws-sdk-cpp
 
 test:
   commands: