Skip to content

Array adapter unit test with potential fix#600

Merged
SkyToGround merged 2 commits intomasterfrom
repeated_array_adapter_writes
May 23, 2022
Merged

Array adapter unit test with potential fix#600
SkyToGround merged 2 commits intomasterfrom
repeated_array_adapter_writes

Conversation

@SkyToGround
Copy link
Copy Markdown
Contributor

As the title says.

@SkyToGround SkyToGround requested a review from jkotan May 23, 2022 07:16
@jkotan
Copy link
Copy Markdown
Collaborator

jkotan commented May 23, 2022

Hi @SkyToGround,
It looks like libhdf5 in conancenter is finally compiled with zlib 1.2.12 so to fix tests we need remove
my workaround (#588) by

diff --git a/.github/workflows/cmake-build.yml b/.github/workflows/cmake-build.yml
index f3000d367..08be5775e 100644
--- a/.github/workflows/cmake-build.yml
+++ b/.github/workflows/cmake-build.yml
@@ -89,9 +89,7 @@ jobs:
     strategy:
       matrix:
         shared: ["shared", "static"]
-        boost: [
-        # "boost",
-        "stdfs"]
+        boost: ["boost", "stdfs"]
     runs-on: windows-2019
     steps:
       - uses: actions/checkout@v2
@@ -141,9 +139,7 @@ jobs:
     strategy:
       matrix:
         shared: ["shared", "static"]
-        boost: [
-        # "boost",
-        "stdfs"]
+        boost: ["boost", "stdfs"]
         mpi: ["serial", "mpi"]
     runs-on: macos-10.15
     steps:
diff --git a/conanfile.py b/conanfile.py
index b25ebeaba..facd70866 100644
--- a/conanfile.py
+++ b/conanfile.py
@@ -26,9 +26,9 @@ class H5CppConan(ConanFile):
     def config_options(self):
         if self.settings.os == "Windows":
             del self.options.with_mpi
-            del self.options.with_boost
-        if self.settings.os == "Macos":
-            del self.options.with_boost
+            # del self.options.with_boost
+        # if self.settings.os == "Macos":
+        #     del self.options.with_boost
 
     def configure(self):
         if self.options.get_safe("with_mpi", False):
@@ -42,7 +42,7 @@ class H5CppConan(ConanFile):
             elif self.settings.os == "Macos":
                 self.requires("boost/1.77.0")
             else:
-                self.requires("boost/1.77.0@#35c2c19753eaadacfb846c7198919da7")
+                self.requires("boost/1.77.0")
         if self.options.get_safe("with_mpi", False):
             self.requires("openmpi/4.1.0")

@jkotan
Copy link
Copy Markdown
Collaborator

jkotan commented May 23, 2022

Hi @SkyToGround, I've just updated your PR to fix the conan github tests.

Copy link
Copy Markdown
Collaborator

@jkotan jkotan left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks. It looks good to me.

@SkyToGround SkyToGround merged commit 9a0fe52 into master May 23, 2022
@SkyToGround SkyToGround deleted the repeated_array_adapter_writes branch May 23, 2022 12:29
@jkotan jkotan mentioned this pull request May 23, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants