From f0fec05a604a4ee91aae8c90c16a5f88512148e8 Mon Sep 17 00:00:00 2001 From: akrherz Date: Tue, 29 Aug 2023 11:56:09 -0500 Subject: [PATCH 1/3] Revert "Add S3 flags" This reverts commit 02fc7fee4fc70efdcd904b7b420fa172543534d9. --- recipe/bld.bat | 4 ++-- recipe/build.sh | 4 ++-- recipe/meta.yaml | 1 - 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/recipe/bld.bat b/recipe/bld.bat index ffc7eed6..b08e68ad 100644 --- a/recipe/bld.bat +++ b/recipe/bld.bat @@ -29,9 +29,9 @@ cmake -LAH -G "NMake Makefiles" ^ -DENABLE_BYTERANGE=ON ^ -DENABLE_NCZARR=on ^ -DENABLE_NCZARR_ZIP=on ^ - -DENABLE_NCZARR_S3=on ^ + -DENABLE_NCZARR_S3=off ^ -DENABLE_NCZARR_S3_TESTS=off ^ - -DENABLE_S3_SDK=on ^ + -DENABLE_S3_SDK=off ^ -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 36e46139..c69d7d64 100644 --- a/recipe/build.sh +++ b/recipe/build.sh @@ -80,9 +80,9 @@ cmake ${CMAKE_ARGS} \ -DENABLE_BYTERANGE=ON \ -DENABLE_NCZARR=on \ -DENABLE_NCZARR_ZIP=on \ - -DENABLE_NCZARR_S3=on \ + -DENABLE_NCZARR_S3=off \ -DENABLE_NCZARR_S3_TESTS=off \ - -DENABLE_S3_SDK=on \ + -DENABLE_S3_SDK=off \ ${PARALLEL} \ ${SRC_DIR} make install -j${CPU_COUNT} ${VERBOSE_CM} diff --git a/recipe/meta.yaml b/recipe/meta.yaml index c00d8f12..7f11575f 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -84,7 +84,6 @@ requirements: - openssl # [unix] - zlib - zstd - - aws-sdk-cpp test: commands: From 7da37dffd18c64d9242b1ff366eed938b51be0e1 Mon Sep 17 00:00:00 2001 From: akrherz Date: Tue, 29 Aug 2023 11:56:22 -0500 Subject: [PATCH 2/3] 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 7f11575f..ff0c8bce 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -1,5 +1,5 @@ {% set version = "4.9.2" %} -{% set build = 10 %} +{% set build = 11 %} # recipe-lint fails if mpi is undefined {% set mpi = mpi or 'nompi' %} From 69e473102ccd53a64b2ea09b00c0f355bdf1ef58 Mon Sep 17 00:00:00 2001 From: "conda-forge-webservices[bot]" <91080706+conda-forge-webservices[bot]@users.noreply.github.com> Date: Tue, 29 Aug 2023 16:59:42 +0000 Subject: [PATCH 3/3] MNT: Re-rendered with conda-build 3.26.1, conda-smithy 3.24.1, and conda-forge-pinning 2023.08.29.11.33.45 --- .ci_support/linux_64_mpimpich.yaml | 2 -- .ci_support/linux_64_mpinompi.yaml | 2 -- .ci_support/linux_64_mpiopenmpi.yaml | 2 -- .ci_support/linux_aarch64_mpimpich.yaml | 2 -- .ci_support/linux_aarch64_mpinompi.yaml | 2 -- .ci_support/linux_aarch64_mpiopenmpi.yaml | 2 -- .ci_support/linux_ppc64le_mpimpich.yaml | 2 -- .ci_support/linux_ppc64le_mpinompi.yaml | 2 -- .ci_support/linux_ppc64le_mpiopenmpi.yaml | 2 -- .ci_support/osx_64_mpimpich.yaml | 2 -- .ci_support/osx_64_mpinompi.yaml | 2 -- .ci_support/osx_64_mpiopenmpi.yaml | 2 -- .ci_support/osx_arm64_mpimpich.yaml | 2 -- .ci_support/osx_arm64_mpinompi.yaml | 2 -- .ci_support/osx_arm64_mpiopenmpi.yaml | 2 -- .ci_support/win_64_.yaml | 2 -- 16 files changed, 32 deletions(-) diff --git a/.ci_support/linux_64_mpimpich.yaml b/.ci_support/linux_64_mpimpich.yaml index 19322efa..179a0a7c 100644 --- a/.ci_support/linux_64_mpimpich.yaml +++ b/.ci_support/linux_64_mpimpich.yaml @@ -1,5 +1,3 @@ -aws_sdk_cpp: -- 1.10.57 bzip2: - '1' c_compiler: diff --git a/.ci_support/linux_64_mpinompi.yaml b/.ci_support/linux_64_mpinompi.yaml index 73fb95d1..087cca3c 100644 --- a/.ci_support/linux_64_mpinompi.yaml +++ b/.ci_support/linux_64_mpinompi.yaml @@ -1,5 +1,3 @@ -aws_sdk_cpp: -- 1.10.57 bzip2: - '1' c_compiler: diff --git a/.ci_support/linux_64_mpiopenmpi.yaml b/.ci_support/linux_64_mpiopenmpi.yaml index 231116e4..e584bf2c 100644 --- a/.ci_support/linux_64_mpiopenmpi.yaml +++ b/.ci_support/linux_64_mpiopenmpi.yaml @@ -1,5 +1,3 @@ -aws_sdk_cpp: -- 1.10.57 bzip2: - '1' c_compiler: diff --git a/.ci_support/linux_aarch64_mpimpich.yaml b/.ci_support/linux_aarch64_mpimpich.yaml index c387e68c..684c3556 100644 --- a/.ci_support/linux_aarch64_mpimpich.yaml +++ b/.ci_support/linux_aarch64_mpimpich.yaml @@ -1,7 +1,5 @@ BUILD: - aarch64-conda_cos7-linux-gnu -aws_sdk_cpp: -- 1.10.57 bzip2: - '1' c_compiler: diff --git a/.ci_support/linux_aarch64_mpinompi.yaml b/.ci_support/linux_aarch64_mpinompi.yaml index 11d4c447..1148c1f5 100644 --- a/.ci_support/linux_aarch64_mpinompi.yaml +++ b/.ci_support/linux_aarch64_mpinompi.yaml @@ -1,7 +1,5 @@ BUILD: - aarch64-conda_cos7-linux-gnu -aws_sdk_cpp: -- 1.10.57 bzip2: - '1' c_compiler: diff --git a/.ci_support/linux_aarch64_mpiopenmpi.yaml b/.ci_support/linux_aarch64_mpiopenmpi.yaml index d890eabe..c3e60b62 100644 --- a/.ci_support/linux_aarch64_mpiopenmpi.yaml +++ b/.ci_support/linux_aarch64_mpiopenmpi.yaml @@ -1,7 +1,5 @@ BUILD: - aarch64-conda_cos7-linux-gnu -aws_sdk_cpp: -- 1.10.57 bzip2: - '1' c_compiler: diff --git a/.ci_support/linux_ppc64le_mpimpich.yaml b/.ci_support/linux_ppc64le_mpimpich.yaml index 731f043b..1ea19842 100644 --- a/.ci_support/linux_ppc64le_mpimpich.yaml +++ b/.ci_support/linux_ppc64le_mpimpich.yaml @@ -1,5 +1,3 @@ -aws_sdk_cpp: -- 1.10.57 bzip2: - '1' c_compiler: diff --git a/.ci_support/linux_ppc64le_mpinompi.yaml b/.ci_support/linux_ppc64le_mpinompi.yaml index e316fa68..0893212a 100644 --- a/.ci_support/linux_ppc64le_mpinompi.yaml +++ b/.ci_support/linux_ppc64le_mpinompi.yaml @@ -1,5 +1,3 @@ -aws_sdk_cpp: -- 1.10.57 bzip2: - '1' c_compiler: diff --git a/.ci_support/linux_ppc64le_mpiopenmpi.yaml b/.ci_support/linux_ppc64le_mpiopenmpi.yaml index 1d0a8b0d..eecd35af 100644 --- a/.ci_support/linux_ppc64le_mpiopenmpi.yaml +++ b/.ci_support/linux_ppc64le_mpiopenmpi.yaml @@ -1,5 +1,3 @@ -aws_sdk_cpp: -- 1.10.57 bzip2: - '1' c_compiler: diff --git a/.ci_support/osx_64_mpimpich.yaml b/.ci_support/osx_64_mpimpich.yaml index c31ed137..87682f92 100644 --- a/.ci_support/osx_64_mpimpich.yaml +++ b/.ci_support/osx_64_mpimpich.yaml @@ -1,7 +1,5 @@ MACOSX_DEPLOYMENT_TARGET: - '10.9' -aws_sdk_cpp: -- 1.10.57 bzip2: - '1' c_compiler: diff --git a/.ci_support/osx_64_mpinompi.yaml b/.ci_support/osx_64_mpinompi.yaml index 1a24c70c..0d8aaad2 100644 --- a/.ci_support/osx_64_mpinompi.yaml +++ b/.ci_support/osx_64_mpinompi.yaml @@ -1,7 +1,5 @@ MACOSX_DEPLOYMENT_TARGET: - '10.9' -aws_sdk_cpp: -- 1.10.57 bzip2: - '1' c_compiler: diff --git a/.ci_support/osx_64_mpiopenmpi.yaml b/.ci_support/osx_64_mpiopenmpi.yaml index 9c12b753..480a8d64 100644 --- a/.ci_support/osx_64_mpiopenmpi.yaml +++ b/.ci_support/osx_64_mpiopenmpi.yaml @@ -1,7 +1,5 @@ MACOSX_DEPLOYMENT_TARGET: - '10.9' -aws_sdk_cpp: -- 1.10.57 bzip2: - '1' c_compiler: diff --git a/.ci_support/osx_arm64_mpimpich.yaml b/.ci_support/osx_arm64_mpimpich.yaml index 2663b4c9..f2481161 100644 --- a/.ci_support/osx_arm64_mpimpich.yaml +++ b/.ci_support/osx_arm64_mpimpich.yaml @@ -1,7 +1,5 @@ MACOSX_DEPLOYMENT_TARGET: - '11.0' -aws_sdk_cpp: -- 1.10.57 bzip2: - '1' c_compiler: diff --git a/.ci_support/osx_arm64_mpinompi.yaml b/.ci_support/osx_arm64_mpinompi.yaml index fa2893f6..cf815d0e 100644 --- a/.ci_support/osx_arm64_mpinompi.yaml +++ b/.ci_support/osx_arm64_mpinompi.yaml @@ -1,7 +1,5 @@ MACOSX_DEPLOYMENT_TARGET: - '11.0' -aws_sdk_cpp: -- 1.10.57 bzip2: - '1' c_compiler: diff --git a/.ci_support/osx_arm64_mpiopenmpi.yaml b/.ci_support/osx_arm64_mpiopenmpi.yaml index 0901858b..14f0fb6c 100644 --- a/.ci_support/osx_arm64_mpiopenmpi.yaml +++ b/.ci_support/osx_arm64_mpiopenmpi.yaml @@ -1,7 +1,5 @@ MACOSX_DEPLOYMENT_TARGET: - '11.0' -aws_sdk_cpp: -- 1.10.57 bzip2: - '1' c_compiler: diff --git a/.ci_support/win_64_.yaml b/.ci_support/win_64_.yaml index 4c337a72..aa835a7f 100644 --- a/.ci_support/win_64_.yaml +++ b/.ci_support/win_64_.yaml @@ -1,5 +1,3 @@ -aws_sdk_cpp: -- 1.10.57 bzip2: - '1' c_compiler: