Merge pull request #2387 from Unidata/v4.9.0-wellspring.wif

Merge relevant info updates back into `main`

.github/workflows/run_tests_ubuntu.yml

@@ -4,7 +4,7 @@
 
 name: Run Ubuntu/Linux netCDF Tests
 
-on: [pull_request]
+on: [pull_request, workflow_dispatch]
 
 jobs:
 

CMakeLists.txt

@@ -30,8 +30,8 @@ set(PACKAGE "netCDF" CACHE STRING "")
 #####
 
 SET(NC_VERSION_MAJOR 4)
-SET(NC_VERSION_MINOR 8)
-SET(NC_VERSION_PATCH 2)
+SET(NC_VERSION_MINOR 9)
+SET(NC_VERSION_PATCH 1)
 SET(NC_VERSION_NOTE "-development")
 SET(netCDF_VERSION ${NC_VERSION_MAJOR}.${NC_VERSION_MINOR}.${NC_VERSION_PATCH}${NC_VERSION_NOTE})
 SET(VERSION ${netCDF_VERSION})
@@ -1119,8 +1119,8 @@ ELSE()
 ENDIF()
 
 # If user wants, then install selected plugins (default on)
-SET(PLUGIN_INSTALL_DIR "YES" CACHE STRING "Whether and where we should install plugins; defaults to yes")
-SET(ENABLE_PLUGIN_INSTALL YES)
+SET(PLUGIN_INSTALL_DIR "NO" CACHE STRING "Whether and where we should install plugins; defaults to yes")
+SET(ENABLE_PLUGIN_INSTALL NO)
 IF(DEFINED PLUGIN_INSTALL_DIR) #OR DEFINED CACHE{PLUGIN_INSTALL_DIR}
   STRING(TOLOWER "${PLUGIN_INSTALL_DIR}" LCPID)
   IF(LCPID STREQUAL "no")

configure.ac

@@ -10,7 +10,7 @@
 AC_PREREQ([2.59])
 
 # Initialize with name, version, and support email address.
-AC_INIT([netCDF],[4.8.2-development],[support-netcdf@unidata.ucar.edu],[netcdf-c])
+AC_INIT([netCDF],[4.9.1-development],[support-netcdf@unidata.ucar.edu],[netcdf-c])
 
 ##
 # Prefer an empty CFLAGS variable instead of the default -g -O2.
