Merge branch 'main' into hdf5-transient-types

* main: (56 commits) Fix a mismatched if,endif block label. Update issue with make distcheck Update dap4_test for systems without getopt Missed unit_test Update release notes Fix bug in szip handling. Update release notes "Simplify" XGetopt usage added fortran documenting logging documenting logging documenting logging Fix issue Unidata#2674 Update to latest main ubuntufix1 ub1" bad file reference oops Maintainer mode should only be turned on prior to minting a release. Fix run_jsonconvention.sh to be resilient against irrelevant changes to _NCProperties. ...
ZedThree · Apr 18, 2023 · 120c4c5 · 120c4c5
2 parents ad2db15 + b30b4e8
commit 120c4c5
Show file tree

Hide file tree

Showing 512 changed files with 9,513 additions and 68,349 deletions.
diff --git a/.github/workflows/run_tests_osx.yml b/.github/workflows/run_tests_osx.yml
@@ -17,7 +17,7 @@ jobs:
 
     strategy:
       matrix:
-        hdf5: [ 1.12.2 ]
+        hdf5: [ 1.12.2, 1.14.0 ]
 
     steps:
 
@@ -54,8 +54,7 @@ jobs:
 
     strategy:
       matrix:
-        hdf5: [ 1.12.2 ]
-        #hdf5: [ 1.8.21, 1.10.1, 1.10.7, 1.12.2 ]
+        hdf5: [ 1.12.2, 1.14.0 ]
         use_nc4: [ nc3, nc4 ]
         use_dap: [ dap_off, dap_on ]
         use_nczarr: [ nczarr_off, nczarr_on ]
@@ -161,7 +160,7 @@ jobs:
 
     strategy:
       matrix:
-        hdf5: [ 1.12.2 ]
+        hdf5: [ 1.12.2, 1.14.0 ]
         use_nc4: [ nc3, nc4 ]
         use_dap: [ dap_off, dap_on ]
         use_nczarr: [ nczarr_off, nczarr_on ]
@@ -257,7 +256,7 @@ jobs:
 
     strategy:
       matrix:
-        hdf5: [ 1.12.2 ]
+        hdf5: [ 1.12.2, 1.14.0 ]
     steps:
 
       - uses: actions/checkout@v3
@@ -338,7 +337,7 @@ jobs:
 
     strategy:
       matrix:
-        hdf5: [ 1.12.2 ]
+        hdf5: [ 1.12.2, 1.14.0 ]
 
     steps:
 

diff --git a/.github/workflows/run_tests_ubuntu.yml b/.github/workflows/run_tests_ubuntu.yml
@@ -14,7 +14,7 @@ jobs:
 
     strategy:
       matrix:
-        hdf5: [ 1.8.22, 1.10.8, 1.12.2 ]
+        hdf5: [ 1.10.8, 1.12.2, 1.14.0 ]
 
     steps:
 
@@ -63,7 +63,7 @@ jobs:
 
     strategy:
       matrix:
-        hdf5: [ 1.12.2 ]
+        hdf5: [ 1.14.0 ]
 
     steps:
 
@@ -125,7 +125,7 @@ jobs:
 
     strategy:
       matrix:
-        hdf5: [ 1.12.2 ]
+        hdf5: [ 1.14.0 ]
     steps:
 
       - uses: actions/checkout@v3
@@ -205,7 +205,7 @@ jobs:
 
     strategy:
       matrix:
-        hdf5: [ 1.12.2 ]
+        hdf5: [ 1.14.0 ]
     steps:
 
       - uses: actions/checkout@v3
@@ -285,7 +285,7 @@ jobs:
 
     strategy:
       matrix:
-        hdf5: [ 1.12.2 ]
+        hdf5: [ 1.14.0 ]
 
     steps:
 
@@ -365,7 +365,7 @@ jobs:
 
     strategy:
       matrix:
-        hdf5: [ 1.12.2 ]
+        hdf5: [ 1.14.0 ]
 
     steps:
 
@@ -442,7 +442,7 @@ jobs:
 
     strategy:
       matrix:
-        hdf5: [ 1.8.22, 1.10.8, 1.12.2 ]
+        hdf5: [1.10.8, 1.12.2, 1.14.0 ]
         use_nc4: [ nc3, nc4 ]
         use_dap: [ dap_off, dap_on ]
         use_nczarr: [ nczarr_off, nczarr_on ]
@@ -541,7 +541,7 @@ jobs:
 
     strategy:
       matrix:
-        hdf5: [ 1.8.22, 1.10.8, 1.12.2 ]
+        hdf5: [ 1.10.8, 1.12.2, 1.14.0 ]
         use_nc4: [ nc3, nc4 ]
         use_dap: [ dap_off, dap_on ]
         use_nczarr: [ nczarr_off, nczarr_on ]
@@ -588,7 +588,7 @@ jobs:
 
       - name: Check Cache
         shell: bash -l {0}
-        run: ls ${HOME}/environments && ls ${HOME}/environments/${{ matrix.hdf5 }} && ls ${HOME}/environments/${{ matrix.hdf5}}/lib
+        run: ls ${HOME}/environments/${{ matrix.hdf5 }} && ls ${HOME}/environments/${{ matrix.hdf5}}/lib
 
       ###
       # Configure and build

diff --git a/.github/workflows/run_tests_win_mingw.yml b/.github/workflows/run_tests_win_mingw.yml
@@ -54,7 +54,7 @@ jobs:
       - name: Check for plugins
         run: |
           dir ./plugins
-          dir ./plugins/.libs
+          if test -e ./plugins/.libs ; then dir ./plugins/.libs ; fi
 
       - name: (Autotools) Build and Run Tests
         run: make check -j 8 LDFLAGS="-Wl,--export-all-symbols"

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -31,7 +31,7 @@ set(PACKAGE "netCDF" CACHE STRING "")
 
 SET(NC_VERSION_MAJOR 4)
 SET(NC_VERSION_MINOR 9)
-SET(NC_VERSION_PATCH 2)
+SET(NC_VERSION_PATCH 3)
 SET(NC_VERSION_NOTE "-development")
 SET(netCDF_VERSION ${NC_VERSION_MAJOR}.${NC_VERSION_MINOR}.${NC_VERSION_PATCH}${NC_VERSION_NOTE})
 SET(VERSION ${netCDF_VERSION})
@@ -1062,7 +1062,7 @@ ENDIF()
 IF(ENABLE_DAP)
   SET(USE_DAP ON CACHE BOOL "")
   SET(ENABLE_DAP2 ON CACHE BOOL "")
- 
+
   IF(ENABLE_HDF5)
     MESSAGE(STATUS "Enabling DAP4")
     SET(ENABLE_DAP4 ON CACHE BOOL "")
@@ -1249,18 +1249,6 @@ IF(MSVC)
   OPTION(ENABLE_XGETOPT "Enable bundled XGetOpt instead of external getopt()." ON)
   IF(ENABLE_XGETOPT)
     SET(USE_X_GETOPT ON CACHE BOOL "")
-    # Copy XGetopt.c to everywhere it is needed. Avoids
-    # inconsistent code
-    FILE(COPY ${netCDF_SOURCE_DIR}/libsrc/XGetopt.c
-         DESTINATION ${netCDF_BINARY_DIR}/ncgen3/)
-    FILE(COPY ${netCDF_SOURCE_DIR}/libsrc/XGetopt.c
-         DESTINATION ${netCDF_BINARY_DIR}/ncgen/)
-    FILE(COPY ${netCDF_SOURCE_DIR}/libsrc/XGetopt.c
-         DESTINATION ${netCDF_BINARY_DIR}/ncdump/)
-    FILE(COPY ${netCDF_SOURCE_DIR}/libsrc/XGetopt.c
-         DESTINATION ${netCDF_BINARY_DIR}/nczarr_test/)
-    FILE(COPY ${netCDF_SOURCE_DIR}/libsrc/XGetopt.c
-         DESTINATION ${netCDF_BINARY_DIR}/ncdap_test/)
   ENDIF()
 ENDIF()
 
@@ -1280,19 +1268,26 @@ IF(NOT WIN32)
   ENDIF()
 ENDIF()
 
-# Options to Extend NCZarr support
-OPTION(ENABLE_NCZARR_S3 "Enable NCZarr S3 support." OFF)
+# Options for S3 Support
+OPTION(ENABLE_S3 "Enable S3 support." OFF)
+OPTION(ENABLE_NCZARR_S3 "Enable NCZarr S3 support; Deprecated in favor of ENABLE_S3" OFF)
 OPTION(ENABLE_NCZARR_S3_TESTS "Enable NCZarr S3 tests." OFF)
 
