Skip to content

Commit

Permalink
[pre-commit.ci] auto fixes from pre-commit.com hooks
Browse files Browse the repository at this point in the history
for more information, see https://pre-commit.ci
  • Loading branch information
pre-commit-ci[bot] committed Sep 5, 2023
1 parent e43ee20 commit 59e7390
Show file tree
Hide file tree
Showing 7 changed files with 210 additions and 43 deletions.
16 changes: 10 additions & 6 deletions xarray/backends/netCDF4_.py
Original file line number Diff line number Diff line change
Expand Up @@ -441,9 +441,14 @@ def open_store_variable(self, name, var):
encoding["source"] = self._filename
encoding["original_shape"] = var.shape
encoding["dtype"] = var.dtype
return Variable(dimensions, data, attributes, encoding,
enum_meaning= enum_meaning,
enum_name=enum_name)
return Variable(
dimensions,
data,
attributes,
encoding,
enum_meaning=enum_meaning,
enum_name=enum_name,
)

def get_variables(self):
return FrozenDict(
Expand Down Expand Up @@ -514,9 +519,8 @@ def prepare_variable(
enum = None
if variable.enum_meaning:
enum = self.ds.createEnumType(
variable.dtype,
variable.enum_name,
variable.enum_meaning)
variable.dtype, variable.enum_name, variable.enum_meaning
)

if name in self.ds.variables:
nc4_var = self.ds.variables[name]
Expand Down
21 changes: 15 additions & 6 deletions xarray/coding/strings.py
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@
pop_to,
safe_setitem,
unpack,
unpack,
)
from xarray.core import indexing
from xarray.core.parallelcompat import get_chunked_array_type, is_chunked_array
Expand Down Expand Up @@ -69,7 +68,9 @@ def encode(self, variable, name=None):
# TODO: figure out how to handle this in a lazy way with dask
data = encode_string_array(data, string_encoding)

return Variable(dims, data, attrs, encoding, enum_meaning=enum_meaning, enum_name=enum_name)
return Variable(
dims, data, attrs, encoding, enum_meaning=enum_meaning, enum_name=enum_name
)

def decode(self, variable, name=None):
dims, data, attrs, encoding, enum_meaning, enum_name = unpack(variable)
Expand All @@ -79,7 +80,9 @@ def decode(self, variable, name=None):
func = partial(decode_bytes_array, encoding=string_encoding)
data = lazy_elemwise_func(data, func, np.dtype(object))

return Variable(dims, data, attrs, encoding, enum_meaning=enum_meaning, enum_name=enum_name)
return Variable(
dims, data, attrs, encoding, enum_meaning=enum_meaning, enum_name=enum_name
)


def decode_bytes_array(bytes_array, encoding="utf-8"):
Expand All @@ -101,7 +104,9 @@ def ensure_fixed_length_bytes(var):
if check_vlen_dtype(data.dtype) == bytes:
# TODO: figure out how to handle this with dask
data = np.asarray(data, dtype=np.string_)
return Variable(dims, data, attrs, encoding, enum_meaning=enum_meaning, enum_name=enum_name)
return Variable(
dims, data, attrs, encoding, enum_meaning=enum_meaning, enum_name=enum_name
)


class CharacterArrayCoder(VariableCoder):
Expand All @@ -118,7 +123,9 @@ def encode(self, variable, name=None):
else:
char_dim_name = f"string{data.shape[-1]}"
dims = dims + (char_dim_name,)
return Variable(dims, data, attrs, encoding, enum_meaning=enum_meaning, enum_name=enum_name)
return Variable(
dims, data, attrs, encoding, enum_meaning=enum_meaning, enum_name=enum_name
)

def decode(self, variable, name=None):
dims, data, attrs, encoding, enum_meaning, enum_name = unpack(variable)
Expand All @@ -127,7 +134,9 @@ def decode(self, variable, name=None):
encoding["char_dim_name"] = dims[-1]
dims = dims[:-1]
data = char_to_bytes(data)
return Variable(dims, data, attrs, encoding, enum_meaning=enum_meaning, enum_name=enum_name)
return Variable(
dims, data, attrs, encoding, enum_meaning=enum_meaning, enum_name=enum_name
)


