From 22eb4c7a3bfcc9df5549c65f897727aa663ac201 Mon Sep 17 00:00:00 2001
From: Soren Rasmussen <s.c.rasmussen@gmail.com>
Date: Tue, 14 Nov 2023 17:36:48 -0700
Subject: [PATCH] ci bugfix: Using h5py>=3.4 to avoid 'H5Pset_fapl_ros3 is
 undefined' error and to work with Conda's NetCDF.

---
 .github/workflows/ci_build_scm_ubuntu_22.04.yml | 7 +++----
 .github/workflows/ci_run_scm_DEPHY.yml          | 8 ++++----
 .github/workflows/ci_run_scm_rts.yml            | 9 ++++-----
 3 files changed, 11 insertions(+), 13 deletions(-)

diff --git a/.github/workflows/ci_build_scm_ubuntu_22.04.yml b/.github/workflows/ci_build_scm_ubuntu_22.04.yml
index 66f2c93f4..6c33a30e5 100644
--- a/.github/workflows/ci_build_scm_ubuntu_22.04.yml
+++ b/.github/workflows/ci_build_scm_ubuntu_22.04.yml
@@ -37,7 +37,7 @@ jobs:
 
     #######################################################################################
     # Python setup
-    #######################################################################################    
+    #######################################################################################
     - name: Set up Python
       uses: actions/setup-python@v3
       with:
@@ -47,10 +47,9 @@ jobs:
       run: |
         echo $CONDA/bin >> $GITHUB_PATH
 
-    - name: Install python libraries
+    - name: Install NetCDF Python libraries
       run: |
-        conda install --yes -c conda-forge f90nml
-        conda install --yes -c conda-forge netCDF4
+        conda install --yes -c conda-forge h5py>=3.4 netCDF4 f90nml
 
     - name: Update system packages
       run: sudo apt-get update
diff --git a/.github/workflows/ci_run_scm_DEPHY.yml b/.github/workflows/ci_run_scm_DEPHY.yml
index 0f0463c77..eeba4c7fe 100644
--- a/.github/workflows/ci_run_scm_DEPHY.yml
+++ b/.github/workflows/ci_run_scm_DEPHY.yml
@@ -35,7 +35,7 @@ jobs:
 
     #######################################################################################
     # Python setup
-    #######################################################################################    
+    #######################################################################################
     - name: Set up Python
       uses: actions/setup-python@v3
       with:
@@ -44,10 +44,10 @@ jobs:
     - name: Add conda to system path
       run: |
         echo $CONDA/bin >> $GITHUB_PATH
-    - name: Install python libraries
+    - name: Install NetCDF Python libraries
       run: |
-        conda install --yes -c conda-forge f90nml
-        conda install --yes -c conda-forge netCDF4
+        conda install --yes -c conda-forge h5py>=3.4 netCDF4 f90nml
+
     - name: Update system packages
       run: sudo apt-get update
 
diff --git a/.github/workflows/ci_run_scm_rts.yml b/.github/workflows/ci_run_scm_rts.yml
index 436dc9379..d58a10cdd 100644
--- a/.github/workflows/ci_run_scm_rts.yml
+++ b/.github/workflows/ci_run_scm_rts.yml
@@ -39,7 +39,7 @@ jobs:
 
     #######################################################################################
     # Python setup
-    #######################################################################################    
+    #######################################################################################
     - name: Set up Python
       uses: actions/setup-python@v3
       with:
@@ -49,10 +49,9 @@ jobs:
       run: |
         echo $CONDA/bin >> $GITHUB_PATH
 
-    - name: Install python libraries
+    - name: Install NetCDF Python libraries
       run: |
-        conda install --yes -c conda-forge f90nml
-        conda install --yes -c conda-forge netCDF4
+        conda install --yes -c conda-forge h5py>=3.4 netCDF4 f90nml
 
     - name: Update system packages
       run: sudo apt-get update
@@ -198,6 +197,6 @@ jobs:
 
     - name: Upload SCM RTs as GitHub Artifact
       uses: actions/upload-artifact@v2
-      with: 
+      with:
         name: rt-baselines-${{matrix.build-type}}
         path: /home/runner/work/ccpp-scm/ccpp-scm/test/artifact-${{matrix.build-type}}