From 02fc7fee4fc70efdcd904b7b420fa172543534d9 Mon Sep 17 00:00:00 2001 From: David Hoese Date: Thu, 22 Dec 2022 10:10:42 -0600 Subject: [PATCH 1/4] Add S3 flags --- recipe/bld.bat | 5 +++-- recipe/build.sh | 5 +++-- recipe/meta.yaml | 1 + 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/recipe/bld.bat b/recipe/bld.bat index c4009bd5..72fe0036 100644 --- 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_TESTS=off ^ + -DENABLE_NCZARR_S3=on ^ + -DENABLE_NCZARR_S3_TESTS=on ^ + -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 index 05316ee2..307c86dd 100644 --- 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_TESTS=off \ + -DENABLE_NCZARR_S3=on \ + -DENABLE_NCZARR_S3_TESTS=on \ + -DENABLE_S3_SDK=on \ ${PARALLEL} \ ${SRC_DIR} make install -j${CPU_COUNT} ${VERBOSE_CM} diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 632a0cea..7196e7ff 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -83,6 +83,7 @@ requirements: - openssl # [unix] - zlib - zstd + - aws-sdk-cpp test: commands: From cea89d95165d877f7a81335615353c3149158d81 Mon Sep 17 00:00:00 2001 From: David Hoese Date: Thu, 22 Dec 2022 10:22:20 -0600 Subject: [PATCH 2/4] Bump build number --- recipe/meta.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 7196e7ff..478294b6 100644 --- 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' %} From 1dcefc376c7ec880333e7845ef5a495bd1426c76 Mon Sep 17 00:00:00 2001 From: "conda-forge-webservices[bot]" <91080706+conda-forge-webservices[bot]@users.noreply.github.com> Date: Thu, 6 Jul 2023 10:41:52 +0000 Subject: [PATCH 3/4] MNT: Re-rendered with conda-build 3.25.0, conda-smithy 3.23.1, and conda-forge-pinning 2023.07.06.10.08.11 --- .ci_support/linux_64_mpimpich.yaml | 4 ++++ .ci_support/linux_64_mpinompi.yaml | 4 ++++ .ci_support/linux_64_mpiopenmpi.yaml | 4 ++++ .ci_support/linux_aarch64_mpimpich.yaml | 4 ++++ .ci_support/linux_aarch64_mpinompi.yaml | 4 ++++ .ci_support/linux_aarch64_mpiopenmpi.yaml | 4 ++++ .ci_support/linux_ppc64le_mpimpich.yaml | 4 ++++ .ci_support/linux_ppc64le_mpinompi.yaml | 4 ++++ .ci_support/linux_ppc64le_mpiopenmpi.yaml | 4 ++++ .ci_support/osx_64_mpimpich.yaml | 4 ++++ .ci_support/osx_64_mpinompi.yaml | 4 ++++ .ci_support/osx_64_mpiopenmpi.yaml | 4 ++++ .ci_support/osx_arm64_mpimpich.yaml | 4 ++++ .ci_support/osx_arm64_mpinompi.yaml | 4 ++++ .ci_support/osx_arm64_mpiopenmpi.yaml | 4 ++++ .ci_support/win_64_.yaml | 2 ++ 16 files changed, 62 insertions(+) diff --git a/.ci_support/linux_64_mpimpich.yaml b/.ci_support/linux_64_mpimpich.yaml index d2f57caa..b6051280 100644 --- 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 index 8bfc880d..ceb3d51b 100644 --- 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 index 00cfae9b..acca1f4c 100644 --- 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 index c7372b7b..36121f81 100644 --- 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 index 6ce9151b..27385859 100644 --- 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 index ee8c0cb1..a46d88ad 100644 --- 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 index 2fe2edd8..20fe26ba 100644 --- 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 index fe402851..03d7ecc4 100644 --- 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 index 4a14752a..cef880f2 100644 --- 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 index cda526f1..2e651156 100644 --- 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 index 639522f0..aa1dbac2 100644 --- 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 index 4b5ddc3a..7a8adae1 100644 --- 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 index b669906f..e73b88c7 100644 --- 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 index 61818791..4a750317 100644 --- 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 index eb788b99..6532bb46 100644 --- 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 index 0b3691c1..6a8880ee 100644 --- 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: From 8d185b83d72e2dfbe4d76565a1c51dcd7b8f8d8e Mon Sep 17 00:00:00 2001 From: Klaus Zimmermann Date: Thu, 6 Jul 2023 15:23:40 +0200 Subject: [PATCH 4/4] Deactivate S3 tests --- recipe/bld.bat | 2 +- recipe/build.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/recipe/bld.bat b/recipe/bld.bat index 72fe0036..ffc7eed6 100644 --- a/recipe/bld.bat +++ b/recipe/bld.bat @@ -30,7 +30,7 @@ cmake -LAH -G "NMake Makefiles" ^ -DENABLE_NCZARR=on ^ -DENABLE_NCZARR_ZIP=on ^ -DENABLE_NCZARR_S3=on ^ - -DENABLE_NCZARR_S3_TESTS=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" ^ diff --git a/recipe/build.sh b/recipe/build.sh index 307c86dd..87627df3 100644 --- a/recipe/build.sh +++ b/recipe/build.sh @@ -81,7 +81,7 @@ cmake ${CMAKE_ARGS} \ -DENABLE_NCZARR=on \ -DENABLE_NCZARR_ZIP=on \ -DENABLE_NCZARR_S3=on \ - -DENABLE_NCZARR_S3_TESTS=on \ + -DENABLE_NCZARR_S3_TESTS=off \ -DENABLE_S3_SDK=on \ ${PARALLEL} \ ${SRC_DIR}