def bytes_to_char(arr):
Expand Down
41 changes: 36 additions & 5 deletions xarray/coding/times.py
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@
pop_to,
safe_setitem,
unpack,
unpack,
)
from xarray.core import indexing
from xarray.core.common import contains_cftime_datetimes, is_np_datetime_like
Expand Down Expand Up @@ -710,7 +709,15 @@ def encode(self, variable: Variable, name: T_Name = None) -> Variable:
safe_setitem(attrs, "units", units, name=name)
safe_setitem(attrs, "calendar", calendar, name=name)

return Variable(dims, data, attrs, encoding, fastpath=True, enum_meaning=enum_meaning, enum_name=enum_name)
return Variable(
dims,
data,
attrs,
encoding,
fastpath=True,
enum_meaning=enum_meaning,
enum_name=enum_name,
)
else:
return variable

Expand All @@ -730,7 +737,15 @@ def decode(self, variable: Variable, name: T_Name = None) -> Variable:
)
data = lazy_elemwise_func(data, transform, dtype)

return Variable(dims, data, attrs, encoding, fastpath=True, enum_meaning=enum_meaning, enum_name=enum_name)
return Variable(
dims,
data,
attrs,
encoding,
fastpath=True,
enum_meaning=enum_meaning,
enum_name=enum_name,
)
else:
return variable

Expand All @@ -743,7 +758,15 @@ def encode(self, variable: Variable, name: T_Name = None) -> Variable:
data, units = encode_cf_timedelta(data, encoding.pop("units", None))
safe_setitem(attrs, "units", units, name=name)

return Variable(dims, data, attrs, encoding, fastpath=True, enum_meaning=enum_meaning, enum_name=enum_name)
return Variable(
dims,
data,
attrs,
encoding,
fastpath=True,
enum_meaning=enum_meaning,
enum_name=enum_name,
)
else:
return variable

Expand All @@ -757,6 +780,14 @@ def decode(self, variable: Variable, name: T_Name = None) -> Variable:
dtype = np.dtype("timedelta64[ns]")
data = lazy_elemwise_func(data, transform, dtype=dtype)

return Variable(dims, data, attrs, encoding, fastpath=True, enum_meaning=enum_meaning, enum_name=enum_name)
return Variable(
dims,
data,
attrs,
encoding,
fastpath=True,
enum_meaning=enum_meaning,
enum_name=enum_name,
)
else:
return variable
120 changes: 108 additions & 12 deletions xarray/coding/variables.py
Original file line number Diff line number Diff line change
Expand Up @@ -168,7 +168,15 @@ def lazy_elemwise_func(array, func: Callable, dtype: np.typing.DTypeLike):


def unpack(var: Variable) -> T_VarTuple:
return var.dims, var.data, var.attrs.copy(), var.encoding.copy(), var.enum_meaning, var.enum_name,
return (
var.dims,
var.data,
var.attrs.copy(),
var.encoding.copy(),
var.enum_meaning,
var.enum_name,
)


def safe_setitem(dest, key: Hashable, value, name: T_Name = None):
if key in dest:
Expand Down Expand Up @@ -245,7 +253,15 @@ def encode(self, variable: Variable, name: T_Name = None):
if not pd.isnull(fill_value) and not fv_exists:
data = duck_array_ops.fillna(data, fill_value)

return Variable(dims, data, attrs, encoding, fastpath=True, enum_meaning=enum_meaning, enum_name=enum_name)
return Variable(
dims,
data,
attrs,
encoding,
fastpath=True,
enum_meaning=enum_meaning,
enum_name=enum_name,
)

def decode(self, variable: Variable, name: T_Name = None):
dims, data, attrs, encoding, enum_meaning, enum_name = unpack(variable)
Expand Down Expand Up @@ -281,7 +297,15 @@ def decode(self, variable: Variable, name: T_Name = None):
)
data = lazy_elemwise_func(data, transform, dtype)

return Variable(dims, data, attrs, encoding, fastpath=True, enum_meaning=enum_meaning, enum_name=enum_name)
return Variable(
dims,
data,
attrs,
encoding,
fastpath=True,
enum_meaning=enum_meaning,
enum_name=enum_name,
)
else:
return variable

Expand Down Expand Up @@ -332,7 +356,15 @@ def encode(self, variable: Variable, name: T_Name = None) -> Variable:
if "scale_factor" in encoding:
data /= pop_to(encoding, attrs, "scale_factor", name=name)

return Variable(dims, data, attrs, encoding, fastpath=True, enum_meaning=enum_meaning, enum_name=enum_name)
return Variable(
dims,
data,
attrs,
encoding,
fastpath=True,
enum_meaning=enum_meaning,
enum_name=enum_name,
)

