Skip to content

Commit ced991c

Browse files
pre-commit-ci[bot]pre-commit-ci[bot]
committed
[pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
1 parent bdfa8ce commit ced991c

File tree

7 files changed

+210
-41
lines changed

7 files changed

+210
-41
lines changed

‎xarray/backends/netCDF4_.py

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -441,9 +441,14 @@ def open_store_variable(self, name, var):
441441
encoding["source"] = self._filename
442442
encoding["original_shape"] = var.shape
443443
encoding["dtype"] = var.dtype
444-
return Variable(dimensions, data, attributes, encoding,
445-
enum_meaning= enum_meaning,
446-
enum_name=enum_name)
444+
return Variable(
445+
dimensions,
446+
data,
447+
attributes,
448+
encoding,
449+
enum_meaning=enum_meaning,
450+
enum_name=enum_name,
451+
)
447452

448453
def get_variables(self):
449454
return FrozenDict(
@@ -514,9 +519,8 @@ def prepare_variable(
514519
enum = None
515520
if variable.enum_meaning:
516521
enum = self.ds.createEnumType(
517-
variable.dtype,
518-
variable.enum_name,
519-
variable.enum_meaning)
522+
variable.dtype, variable.enum_name, variable.enum_meaning
523+
)
520524

521525
if name in self.ds.variables:
522526
nc4_var = self.ds.variables[name]

‎xarray/coding/strings.py

Lines changed: 15 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,9 @@ def encode(self, variable, name=None):
6868
# TODO: figure out how to handle this in a lazy way with dask
6969
data = encode_string_array(data, string_encoding)
7070

71-
return Variable(dims, data, attrs, encoding, enum_meaning=enum_meaning, enum_name=enum_name)
71+
return Variable(
72+
dims, data, attrs, encoding, enum_meaning=enum_meaning, enum_name=enum_name
73+
)
7274

7375
def decode(self, variable, name=None):
7476
dims, data, attrs, encoding, enum_meaning, enum_name = unpack(variable)
@@ -78,7 +80,9 @@ def decode(self, variable, name=None):
7880
func = partial(decode_bytes_array, encoding=string_encoding)
7981
data = lazy_elemwise_func(data, func, np.dtype(object))
8082

81-
return Variable(dims, data, attrs, encoding, enum_meaning=enum_meaning, enum_name=enum_name)
83+
return Variable(
84+
dims, data, attrs, encoding, enum_meaning=enum_meaning, enum_name=enum_name
85+
)
8286

8387

8488
def decode_bytes_array(bytes_array, encoding="utf-8"):
@@ -100,7 +104,9 @@ def ensure_fixed_length_bytes(var):
100104
if check_vlen_dtype(data.dtype) == bytes:
101105
# TODO: figure out how to handle this with dask
102106
data = np.asarray(data, dtype=np.string_)
103-
return Variable(dims, data, attrs, encoding, enum_meaning=enum_meaning, enum_name=enum_name)
107+
return Variable(
108+
dims, data, attrs, encoding, enum_meaning=enum_meaning, enum_name=enum_name
109+
)
104110

105111

106112
class CharacterArrayCoder(VariableCoder):
@@ -117,7 +123,9 @@ def encode(self, variable, name=None):
117123
else:
118124
char_dim_name = f"string{data.shape[-1]}"
119125
dims = dims + (char_dim_name,)
120-
return Variable(dims, data, attrs, encoding, enum_meaning=enum_meaning, enum_name=enum_name)
126+
return Variable(
127+
dims, data, attrs, encoding, enum_meaning=enum_meaning, enum_name=enum_name
128+
)
121129

122130
def decode(self, variable, name=None):
123131
dims, data, attrs, encoding, enum_meaning, enum_name = unpack(variable)
@@ -126,7 +134,9 @@ def decode(self, variable, name=None):
126134
encoding["char_dim_name"] = dims[-1]
127135
dims = dims[:-1]
128136
data = char_to_bytes(data)
129-
return Variable(dims, data, attrs, encoding, enum_meaning=enum_meaning, enum_name=enum_name)
137+
return Variable(
138+
dims, data, attrs, encoding, enum_meaning=enum_meaning, enum_name=enum_name
139+
)
130140

131141

132142
def bytes_to_char(arr):

‎xarray/coding/times.py

Lines changed: 36 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -709,7 +709,15 @@ def encode(self, variable: Variable, name: T_Name = None) -> Variable:
709709
safe_setitem(attrs, "units", units, name=name)
710710
safe_setitem(attrs, "calendar", calendar, name=name)
711711

712-
return Variable(dims, data, attrs, encoding, fastpath=True, enum_meaning=enum_meaning, enum_name=enum_name)
712+
return Variable(
713+
dims,
714+
data,
715+
attrs,
716+
encoding,
717+
fastpath=True,
718+
enum_meaning=enum_meaning,
719+
enum_name=enum_name,
720+
)
713721
else:
714722
return variable
715723

@@ -729,7 +737,15 @@ def decode(self, variable: Variable, name: T_Name = None) -> Variable:
729737
)
730738
data = lazy_elemwise_func(data, transform, dtype)
731739

732-
return Variable(dims, data, attrs, encoding, fastpath=True, enum_meaning=enum_meaning, enum_name=enum_name)
740+
return Variable(
741+
dims,
742+
data,
743+
attrs,
744+
encoding,
745+
fastpath=True,
746+
enum_meaning=enum_meaning,
747+
enum_name=enum_name,
748+
)
733749
else:
734750
return variable
735751

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

745-
return Variable(dims, data, attrs, encoding, fastpath=True, enum_meaning=enum_meaning, enum_name=enum_name)
761+
return Variable(
762+
dims,
763+
data,
764+
attrs,
765+
encoding,
766+
fastpath=True,
767+
enum_meaning=enum_meaning,
768+
enum_name=enum_name,
769+
)
746770
else:
747771
return variable
748772

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

759-
return Variable(dims, data, attrs, encoding, fastpath=True, enum_meaning=enum_meaning, enum_name=enum_name)
783+
return Variable(
784+
dims,
785+
data,
786+
attrs,
787+
encoding,
788+
fastpath=True,
789+
enum_meaning=enum_meaning,
790+
enum_name=enum_name,
791+
)
760792
else:
761793
return variable

‎xarray/coding/variables.py

Lines changed: 108 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -168,7 +168,15 @@ def lazy_elemwise_func(array, func: Callable, dtype: np.typing.DTypeLike):
168168

169169

170170
def unpack(var: Variable) -> T_VarTuple:
171-
return var.dims, var.data, var.attrs.copy(), var.encoding.copy(), var.enum_meaning, var.enum_name,
171+
return (
172+
var.dims,
173+
var.data,
174+
var.attrs.copy(),
175+
var.encoding.copy(),
176+
var.enum_meaning,
177+
var.enum_name,
178+
)
179+
172180

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

248-
return Variable(dims, data, attrs, encoding, fastpath=True, enum_meaning=enum_meaning, enum_name=enum_name)
256+
return Variable(
257+
dims,
258+
data,
259+
attrs,
260+
encoding,
261+
fastpath=True,
262+
enum_meaning=enum_meaning,
263+
enum_name=enum_name,
264+
)
249265

250266
def decode(self, variable: Variable, name: T_Name = None):
251267
dims, data, attrs, encoding, enum_meaning, enum_name = unpack(variable)
@@ -281,7 +297,15 @@ def decode(self, variable: Variable, name: T_Name = None):
281297
)
282298
data = lazy_elemwise_func(data, transform, dtype)
283299