-IF(ENABLE_NCZARR_S3_TESTS AND NOT ENABLE_NCZARR_S3)
-  message(FATAL_ERROR "NCZarr S3 support is disabled; please specify option -DENABLE_NCZARR_S3_TESTS=no")
-  SET(ENABLE_NCZARR_S3_TESTS OFF CACHE BOOL "NCARR S3 TESTS" FORCE)
+# ENABLE_NCZARR_S3 is now an alias for ENABLE_S3 (but...)
+if (NOT ENABLE_S3 AND ENABLE_NCZARR_S3)
+  SET(ENABLE_S3 ON CACHE BOOL "NCARR S3" FORCE) # For back compatibility
+ENDIF()
+UNSET(ENABLE_NCZARR_S3)
+
+IF(ENABLE_NCZARR_S3_TESTS AND NOT ENABLE_S3)
+  message(FATAL_ERROR "S3 support is disabled; please specify option -DENABLE_NCZARR_S3_TESTS=NO")
+  SET(ENABLE_NCZARR_S3_TESTS OFF CACHE BOOL "NCZARR S3 TESTS" FORCE)
 ENDIF()
 
-# Note we check for the library after checking for enable_nczarr_s3
+# Note we check for the library after checking for enable_s3
 # because for some reason this screws up if we unconditionally test for sdk
 # and it is not available. Fix someday
-IF(ENABLE_NCZARR_S3)
+IF(ENABLE_S3)
   # See if aws-s3-sdk is available
   find_package(AWSSDK REQUIRED COMPONENTS s3;core)
   IF(AWSSDK_FOUND)
@@ -1307,9 +1302,9 @@ ELSE()
 ENDIF()
 
 IF(NOT ENABLE_S3_SDK)
-  IF(ENABLE_NCZARR_S3 OR ENABLE_NCZARR_S3_TESTS)
-    message(FATAL_ERROR "S3 support library not found; please specify option -DENABLE_NCZARR_S3=NO")
-    SET(ENABLE_NCZARR_S3 OFF CACHE BOOL "NCZARR S3 support" FORCE)
+  IF(ENABLE_S3)
+    message(FATAL_ERROR "S3 support library not found; please specify option -DENABLE_S3=NO")
+    SET(ENABLE_S3 OFF CACHE BOOL "S3 support" FORCE)
     SET(ENABLE_NCZARR_S3_TESTS OFF CACHE BOOL "S3 tests" FORCE)
   ENDIF()
 ENDIF()
@@ -1335,8 +1330,8 @@ IF(NOT FOUND_CURL)
     SET(ENABLE_HDF5_ROS3 OFF CACHE BOOL "Use ROS3" FORCE)
   ENDIF()
 
-  IF(ENABLE_NCZARR_S3)
-    MESSAGE(FATAL_ERROR "NCZarr S3 support specified, CURL libraries are not found.")
+  IF(ENABLE_S3)
+    MESSAGE(FATAL_ERROR "S3 support specified, but CURL libraries are not found.")
   ENDIF()
 ENDIF(NOT FOUND_CURL)
 
@@ -2544,7 +2539,8 @@ is_enabled(ENABLE_ZERO_LENGTH_COORD_BOUND RELAX_COORD_BOUND)
 is_enabled(USE_CDF5 HAS_CDF5)
 is_enabled(ENABLE_ERANGE_FILL HAS_ERANGE_FILL)
 is_enabled(HDF5_HAS_PAR_FILTERS HAS_PAR_FILTERS)
-is_enabled(ENABLE_NCZARR_S3 HAS_NCZARR_S3)
+is_enabled(ENABLE_S3 HAS_S3)
+is_enabled(ENABLE_S3_SDK HAS_S3_SDK)
 is_enabled(ENABLE_NCZARR HAS_NCZARR)
 is_enabled(ENABLE_NCZARR_S3_TESTS DO_NCZARR_S3_TESTS)
 is_enabled(ENABLE_NCZARR_ZIP HAS_NCZARR_ZIP)

diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md
@@ -5,11 +5,25 @@ Release Notes       {#RELEASE_NOTES}
 
 This file contains a high-level description of this package's evolution. Releases are in reverse chronological order (most recent first). Note that, as of netcdf 4.2, the `netcdf-c++` and `netcdf-fortran` libraries have been separated into their own libraries.
 
-## 4.9.2 - TBD
+## 4.9.3 - TBD
 
-* Fix 'make distcheck' error in run_interop.sh. See [Github #????](https://github.com/Unidata/netcdf-c/pull/????).
+* [Bug Fix] Add a crude test to see if an NCZarr path looks like a valid NCZarr/Zarr file. See [Github #2658](https://github.com/Unidata/netcdf-c/pull/2658).
+
+## 4.9.2 - March 14, 2023
+
+This is the maintenance release which adds support for HDF5 version 1.14.0, in addition to a handful of other changes and bugfixes.  
+
+* Fix a minor bug in reporting the use of szip. See [Github #2679](https://github.com/Unidata/netcdf-c/pull/2679).
+* Simplify the handling of XGetopt. See [Github #2678](https://github.com/Unidata/netcdf-c/pull/2678).
+* Fix 'make distcheck' error in run_interop.sh. See [Github #2631](https://github.com/Unidata/netcdf-c/pull/2631).
 * Update `nc-config` to remove inclusion from automatically-detected `nf-config` and `ncxx-config` files, as the wrong files could be included in the output.  This is in support of [GitHub #2274](https://github.com/Unidata/netcdf-c/issues/2274).
-* Update H5FDhttp.[ch] to work with HDF5 version 1.14.0. See [Github #2615](https://github.com/Unidata/netcdf-c/pull/2615).
+* Update H5FDhttp.[ch] to work with HDF5 version 1.13.2 and later. See [Github #2635](https://github.com/Unidata/netcdf-c/pull/2635).
+* Fix 'make distcheck' error in run_interop.sh. See [Github #2631](https://github.com/Unidata/netcdf-c/pull/2631).
+* [Bug Fix] Update DAP code to enable CURLOPT_ACCEPT_ENCODING by default. See [Github #2630](https://github.com/Unidata/netcdf-c/pull/2630).
+* [Bug Fix] Fix byterange failures for certain URLs. See [Github #2649](https://github.com/Unidata/netcdf-c/pull/2649).
+* [Bug Fix] Fix 'make distcheck' error in run_interop.sh. See [Github #2631](https://github.com/Unidata/netcdf-c/pull/2631).
+* [Enhancement] Update `nc-config` to remove inclusion from automatically-detected `nf-config` and `ncxx-config` files, as the wrong files could be included in the output.  This is in support of [GitHub #2274](https://github.com/Unidata/netcdf-c/issues/2274).
+* [Enhancement] Update H5FDhttp.[ch] to work with HDF5 version 1.14.0. See [Github #2615](https://github.com/Unidata/netcdf-c/pull/2615).
 
 ## 4.9.1 - February 2, 2023
 
@@ -111,7 +125,10 @@ This file contains a high-level description of this package's evolution. Release
 
 #### Changes
 
+
+* [Bug Fix] Get remotetest server working for DAP4 and re-enable its use in the netcdf-c library for testing. See [Github #2558](https://github.com/Unidata/netcdf-c/pull/2558).
 * [Bug Fix] Fix a race condition when testing missing filters. See [Github #2557](https://github.com/Unidata/netcdf-c/pull/2557). 
+* [Bug Fix] Make major changes to libdap4 and dap4_test to update the non-remote DAP4 tests. See [Github #2555](https://github.com/Unidata/netcdf-c/pull/2555).
 * [Bug Fix] Fix some race conditions due to use of a common file in multiple shell scripts . See [Github #2552](https://github.com/Unidata/netcdf-c/pull/2552).
 
 

diff --git a/config.h.cmake.in b/config.h.cmake.in
@@ -136,23 +136,23 @@ are set when opening a binary file on Windows. */
 /* if true, do remote tests */
 #cmakedefine ENABLE_DAP_REMOTE_TESTS 1
 
+/* if true, enable S3 support */
+#cmakedefine ENABLE_S3 1
+
+/* if true, S3 SDK is available */
+#cmakedefine ENABLE_S3_SDK 1
+
 /* if true, enable NCZARR */
 #cmakedefine ENABLE_NCZARR 1
 
 /* if true, enable nczarr filter support */
 #cmakedefine ENABLE_NCZARR_FILTERS 1
 
-/* if true, enable S3 support */
-#cmakedefine ENABLE_NCZARR_S3 1
-
-/* if true, enable nczarr zip support */
-#cmakedefine ENABLE_NCZARR_ZIP 1
-
 /* if true, enable S3 testing*/
 #cmakedefine ENABLE_NCZARR_S3_TESTS 1
 
-/* if true, S3 SDK is available */
-#cmakedefine ENABLE_S3_SDK 1
+/* if true, enable nczarr zip support */
+#cmakedefine ENABLE_NCZARR_ZIP 1
 
 /* if true, Allow dynamically loaded plugins */
 #cmakedefine ENABLE_PLUGINS 1