Merge branch 'develop' into release

brtnfld · May 17, 2024 · c257700 · c257700
2 parents 97713af + 6c16791
commit c257700
Show file tree

Hide file tree

Showing 7 changed files with 23 additions and 21 deletions.
diff --git a/.github/workflows/cmake-bintest.yml b/.github/workflows/cmake-bintest.yml
@@ -163,7 +163,7 @@ jobs:
       - name: Get published binary (MacOS)
         uses: actions/download-artifact@65a9edc5881444af0b9093a5e628f2fe47ea3b2e # v4.1.7
         with:
-              name: tgz-osx12-${{ inputs.build_mode }}-binary
+              name: tgz-osx-${{ inputs.build_mode }}-binary
               path: ${{ github.workspace }}
 
       - name: Uncompress hdf5 binary (MacOS)
@@ -189,12 +189,12 @@ jobs:
               ls ${{ runner.workspace }}
 
       # symlinks the compiler executables to a common location 
-      - name: Setup GNU Fortran
-        uses: fortran-lang/setup-fortran@v1
-        id: setup-fortran
-        with:
-          compiler: gcc
-          version: 12
+      # - name: Setup GNU Fortran
+      #   uses: fortran-lang/setup-fortran@v1
+      #   id: setup-fortran
+      #   with:
+      #     compiler: gcc
+      #     version: 12
 
       - name: Run ctest (MacOS)
         id: run-ctest