284-
return Variable(dims, data, attrs, encoding, fastpath=True, enum_meaning=enum_meaning, enum_name=enum_name)
300+
return Variable(
301+
dims,
302+
data,
303+
attrs,
304+
encoding,
305+
fastpath=True,
306+
enum_meaning=enum_meaning,
307+
enum_name=enum_name,
308+
)
285309
else:
286310
return variable
287311

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

335-
return Variable(dims, data, attrs, encoding, fastpath=True, enum_meaning=enum_meaning, enum_name=enum_name)
359+
return Variable(
360+
dims,
361+
data,
362+
attrs,
363+
encoding,
364+
fastpath=True,
365+
enum_meaning=enum_meaning,
366+
enum_name=enum_name,
367+
)
336368

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

357-
return Variable(dims, data, attrs, encoding, fastpath=True, enum_meaning=enum_meaning, enum_name=enum_name)
389+
return Variable(
390+
dims,
391+
data,
392+
attrs,
393+
encoding,
394+
fastpath=True,
395+
enum_meaning=enum_meaning,
396+
enum_name=enum_name,
397+
)
358398
else:
359399
return variable
360400

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

378-
return Variable(dims, data, attrs, encoding, fastpath=True, enum_meaning=enum_meaning, enum_name=enum_name)
418+
return Variable(
419+
dims,
420+
data,
421+
attrs,
422+
encoding,
423+
fastpath=True,
424+
enum_meaning=enum_meaning,
425+
enum_name=enum_name,
426+
)
379427
else:
380428
return variable
381429

@@ -409,7 +457,15 @@ def decode(self, variable: Variable, name: T_Name = None) -> Variable:
409457
stacklevel=3,
410458
)
411459

412-
return Variable(dims, data, attrs, encoding, fastpath=True, enum_meaning=enum_meaning, enum_name=enum_name)
460+
return Variable(
461+
dims,
462+
data,
463+
attrs,
464+
encoding,
465+
fastpath=True,
466+
enum_meaning=enum_meaning,
467+
enum_name=enum_name,
468+
)
413469
else:
414470
return variable
415471

