Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Support the new compression argument in netCDF4 > 1.6.0 #6981

Merged
merged 12 commits into from
Dec 1, 2022
Merged

Support the new compression argument in netCDF4 > 1.6.0 #6981

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
9309de5
Added support for the new compression argument in netCDF4 > 1.6.0
markelg Sep 2, 2022
591d5b5
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Sep 2, 2022
0f2c272
Merge branch 'master' into netcdf4_1.6.0_compression_arguments
markelg Sep 8, 2022
f4f5da4
Merge branch 'netcdf4_1.6.0_compression_arguments' of github.com:mark…
markelg Sep 8, 2022
402ac49
Check both netCDF4 and libnetcdf versions to see if they support the new
markelg Sep 8, 2022
8fe053d
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Sep 8, 2022
01bf867
Remove checking netCDF4 and libnetcdf versions. We let them fail if t…
markelg Oct 31, 2022
1907a3a
Merge branch 'master' into netcdf4_1.6.0_compression_arguments
markelg Oct 31, 2022
de79377
Added test after merging with the new version of the file.
markelg Oct 31, 2022
e14f877
Merge branch 'main' into netcdf4_1.6.0_compression_arguments
dcherian Dec 1, 2022
294b63a
Merge branch 'pydata:main' into netcdf4_1.6.0_compression_arguments
markelg Dec 1, 2022
a3310f9
Merge branch 'main' into netcdf4_1.6.0_compression_arguments
dcherian Dec 1, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion xarray/backends/netCDF4_.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -232,11 +232,11 @@ def _extract_nc4_variable_encoding(
"shuffle",
"_FillValue",
"dtype",
"compression",
}
if lsd_okay:
valid_encodings.add("least_significant_digit")
if h5py_okay:
valid_encodings.add("compression")
valid_encodings.add("compression_opts")

if not raise_on_invalid and encoding.get("chunksizes") is not None:
Expand Down
6 changes: 6 additions & 0 deletions xarray/tests/test_backends.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5068,6 +5068,12 @@ def test_extract_nc4_variable_encoding(self) -> None:
encoding = _extract_nc4_variable_encoding(var, unlimited_dims=("x",))
assert {} == encoding

@requires_netCDF4
def test_extract_nc4_variable_encoding_netcdf4(self, monkeypatch):
# New netCDF4 1.6.0 compression argument.
var = xr.Variable(("x",), [1, 2, 3], {}, {"compression": "szlib"})
_extract_nc4_variable_encoding(var, backend="netCDF4", raise_on_invalid=True)

def test_extract_h5nc_encoding(self) -> None:
# not supported with h5netcdf (yet)
var = xr.Variable(("x",), [1, 2, 3], {}, {"least_sigificant_digit": 2})
Expand Down