@@ -20,16 +20,16 @@ AC_INIT([netCDF],[4.8.2-development],[support-netcdf@unidata.ucar.edu],[netcdf-c
 : ${CFLAGS=""}
 
 AC_SUBST([NC_VERSION_MAJOR]) NC_VERSION_MAJOR=4
-AC_SUBST([NC_VERSION_MINOR]) NC_VERSION_MINOR=8
-AC_SUBST([NC_VERSION_PATCH]) NC_VERSION_PATCH=2
+AC_SUBST([NC_VERSION_MINOR]) NC_VERSION_MINOR=9
+AC_SUBST([NC_VERSION_PATCH]) NC_VERSION_PATCH=1
 AC_SUBST([NC_VERSION_NOTE]) NC_VERSION_NOTE="-development"
 
 ##
 # These linker flags specify libtool version info.
 # See http://www.gnu.org/software/libtool/manual/libtool.html#Libtool-versioning
 # for information regarding incrementing `-version-info`.
 # These values should match those in CMakeLists.txt
-AC_SUBST([netCDF_SO_VERSION]) netCDF_SO_VERSION=19:1:0
+AC_SUBST([netCDF_SO_VERSION]) netCDF_SO_VERSION=20:0:1
 
 #####
 # Set some variables used to generate a libnetcdf.settings file,
@@ -1264,7 +1264,7 @@ test "x$enable_plugins" = xno || enable_plugins=yes
 AC_MSG_RESULT([$enable_plugins])
 if test "x$have_libdld" = xno && test "x$ISMSVC" = xno; then
   enable_plugins=no
-  AC_MSG_WARN([libdld required for enable-plugins.])  
+  AC_MSG_WARN([libdld required for enable-plugins.])
 fi
 if test "x$enable_plugins" = xyes && test "x$enable_shared" = xno; then
     AC_MSG_WARN([--disable-shared => --disable-plugins])
@@ -1894,10 +1894,10 @@ AC_SUBST(STD_FILTERS,[$std_filters])
 AC_MSG_CHECKING([whether and where we should install plugins])
 AC_ARG_WITH([plugin-dir], [AS_HELP_STRING([--with-plugin-dir=<absolute directory>|no|--without-plugin-dir],
               [Install selected standard filters in specified or default directory])],
-	      [],[with_plugin_dir=yes])
+	      [],[with_plugin_dir=no])
 AC_MSG_RESULT([$with_plugin_dir])
 if test "x$with_plugin_dir" = xno ; then # option missing|disabled
-    with_plugin_dir=no   
+    with_plugin_dir=no
     with_plugin_dir_setting="N.A."
     enable_plugin_dir=no
 elif test "x$with_plugin_dir" = xyes ; then # --with-plugin-dir, no argument

docs/Doxyfile.developer

@@ -38,7 +38,7 @@ PROJECT_NAME           = netCDF-C
 # could be handy for archiving the generated documentation or if some version
 # control system is used.
 
-PROJECT_NUMBER         = 4.8.2-development
+PROJECT_NUMBER         = 4.9.1-development
 
 # Using the PROJECT_BRIEF tag one can provide an optional one line description
 # for a project that appears at the top of each page and should give viewer a

docs/images/Makefile.am

@@ -9,4 +9,4 @@ EXTRA_DIST = aqua.jpg chunking2.png compatibility3.png			\
 compression.png groups.png nc4-model.png ncatts.png			\
 nc-classic-uml.png nccoords.png ncfile.png pnetcdf.png terra.jpg	\
 netcdf_architecture.png deptree.jpg InstallTreeWindows.png		\
-uniLogo.png quantize_pi.png quantize_performance.md
+uniLogo.png quantize_pi.png quantize_performance.png

docs/windows-binaries.md

@@ -28,8 +28,8 @@ These libraries have been built using Visual Studio 2017.  The downloads are ins
 
 The included dependencies and versions are as follows:
 
-* `libhdf5`: 1.8.19
-* `libcurl`: 7.55.1
+* `libhdf5`: 1.12.1
+* `libcurl`: 7.60.0
 * `zlib`:    1.2.8
 
 ## Latest Release (netCDF-C major.minor.point) {#msvc-latest-release}

nc_test/Makefile.am

@@ -112,7 +112,8 @@ test_write.m4 ref_tst_diskless2.cdl tst_diskless5.cdl			\
 ref_tst_diskless3_create.cdl ref_tst_diskless3_open.cdl			\
 run_inmemory.sh run_mmap.sh f03tst_open_mem.nc test_byterange.sh	\
 ref_tst_http_nc3.cdl ref_tst_http_nc4a.cdl ref_tst_http_nc4b.cdl	\
-ref_tst_http_nc4c.cdl CMakeLists.txt run_pnetcdf_tests.sh.in
+ref_tst_http_nc4c.cdl CMakeLists.txt run_pnetcdf_tests.sh.in \
+tst_misc.c tst_norm.c
 
 # These files are created by the tests.
 CLEANFILES = nc_test_*.nc tst_*.nc t_nc.nc large_files.nc		\

nc_test4/Makefile.am

@@ -111,7 +111,8 @@ ref_ncgenF.cdl ref_nccopyF.cdl                                          \
 ref_filter_repeat.txt ref_fillonly.cdl test_fillonly.sh                 \
 ref_filter_order_create.txt ref_filter_order_read.txt			\
 ref_any.cdl tst_specific_filters.sh tst_unknown.sh                      \
-tst_virtual_datasets.c noop1.cdl unknown.cdl
+tst_virtual_datasets.c noop1.cdl unknown.cdl  \
+tst_broken_files.c
 
 # The tst_filterinstall test can only be run after an install
 # occurred with --with-plugin-dir enabled. So there is no point