@@ -426,7 +482,15 @@ def encode(self, variable: Variable, name: T_Name = None) -> Variable:
426482
and np.issubdtype(variable.dtype, np.floating)
427483
):
428484
attrs["_FillValue"] = variable.dtype.type(np.nan)
429-
return Variable(dims, data, attrs, encoding, fastpath=True, enum_meaning=enum_meaning, enum_name=enum_name)
485+
return Variable(
486+
dims,
487+
data,
488+
attrs,
489+
encoding,
490+
fastpath=True,
491+
enum_meaning=enum_meaning,
492+
enum_name=enum_name,
493+
)
430494
else:
431495
return variable
432496

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

450-
return Variable(dims, data, attrs, encoding, fastpath=True, enum_meaning=enum_meaning, enum_name=enum_name)
514+
return Variable(
515+
dims,
516+
data,
517+
attrs,
518+
encoding,
519+
fastpath=True,
520+
enum_meaning=enum_meaning,
521+
enum_name=enum_name,
522+
)
451523
else:
452524
return variable
453525

@@ -458,7 +530,15 @@ def decode(self, variable: Variable, name: T_Name = None) -> Variable:
458530
# needed for correct subsequent encoding
459531
encoding["dtype"] = attrs.pop("dtype")
460532
data = BoolTypeArray(data)
461-
return Variable(dims, data, attrs, encoding, fastpath=True, enum_meaning=enum_meaning, enum_name=enum_name)
533+
return Variable(
534+
dims,
535+
data,
536+
attrs,
537+
encoding,
538+
fastpath=True,
539+
enum_meaning=enum_meaning,
540+
enum_name=enum_name,
541+
)
462542
else:
463543
return variable
464544

@@ -473,7 +553,15 @@ def decode(self, variable: Variable, name: T_Name = None) -> Variable:
473553
dims, data, attrs, encoding, enum_meaning, enum_name = unpack(variable)
474554
if not data.dtype.isnative:
475555
data = NativeEndiannessArray(data)
476-
return Variable(dims, data, attrs, encoding, fastpath=True, enum_meaning=enum_meaning, enum_name=enum_name)
556+
return Variable(
557+
dims,
558+
data,
559+
attrs,
560+
encoding,
561+
fastpath=True,
562+
enum_meaning=enum_meaning,
563+
enum_name=enum_name,
564+
)
477565
else:
478566
return variable
479567

@@ -504,7 +592,15 @@ def encode(self, variable: Variable, name: T_Name = None) -> Variable:
504592
)
505593
data = np.around(data)
506594
data = data.astype(dtype=dtype)
507-
return Variable(dims, data, attrs, encoding, fastpath=True, enum_meaning=enum_meaning, enum_name=enum_name)
595+
return Variable(
596+
dims,
597+
data,
598+
attrs,
599+
encoding,
600+
fastpath=True,
601+
enum_meaning=enum_meaning,
602+
enum_name=enum_name,
603+
)
508604
else:
509605
return variable
510606

‎xarray/conventions.py

Lines changed: 21 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -145,7 +145,15 @@ def ensure_dtype_not_object(var: Variable, name: T_Name = None) -> Variable:
145145
data = _copy_with_dtype(data, dtype=_infer_dtype(data, name))
146146

147147
assert data.dtype.kind != "O" or data.dtype.metadata
148-
var = Variable(dims, data, attrs, encoding, fastpath=True, enum_meaning=enum_meaning, enum_name=enum_name)
148+
var = Variable(
149+
dims,
150+
data,
151+
attrs,
152+
encoding,
153+
fastpath=True,
154+
enum_meaning=enum_meaning,
155+
enum_name=enum_name,
156+
)
149157
return var
150158

151159

@@ -282,14 +290,24 @@ def decode_cf_variable(
282290

283291
var = variables.BooleanCoder().decode(var)
284292

285-
dimensions, data, attributes, encoding, enum_meaning, enum_name = variables.unpack(var)
293+
dimensions, data, attributes, encoding, enum_meaning, enum_name = variables.unpack(
294+
var
295+
)
286296

287297
encoding.setdefault("dtype", original_dtype)
288298

289299
if not is_duck_dask_array(data):
290300
data = indexing.LazilyIndexedArray(data)
291301

292-
return Variable(dimensions, data, attributes, encoding=encoding, fastpath=True, enum_meaning=enum_meaning, enum_name=enum_name)
302+
return Variable(
303+
dimensions,
304+
data,
305+
attributes,
306+
encoding=encoding,
307+
fastpath=True,
308+
enum_meaning=enum_meaning,
309+
enum_name=enum_name,
310+
)
293311

294312

295313
def _update_bounds_attributes(variables: T_Variables) -> None:

0 commit comments

Comments
 (0)