diff --git a/.github/workflows/cmake-ctest.yml b/.github/workflows/cmake-ctest.yml
@@ -308,7 +308,7 @@ jobs:
           cp ${{ runner.workspace }}/hdf5/build/${{ inputs.preset_name }}-Clang/README.md ${{ runner.workspace }}/build/hdf5
           cp ${{ runner.workspace }}/hdf5/build/${{ inputs.preset_name }}-Clang/*.tar.gz ${{ runner.workspace }}/build/hdf5
           cd "${{ runner.workspace }}/build"
-          tar -zcvf ${{ steps.set-file-base.outputs.FILE_BASE }}-osx12.tar.gz hdf5
+          tar -zcvf ${{ steps.set-file-base.outputs.FILE_BASE }}-osx.tar.gz hdf5
         shell: bash
 
       - name: List files in the space (MacOS)
@@ -320,8 +320,8 @@ jobs:
       - name: Save published binary (MacOS)
         uses: actions/upload-artifact@v4
         with:
-              name: tgz-osx12-binary
-              path: ${{ runner.workspace }}/build/${{ steps.set-file-base.outputs.FILE_BASE }}-osx12.tar.gz
+              name: tgz-osx-binary
+              path: ${{ runner.workspace }}/build/${{ steps.set-file-base.outputs.FILE_BASE }}-osx.tar.gz
               if-no-files-found: error # 'warn' or 'ignore' are also available, defaults to `warn`
 
   build_and_test_S3_linux:

diff --git a/.github/workflows/h5py.yml b/.github/workflows/h5py.yml
@@ -11,11 +11,6 @@ jobs:
   build:
     runs-on: ubuntu-latest
     steps:
-    - name: Install Fortran
-      uses: fortran-lang/setup-fortran@v1
-      with:
-        compiler: gcc
-        version: 13
     - name: Checkout Spack
       uses: actions/[email protected]
       with:

diff --git a/.github/workflows/main-cmake.yml b/.github/workflows/main-cmake.yml
@@ -261,7 +261,7 @@ jobs:
       - name: Save published binary (Mac)
         uses: actions/upload-artifact@v4
         with:
-              name: tgz-osx12-${{ inputs.build_mode }}-binary
+              name: tgz-osx-${{ inputs.build_mode }}-binary
               path: ${{ runner.workspace }}/build/HDF5-*-Darwin.tar.gz
               if-no-files-found: error # 'warn' or 'ignore' are also available, defaults to `warn`
         if: ${{ (matrix.os == 'macos-13') && (inputs.thread_safety != 'TS') }}
diff --git a/.github/workflows/release-files.yml b/.github/workflows/release-files.yml
@@ -103,7 +103,7 @@ jobs:
       - name: Get published binary (MacOS)
         uses: actions/download-artifact@65a9edc5881444af0b9093a5e628f2fe47ea3b2e # v4.1.7
         with:
-              name: tgz-osx12-binary
+              name: tgz-osx-binary
               path: ${{ github.workspace }}
 
       - name: Get published binary (Linux)
@@ -167,7 +167,7 @@ jobs:
           sha256sum ${{ steps.get-file-base.outputs.FILE_BASE }}.doxygen.zip > ${{ steps.get-file-base.outputs.FILE_BASE }}.sha256sums.txt
           sha256sum ${{ steps.get-file-base.outputs.FILE_BASE }}.tar.gz >> ${{ steps.get-file-base.outputs.FILE_BASE }}.sha256sums.txt
           sha256sum ${{ steps.get-file-base.outputs.FILE_BASE }}.zip >> ${{ steps.get-file-base.outputs.FILE_BASE }}.sha256sums.txt
-          sha256sum ${{ steps.get-file-base.outputs.FILE_BASE }}-osx12.tar.gz >> ${{ steps.get-file-base.outputs.FILE_BASE }}.sha256sums.txt
+          sha256sum ${{ steps.get-file-base.outputs.FILE_BASE }}-osx.tar.gz >> ${{ steps.get-file-base.outputs.FILE_BASE }}.sha256sums.txt
           sha256sum ${{ steps.get-file-base.outputs.FILE_BASE }}-ubuntu-2204_gcc.tar.gz >> ${{ steps.get-file-base.outputs.FILE_BASE }}.sha256sums.txt
           sha256sum ${{ steps.get-file-base.outputs.FILE_BASE }}-ubuntu-2204_gcc.deb.tar.gz >> ${{ steps.get-file-base.outputs.FILE_BASE }}.sha256sums.txt
           sha256sum ${{ steps.get-file-base.outputs.FILE_BASE }}-ubuntu-2204_gcc.rpm.tar.gz >> ${{ steps.get-file-base.outputs.FILE_BASE }}.sha256sums.txt
@@ -209,7 +209,7 @@ jobs:
               ${{ steps.get-file-base.outputs.FILE_BASE }}.doxygen.zip
               ${{ steps.get-file-base.outputs.FILE_BASE }}.tar.gz
               ${{ steps.get-file-base.outputs.FILE_BASE }}.zip
-              ${{ steps.get-file-base.outputs.FILE_BASE }}-osx12.tar.gz
+              ${{ steps.get-file-base.outputs.FILE_BASE }}-osx.tar.gz
               ${{ steps.get-file-base.outputs.FILE_BASE }}-ubuntu-2204_gcc.tar.gz
               ${{ steps.get-file-base.outputs.FILE_BASE }}-ubuntu-2204_gcc.deb.tar.gz
               ${{ steps.get-file-base.outputs.FILE_BASE }}-ubuntu-2204_gcc.rpm.tar.gz
@@ -235,7 +235,7 @@ jobs:
               ${{ steps.get-file-base.outputs.FILE_BASE }}.zip
               hdf5.tar.gz
               hdf5.zip
-              ${{ steps.get-file-base.outputs.FILE_BASE }}-osx12.tar.gz
+              ${{ steps.get-file-base.outputs.FILE_BASE }}-osx.tar.gz
               ${{ steps.get-file-base.outputs.FILE_BASE }}-ubuntu-2204_gcc.tar.gz
               ${{ steps.get-file-base.outputs.FILE_BASE }}-ubuntu-2204_gcc.deb.tar.gz
               ${{ steps.get-file-base.outputs.FILE_BASE }}-ubuntu-2204_gcc.rpm.tar.gz

diff --git a/.github/workflows/remove-files.yml b/.github/workflows/remove-files.yml
@@ -50,7 +50,7 @@ jobs:
               ${{ steps.get-file-base.outputs.FILE_BASE }}.doxygen.zip
               ${{ steps.get-file-base.outputs.FILE_BASE }}.tar.gz
               ${{ steps.get-file-base.outputs.FILE_BASE }}.zip
-              ${{ steps.get-file-base.outputs.FILE_BASE }}-osx12.tar.gz
+              ${{ steps.get-file-base.outputs.FILE_BASE }}-osx.tar.gz
               ${{ steps.get-file-base.outputs.FILE_BASE }}-ubuntu-2204_gcc.tar.gz
               ${{ steps.get-file-base.outputs.FILE_BASE }}-ubuntu-2204_gcc.deb.tar.gz
               ${{ steps.get-file-base.outputs.FILE_BASE }}-ubuntu-2204_gcc.rpm.tar.gz

diff --git a/doxygen/dox/VOLConnGuide.dox b/doxygen/dox/VOLConnGuide.dox
@@ -306,6 +306,13 @@ it may be some time before that work is complete.
 \subsection subsecVOLPassthrough Passthrough Connectors
 Coming Soon
 
+Note: 
+Passthrough VOL connectors should avoid doing anything with the file in the open and create 
+callbacks except opening it. If connectors need to do anything else they should use the post 
+open callback (H5VL_NATIVE_FILE_POST_OPEN op_type for the file "optional" callback), 
+making sure to perform operations on the file only after passing the post open call down to 
+the terminal connector.  The post open callback is made for both file open and file create calls.
+
 \subsection subsecVOLAsync Asynchronous Operations
 Coming Soon