mirror/netcdf-c
2
0
Fork 0
mirror of https://github.com/Unidata/netcdf-c.git synced 2025-02-17 16:50:18 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'main' into v4.9.2-wellspring.wif

Browse Source
This commit is contained in:
Ward Fisher 2023-03-14 13:58:59 -06:00
commit 5f37f7639a
5 changed files with 20 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
.github/workflows/run_tests_osx.yml vendored
View File

@ -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:

16
.github/workflows/run_tests_ubuntu.yml vendored
View File

@ -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 ]

3
RELEASE_NOTES.md
View File

@ -11,6 +11,9 @@ This file contains a high-level description of this package's evolution. Release
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 'make distcheck' error in run_interop.sh. See [Github #????](https://github.com/Unidata/netcdf-c/pull/????).
* 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.13.2 and later. See [Github #2635](https://github.com/Unidata/netcdf-c/pull/2635).
* [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).

6
libhdf5/H5FDhttp.c
View File

@ -162,7 +162,7 @@ static herr_t H5FD_http_unlock(H5FD_t *_file);
/* Beware, not same as H5FD_HTTP_g */
static const H5FD_class_t H5FD_http_g = {
#if H5_VERSION_GE(1,14,0)
#if H5_VERSION_GE(1,13,2)
H5FD_CLASS_VERSION, /* struct version */
H5_VFD_HTTP, /* value */
#endif
@ -195,7 +195,7 @@ static const H5FD_class_t H5FD_http_g = {
H5FD_http_get_handle, /* get_handle */
H5FD_http_read, /* read */
H5FD_http_write, /* write */
#if H5_VERSION_GE(1,14,0)
#if H5_VERSION_GE(1,13,2)
NULL, /* read_vector */
NULL, /* write_vector */
NULL, /* read_selection */
@ -205,7 +205,7 @@ static const H5FD_class_t H5FD_http_g = {
NULL, /* truncate */
H5FD_http_lock, /* lock */
H5FD_http_unlock, /* unlock */
#if H5_VERSION_GE(1,14,0)
#if H5_VERSION_GE(1,13,2)
NULL, /* del */
NULL, /* ctl */
#endif

2
libhdf5/H5FDhttp.h
View File

@ -31,7 +31,7 @@
#include "H5Ipublic.h"
#if H5_VERSION_GE(1,14,0)
#if H5_VERSION_GE(1,13,2)
#define H5_VFD_HTTP ((H5FD_class_value_t)(514))
#define H5FD_HTTP (H5FDperform_init(H5FD_http_init))
#else