def decode(self, variable: Variable, name: T_Name = None) -> Variable:
_attrs = variable.attrs
Expand All @@ -354,7 +386,15 @@ def decode(self, variable: Variable, name: T_Name = None) -> Variable:
)
data = lazy_elemwise_func(data, transform, dtype)

return Variable(dims, data, attrs, encoding, fastpath=True, enum_meaning=enum_meaning, enum_name=enum_name)
return Variable(
dims,
data,
attrs,
encoding,
fastpath=True,
enum_meaning=enum_meaning,
enum_name=enum_name,
)
else:
return variable

Expand All @@ -375,7 +415,15 @@ def encode(self, variable: Variable, name: T_Name = None) -> Variable:
attrs["_FillValue"] = new_fill
data = duck_array_ops.astype(duck_array_ops.around(data), signed_dtype)

return Variable(dims, data, attrs, encoding, fastpath=True, enum_meaning=enum_meaning, enum_name=enum_name)
return Variable(
dims,
data,
attrs,
encoding,
fastpath=True,
enum_meaning=enum_meaning,
enum_name=enum_name,
)
else:
return variable

Expand Down Expand Up @@ -409,7 +457,15 @@ def decode(self, variable: Variable, name: T_Name = None) -> Variable:
stacklevel=3,
)

return Variable(dims, data, attrs, encoding, fastpath=True, enum_meaning=enum_meaning, enum_name=enum_name)
return Variable(
dims,
data,
attrs,
encoding,
fastpath=True,
enum_meaning=enum_meaning,
enum_name=enum_name,
)
else:
return variable

Expand All @@ -426,7 +482,15 @@ def encode(self, variable: Variable, name: T_Name = None) -> Variable:
and np.issubdtype(variable.dtype, np.floating)
):
attrs["_FillValue"] = variable.dtype.type(np.nan)
return Variable(dims, data, attrs, encoding, fastpath=True, enum_meaning=enum_meaning, enum_name=enum_name)
return Variable(
dims,
data,
attrs,
encoding,
fastpath=True,
enum_meaning=enum_meaning,
enum_name=enum_name,
)
else:
return variable

Expand All @@ -447,7 +511,15 @@ def encode(self, variable: Variable, name: T_Name = None) -> Variable:
attrs["dtype"] = "bool"
data = duck_array_ops.astype(data, dtype="i1", copy=True)

return Variable(dims, data, attrs, encoding, fastpath=True, enum_meaning=enum_meaning, enum_name=enum_name)
return Variable(
dims,
data,
attrs,
encoding,
fastpath=True,
enum_meaning=enum_meaning,
enum_name=enum_name,
)
else:
return variable

Expand All @@ -458,7 +530,15 @@ def decode(self, variable: Variable, name: T_Name = None) -> Variable:
# needed for correct subsequent encoding
encoding["dtype"] = attrs.pop("dtype")
data = BoolTypeArray(data)
return Variable(dims, data, attrs, encoding, fastpath=True, enum_meaning=enum_meaning, enum_name=enum_name)
return Variable(
dims,
data,
attrs,
encoding,
fastpath=True,
enum_meaning=enum_meaning,
enum_name=enum_name,
)
else:
return variable

Expand All @@ -473,7 +553,15 @@ def decode(self, variable: Variable, name: T_Name = None) -> Variable:
dims, data, attrs, encoding, enum_meaning, enum_name = unpack(variable)
if not data.dtype.isnative:
data = NativeEndiannessArray(data)
return Variable(dims, data, attrs, encoding, fastpath=True, enum_meaning=enum_meaning, enum_name=enum_name)
return Variable(
dims,
data,
attrs,
encoding,
fastpath=True,
enum_meaning=enum_meaning,
enum_name=enum_name,
)
else:
return variable

Expand Down Expand Up @@ -504,7 +592,15 @@ def encode(self, variable: Variable, name: T_Name = None) -> Variable:
)
data = np.around(data)
data = data.astype(dtype=dtype)
return Variable(dims, data, attrs, encoding, fastpath=True, enum_meaning=enum_meaning, enum_name=enum_name)
return Variable(
dims,
data,
attrs,
encoding,
fastpath=True,
enum_meaning=enum_meaning,
enum_name=enum_name,
)
else:
return variable

Expand Down
Loading

0 comments on commit 59e7390

Please sign in to comment.