From a55680d1c411c70cb4f163b21513acba2eab0377 Mon Sep 17 00:00:00 2001 From: Ward Fisher Date: Mon, 13 Mar 2023 15:40:12 -0600 Subject: [PATCH 1/5] Bumped SO version. --- configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index b6f3bd340..2c876489c 100644 --- a/configure.ac +++ b/configure.ac @@ -29,7 +29,7 @@ AC_SUBST([NC_VERSION_NOTE]) NC_VERSION_NOTE="-development" # 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=21:1:2 +AC_SUBST([netCDF_SO_VERSION]) netCDF_SO_VERSION=21:2:2 ##### # Set some variables used to generate a libnetcdf.settings file, From 59971b54755b80844c6608d0ed6c9cd1de6dd9b4 Mon Sep 17 00:00:00 2001 From: Ward Fisher Date: Mon, 13 Mar 2023 15:42:29 -0600 Subject: [PATCH 2/5] Update release notes. --- RELEASE_NOTES.md | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md index 4cecbd185..cbc8d749d 100644 --- a/RELEASE_NOTES.md +++ b/RELEASE_NOTES.md @@ -5,10 +5,14 @@ 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 + +## 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. * [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 #????](https://github.com/Unidata/netcdf-c/pull/????). +* [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). From b41127bec56cecb3dbb44c83abc2118cda1280f7 Mon Sep 17 00:00:00 2001 From: Ward Fisher Date: Mon, 13 Mar 2023 15:43:44 -0600 Subject: [PATCH 3/5] Bump version strings to reflect next development version. --- CMakeLists.txt | 2 +- configure.ac | 4 ++-- docs/Doxyfile.developer | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 31eaf99bb..a207bc048 100644 --- 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}) diff --git a/configure.ac b/configure.ac index 2c876489c..46a31a96c 100644 --- a/configure.ac +++ b/configure.ac @@ -10,7 +10,7 @@ AC_PREREQ([2.59]) # Initialize with name, version, and support email address. -AC_INIT([netCDF],[4.9.2-development],[support-netcdf@unidata.ucar.edu],[netcdf-c]) +AC_INIT([netCDF],[4.9.3-development],[support-netcdf@unidata.ucar.edu],[netcdf-c]) ## # Prefer an empty CFLAGS variable instead of the default -g -O2. @@ -21,7 +21,7 @@ AC_INIT([netCDF],[4.9.2-development],[support-netcdf@unidata.ucar.edu],[netcdf-c AC_SUBST([NC_VERSION_MAJOR]) NC_VERSION_MAJOR=4 AC_SUBST([NC_VERSION_MINOR]) NC_VERSION_MINOR=9 -AC_SUBST([NC_VERSION_PATCH]) NC_VERSION_PATCH=2 +AC_SUBST([NC_VERSION_PATCH]) NC_VERSION_PATCH=3 AC_SUBST([NC_VERSION_NOTE]) NC_VERSION_NOTE="-development" ## diff --git a/docs/Doxyfile.developer b/docs/Doxyfile.developer index d3cd79074..0b36203c1 100644 --- a/docs/Doxyfile.developer +++ b/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.9.2-development +PROJECT_NUMBER = 4.9.3-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 From dc11c6d094e421a22f6d5af948bc48d0479b276b Mon Sep 17 00:00:00 2001 From: Ward Fisher Date: Tue, 14 Mar 2023 09:23:48 -0600 Subject: [PATCH 4/5] Correct jsonconvention map with netcdf version. --- nczarr_test/ref_jsonconvention.zmap | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nczarr_test/ref_jsonconvention.zmap b/nczarr_test/ref_jsonconvention.zmap index 39d0b8a6a..65b00017d 100644 --- a/nczarr_test/ref_jsonconvention.zmap +++ b/nczarr_test/ref_jsonconvention.zmap @@ -1,4 +1,4 @@ -[0] /.zattrs : (354) |{"globalfloat": 1, "globalfloatvec": [1,2], "globalchar": "abc", "globalillegal": "[ [ 1.0, 0.0, 0.0 ], [ 0.0, 1.0, 0.0 ], [ 0.0, 0.0, 1.0 ", "_NCProperties": "version=2,netcdf=4.9.2-development,nczarr=2.0.0", "_nczarr_attr": {"types": {"globalfloat": "S1", "globalillegal": ">S1", "_NCProperties": ">S1"}}}| +[0] /.zattrs : (354) |{"globalfloat": 1, "globalfloatvec": [1,2], "globalchar": "abc", "globalillegal": "[ [ 1.0, 0.0, 0.0 ], [ 0.0, 1.0, 0.0 ], [ 0.0, 0.0, 1.0 ", "_NCProperties": "version=2,netcdf=4.9.3-development,nczarr=2.0.0", "_nczarr_attr": {"types": {"globalfloat": "S1", "globalillegal": ">S1", "_NCProperties": ">S1"}}}| [1] /.zgroup : (129) |{"zarr_format": 2, "_nczarr_superblock": {"version": "2.0.0"}, "_nczarr_group": {"dims": {"d1": 1}, "vars": ["v"], "groups": []}}| [3] /v/.zarray : (202) |{"zarr_format": 2, "shape": [1], "dtype": "S1", "varjson2": ">S1", "varvec1": ">S1", "varvec2": ">S1"}}}| From 5ea154da96ea20890fee3bae405f99cc867300d8 Mon Sep 17 00:00:00 2001 From: Ward Fisher Date: Tue, 14 Mar 2023 14:29:56 -0600 Subject: [PATCH 5/5] Maintainer mode should only be turned on prior to minting a release. --- configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index 46a31a96c..789316bed 100644 --- a/configure.ac +++ b/configure.ac @@ -97,7 +97,7 @@ AC_CONFIG_LINKS([nc_test4/ref_hdf5_compat3.nc:nc_test4/ref_hdf5_compat3.nc]) AC_CONFIG_LINKS([hdf4_test/ref_chunked.hdf4:hdf4_test/ref_chunked.hdf4]) AC_CONFIG_LINKS([hdf4_test/ref_contiguous.hdf4:hdf4_test/ref_contiguous.hdf4]) AM_INIT_AUTOMAKE([foreign dist-zip subdir-objects]) -AM_MAINTAINER_MODE() +#AM_MAINTAINER_MODE() # Check for the existence of this file before proceeding. AC_CONFIG_SRCDIR([include/netcdf.h])