From 49105b5d8c6a5720a6db45488b487c5a30370c2e Mon Sep 17 00:00:00 2001 From: Trevor James Smith <10819524+Zeitsperre@users.noreply.github.com> Date: Tue, 10 Dec 2024 16:38:37 -0500 Subject: [PATCH 1/8] various typing and signature fixes --- docs/conf.py | 7 ++++--- src/xclim/cli.py | 2 +- src/xclim/core/bootstrapping.py | 6 +++++- src/xclim/core/dataflags.py | 4 ++-- src/xclim/core/indicator.py | 6 ++++-- src/xclim/core/units.py | 6 +++--- src/xclim/ensembles/_base.py | 1 + src/xclim/ensembles/_reduce.py | 5 +++-- src/xclim/indices/_agro.py | 2 +- src/xclim/indices/_threshold.py | 11 ++++------- src/xclim/indices/helpers.py | 4 +--- src/xclim/indices/run_length.py | 2 +- src/xclim/sdba/_adjustment.py | 10 +++++----- src/xclim/sdba/processing.py | 18 +++++++++--------- src/xclim/sdba/utils.py | 8 +++++--- src/xclim/testing/helpers.py | 13 ++++++------- 16 files changed, 55 insertions(+), 50 deletions(-) diff --git a/docs/conf.py b/docs/conf.py index b3f3340af..0a1ed342b 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -16,6 +16,7 @@ import datetime import json import os +import pathlib import sys import warnings @@ -67,13 +68,13 @@ # Dump indicators to json. The json is added to the html output (html_extra_path) # It is read by _static/indsearch.js to populate the table in indicators.rst os.makedirs("_dynamic", exist_ok=True) -with open("_dynamic/indicators.json", "w") as f: +with pathlib.Path("_dynamic/indicators.json").open("w") as f: json.dump(indicators, f) # Dump variables information -with open("variables.json", "w") as fout: - with open("../src/xclim/data/variables.yml") as fin: +with pathlib.Path("variables.json").open("w") as fout: + with pathlib.Path("../src/xclim/data/variables.yml").open() as fin: data = yaml.safe_load(fin) json.dump(data, fout) diff --git a/src/xclim/cli.py b/src/xclim/cli.py index 8a5dbdb34..e7caed251 100644 --- a/src/xclim/cli.py +++ b/src/xclim/cli.py @@ -518,7 +518,7 @@ def cli(ctx, **kwargs): # numpydoc ignore=PR01 @cli.result_callback() @click.pass_context -def write_file(ctx, *args, **kwargs): # numpydoc ignore=PR01 +def write_file(ctx, *_, **kwargs): # numpydoc ignore=PR01 """Write the output dataset to file.""" if ctx.obj["output"] is not None: if ctx.obj["verbose"]: diff --git a/src/xclim/core/bootstrapping.py b/src/xclim/core/bootstrapping.py index 5dbe7a449..81fe85e88 100644 --- a/src/xclim/core/bootstrapping.py +++ b/src/xclim/core/bootstrapping.py @@ -126,13 +126,17 @@ def bootstrap_func(compute_index_func: Callable, **kwargs) -> xarray.DataArray: :cite:cts:`zhang_avoiding_2005` """ # Identify the input and the percentile arrays from the bound arguments - per_key = None + per_key, da_key = None, None for name, val in kwargs.items(): if isinstance(val, DataArray): if "percentile_doy" in val.attrs.get("history", ""): per_key = name else: da_key = name + if da_key is None or per_key is None: + raise KeyError( + "The input data and the percentile DataArray must be provided as named arguments." + ) # Extract the DataArray inputs from the arguments da: DataArray = kwargs.pop(da_key) per_da: DataArray | None = kwargs.pop(per_key, None) diff --git a/src/xclim/core/dataflags.py b/src/xclim/core/dataflags.py index f521a8eb5..eb574b91d 100644 --- a/src/xclim/core/dataflags.py +++ b/src/xclim/core/dataflags.py @@ -639,11 +639,11 @@ def data_flags( # noqa: C901 >>> from xclim.core.dataflags import data_flags >>> ds = xr.open_dataset(path_to_pr_file) - >>> flagged = data_flags(ds.pr, ds) + >>> flagged_multi = data_flags(ds.pr, ds) >>> # The next example evaluates only one data flag, passing specific parameters. It also aggregates the flags >>> # yearly over the "time" dimension only, such that a True means there is a bad data point for that year >>> # at that location. - >>> flagged = data_flags( + >>> flagged_single = data_flags( ... ds.pr, ... ds, ... flags={"very_large_precipitation_events": {"thresh": "250 mm d-1"}}, diff --git a/src/xclim/core/indicator.py b/src/xclim/core/indicator.py index d27103765..7d417e2e1 100644 --- a/src/xclim/core/indicator.py +++ b/src/xclim/core/indicator.py @@ -873,7 +873,7 @@ def __call__(self, *args, **kwds): out_attrs.pop("units", None) else: out_attrs = {} - out_attrs = [out_attrs.copy() for i in range(self.n_outs)] + out_attrs = [out_attrs.copy() for _ in range(self.n_outs)] das, params = self._preprocess_and_checks(das, params) @@ -943,7 +943,9 @@ def __call__(self, *args, **kwds): return outs[0] return tuple(outs) - def _parse_variables_from_call(self, args, kwds) -> tuple[OrderedDict, dict]: + def _parse_variables_from_call( + self, args, kwds + ) -> tuple[OrderedDict, OrderedDict, OrderedDict | dict]: """Extract variable and optional variables from call arguments.""" # Bind call arguments to `compute` arguments and set defaults. ba = self.__signature__.bind(*args, **kwds) diff --git a/src/xclim/core/units.py b/src/xclim/core/units.py index 909808a8d..2bdb233a4 100644 --- a/src/xclim/core/units.py +++ b/src/xclim/core/units.py @@ -1308,7 +1308,7 @@ def _check_output_has_units( # FIXME: This needs to be properly annotated for mypy compliance. # See: https://mypy.readthedocs.io/en/stable/generics.html#declaring-decorators -def declare_relative_units(**units_by_name) -> Callable: +def declare_relative_units(**units_by_name: str) -> Callable: r""" Function decorator checking the units of arguments. @@ -1317,7 +1317,7 @@ def declare_relative_units(**units_by_name) -> Callable: Parameters ---------- - **units_by_name : dict + **units_by_name : str Mapping from the input parameter names to dimensions relative to other parameters. The dimensions can be a single parameter name as `` or more complex expressions, such as ` * [time]`. @@ -1430,7 +1430,7 @@ def declare_units(**units_by_name) -> Callable: Parameters ---------- - **units_by_name : dict + **units_by_name : str Mapping from the input parameter names to their units or dimensionality ("[...]"). If this decorates a function previously decorated with :py:func:`declare_relative_units`, the relative unit declarations are made absolute with the information passed here. diff --git a/src/xclim/ensembles/_base.py b/src/xclim/ensembles/_base.py index 52047e03d..64ea60bd9 100644 --- a/src/xclim/ensembles/_base.py +++ b/src/xclim/ensembles/_base.py @@ -187,6 +187,7 @@ def ensemble_mean_std_max_min( ds_out[f"{v}_max"] = ens[v].max(dim="realization") ds_out[f"{v}_min"] = ens[v].min(dim="realization") + enough = None if min_members != 1: enough = ens[v].notnull().sum("realization") >= min_members diff --git a/src/xclim/ensembles/_reduce.py b/src/xclim/ensembles/_reduce.py index fabe81b04..72d501184 100644 --- a/src/xclim/ensembles/_reduce.py +++ b/src/xclim/ensembles/_reduce.py @@ -8,6 +8,7 @@ from __future__ import annotations +from typing import Any from warnings import warn import numpy as np @@ -128,7 +129,7 @@ def kkz_reduce_ensemble( *, dist_method: str = "euclidean", standardize: bool = True, - **cdist_kwargs, + **cdist_kwargs: Any, ) -> list: r""" Return a sample of ensemble members using KKZ selection. @@ -152,7 +153,7 @@ def kkz_reduce_ensemble( standardize : bool Whether to standardize the input before running the selection or not. Standardization consists in translation as to have a zero mean and scaling as to have a unit standard deviation. - **cdist_kwargs : dict + **cdist_kwargs : Any All extra arguments are passed as-is to `scipy.spatial.distance.cdist`, see its docs for more information. Returns diff --git a/src/xclim/indices/_agro.py b/src/xclim/indices/_agro.py index c66408f0d..52726c3f9 100644 --- a/src/xclim/indices/_agro.py +++ b/src/xclim/indices/_agro.py @@ -1215,7 +1215,7 @@ def standardized_precipitation_index( ... method="ML", ... zero_inflated=True, ... ) # First getting params - >>> spi_3 = standardized_precipitation_index(pr, params=params) + >>> spi_3_fitted = standardized_precipitation_index(pr, params=params) """ fitkwargs = fitkwargs or {} dist_methods = {"gamma": ["ML", "APP"], "fisk": ["ML", "APP"]} diff --git a/src/xclim/indices/_threshold.py b/src/xclim/indices/_threshold.py index 13420027b..9f11be29c 100644 --- a/src/xclim/indices/_threshold.py +++ b/src/xclim/indices/_threshold.py @@ -1973,7 +1973,6 @@ def hot_spell_max_magnitude( thresh: Quantified = "25.0 degC", window: int = 3, freq: str = "YS", - op: str = ">", resample_before_rl: bool = True, ) -> xarray.DataArray: """ @@ -1993,8 +1992,6 @@ def hot_spell_max_magnitude( Minimum number of days with temperature above threshold to qualify as a heatwave. freq : str Resampling frequency. - op : {">", ">=", "gt", "ge"} - Comparison operation. Default: ">". resample_before_rl : bool Determines if the resampling should take place before or after the run length encoding (or a similar algorithm) is applied to runs. @@ -3273,8 +3270,8 @@ def dry_spell_frequency( -------- >>> from xclim.indices import dry_spell_frequency >>> pr = xr.open_dataset(path_to_pr_file).pr - >>> dsf = dry_spell_frequency(pr=pr, op="sum") - >>> dsf = dry_spell_frequency(pr=pr, op="max") + >>> dsf_sum = dry_spell_frequency(pr=pr, op="sum") + >>> dsf_max = dry_spell_frequency(pr=pr, op="max") """ pram = rate2amount(convert_units_to(pr, "mm/d", context="hydro"), out_units="mm") return spell_length_statistics( @@ -3481,8 +3478,8 @@ def wet_spell_frequency( -------- >>> from xclim.indices import wet_spell_frequency >>> pr = xr.open_dataset(path_to_pr_file).pr - >>> dsf = wet_spell_frequency(pr=pr, op="sum") - >>> dsf = wet_spell_frequency(pr=pr, op="min") + >>> dsf_sum = wet_spell_frequency(pr=pr, op="sum") + >>> dsf_min = wet_spell_frequency(pr=pr, op="min") """ pram = rate2amount(convert_units_to(pr, "mm/d", context="hydro"), out_units="mm") return spell_length_statistics( diff --git a/src/xclim/indices/helpers.py b/src/xclim/indices/helpers.py index abe8e86de..4475830fc 100644 --- a/src/xclim/indices/helpers.py +++ b/src/xclim/indices/helpers.py @@ -803,9 +803,7 @@ def make_hourly_temperature(tasmin: xr.DataArray, tasmax: xr.DataArray) -> xr.Da hourly = data.resample(time="h").ffill().isel(time=slice(0, -1)) # To avoid "invalid value encountered in log" warning we set hours before sunset to 1 - nighttime_hours = nighttime_hours = ( - hourly.time.dt.hour + 1 - hourly.daylength - ).clip(1) + nighttime_hours = (hourly.time.dt.hour + 1 - hourly.daylength).clip(1) return xr.where( hourly.time.dt.hour < hourly.daylength, diff --git a/src/xclim/indices/run_length.py b/src/xclim/indices/run_length.py index fc75d7577..894a08902 100644 --- a/src/xclim/indices/run_length.py +++ b/src/xclim/indices/run_length.py @@ -107,7 +107,7 @@ def resample_and_rl( Resampling frequency. dim : str The dimension along which to find runs. - **kwargs : dict + **kwargs : Any Keyword arguments needed in `compute`. Returns diff --git a/src/xclim/sdba/_adjustment.py b/src/xclim/sdba/_adjustment.py index 1d32c268e..4398cec0e 100644 --- a/src/xclim/sdba/_adjustment.py +++ b/src/xclim/sdba/_adjustment.py @@ -339,9 +339,9 @@ def _npdft_adjust(sim, af_q, rots, quantiles, method, extrap): def mbcn_adjust( - ref: xr.Dataset, - hist: xr.Dataset, - sim: xr.Dataset, + ref: xr.DataArray, + hist: xr.DataArray, + sim: xr.DataArray, ds: xr.Dataset, pts_dims: Sequence[str], interp: str, @@ -350,7 +350,7 @@ def mbcn_adjust( base_kws_vars: dict, adj_kws: dict, period_dim: str | None, -) -> xr.DataArray: +) -> xr.Dataset: """Perform the adjustment portion MBCn multivariate bias correction technique. The function :py:func:`mbcn_train` pre-computes the adjustment factors for each rotation @@ -696,7 +696,7 @@ def npdf_transform(ds: xr.Dataset, **kwargs) -> xr.Dataset: hist : simulated timeseries on the reference period sim : Simulated timeseries on the projected period. rot_matrices : Random rotation matrices. - **kwargs : dict + **kwargs : Any pts_dim : multivariate dimension name base : Adjustment class base_kws : Kwargs for initialising the adjustment object diff --git a/src/xclim/sdba/processing.py b/src/xclim/sdba/processing.py index d102143ca..0466fde48 100644 --- a/src/xclim/sdba/processing.py +++ b/src/xclim/sdba/processing.py @@ -852,14 +852,14 @@ def grouped_time_indexes(times, group): Time indexes of the blocks (built with a rolling window of `group.window` if any). """ - def _get_group_complement(da, group): + def _get_group_complement(_da, _group): # complement of "dayofyear": "year", etc. - gr = group if isinstance(group, str) else group.name - if gr == "time.dayofyear": - return da.time.dt.year - if gr == "time.month": - return da.time.dt.strftime("%Y-%d") - raise NotImplementedError(f"Grouping {gr} not implemented.") + _gr = _group if isinstance(_group, str) else _group.name + if _gr == "time.dayofyear": + return _da.time.dt.year + if _gr == "time.month": + return _da.time.dt.strftime("%Y-%d") + raise NotImplementedError(f"Grouping {_gr} not implemented.") # does not work with group == "time.month" group = group if isinstance(group, Grouper) else Grouper(group) @@ -871,14 +871,14 @@ def _get_group_complement(da, group): ) if gr == "time.dayofyear": # time indices for each block with window = 1 - g_idxs = timeind.groupby(gr).apply( + g_idxs = timeind.groupby(gr).map( lambda da: da.assign_coords(time=_get_group_complement(da, gr)).rename( {"time": "year"} ) ) # time indices for each block with general window da = timeind.rolling(time=win, center=True).construct(window_dim=win_dim0) - gw_idxs = da.groupby(gr).apply( + gw_idxs = da.groupby(gr).map( lambda da: da.assign_coords(time=_get_group_complement(da, gr)).stack( {win_dim: ["time", win_dim0]} ) diff --git a/src/xclim/sdba/utils.py b/src/xclim/sdba/utils.py index 12af93139..f8c2a6d2f 100644 --- a/src/xclim/sdba/utils.py +++ b/src/xclim/sdba/utils.py @@ -6,7 +6,7 @@ from __future__ import annotations import itertools -from collections.abc import Callable +from collections.abc import Callable, Sequence from warnings import warn import bottleneck as bn @@ -80,7 +80,9 @@ def map_cdf( ) -def ecdf(x: xr.DataArray, value: float, dim: str = "time") -> xr.DataArray: +def ecdf( + x: xr.DataArray, value: float, dim: str | Sequence[str] = "time" +) -> xr.DataArray: """Return the empirical CDF of a sample at a given value. Parameters @@ -948,7 +950,7 @@ def _skipna_correlation(data): # The output out = np.empty((nv, nv), dtype=coef.dtype) # A 2D mask of removed variables - M = (mask_omit)[:, np.newaxis] | (mask_omit)[np.newaxis, :] + M = mask_omit[:, np.newaxis] | mask_omit[np.newaxis, :] out[~M] = coef.flatten() out[M] = np.nan return out diff --git a/src/xclim/testing/helpers.py b/src/xclim/testing/helpers.py index 11fb0ac2e..6b21fba59 100644 --- a/src/xclim/testing/helpers.py +++ b/src/xclim/testing/helpers.py @@ -173,13 +173,12 @@ def add_doctest_filepaths() -> dict[str, Any]: dict[str, Any] A dictionary of xdoctest namespace objects. """ - namespace: dict = {} - namespace["np"] = np - namespace["xclim"] = xclim - namespace["tas"] = test_timeseries( - np.random.rand(365) * 20 + 253.15, variable="tas" - ) - namespace["pr"] = test_timeseries(np.random.rand(365) * 5, variable="pr") + namespace = { + "np": np, + "xclim": xclim, + "tas": test_timeseries(np.random.rand(365) * 20 + 253.15, variable="tas"), + "pr": test_timeseries(np.random.rand(365) * 5, variable="pr"), + } return namespace From 1d26de8424ba4497e1c5c3b21d5c06c468e28390 Mon Sep 17 00:00:00 2001 From: Zeitsperre <10819524+Zeitsperre@users.noreply.github.com> Date: Wed, 11 Dec 2024 13:44:51 -0500 Subject: [PATCH 2/8] update CHANGELOG.rst --- CHANGELOG.rst | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG.rst b/CHANGELOG.rst index ffd7ab3fb..5276ccfa8 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -14,6 +14,7 @@ Breaking changes ^^^^^^^^^^^^^^^^ * The minimum required version of `dask` has been increased to `2024.8.1`. (:issue:`1992`, :pull:`1991`). * The docstrings of many `xclim` modules, classes, methods, and functions have been slightly adjusted to ensure stricter compliance with established `numpy` docstring conventions. (:pull:`1988`). +* The call signature of ``xclim.indices.hot_spell_magnitude`` originally asked for an `op` argument that was not used. This argument has been removed. (:pull:`2018`). Bug fixes ^^^^^^^^^ @@ -34,6 +35,7 @@ Internal changes * `xclim` now uses a `src` layout for the codebase. Structure-dependent functions, documentation, and build commands have been adapted to reflect these changes. (:pull:`1971`). * Added a more robust `yamllint` configuration to ensure that all YAML files are linted consistently. (:pull:`1971`). * Addressed a very rare singular matrix error that can happen in ``test_loess_smoothing_nan``. (:pull:`2015`). +* Addressed a handful of typing and call signature issues in the `xclim` codebase. (:pull:`2018`). CI changes ^^^^^^^^^^ From 4e6608d4fa6d459878e4f70d7c11fb002a8603db Mon Sep 17 00:00:00 2001 From: SarahG-579462 Date: Wed, 11 Dec 2024 18:54:13 +0000 Subject: [PATCH 3/8] Proper fix for loess linalg error - non-random tests --- tests/test_sdba/test_loess.py | 24 +++++++++++++++--------- 1 file changed, 15 insertions(+), 9 deletions(-) diff --git a/tests/test_sdba/test_loess.py b/tests/test_sdba/test_loess.py index fb802f3fa..99281b740 100644 --- a/tests/test_sdba/test_loess.py +++ b/tests/test_sdba/test_loess.py @@ -74,7 +74,20 @@ def test_loess_smoothing(use_dask, open_dataset): @pytest.mark.parametrize("use_dask", [True, False]) def test_loess_smoothing_nan(use_dask): # create data with one axis full of nan - data = np.random.randn(2, 2, 10) + # (random array taken from np.random.randn) + data = np.array( + [ + -0.993, -0.980, -0.452, -0.076, 0.447, + 0.389, 2.408, 0.966, -0.793, 0.090, + -0.173, 1.713, -1.579, 0.454, -0.272, + -0.005, -0.926, -2.022, -1.661, -0.493, + -0.643, 0.891, 0.194, 0.086, 0.983, + -1.048, 2.032, 1.174, -0.441, -0.204, + -1.126, 0.933, 1.987, 0.638, 0.789, + 0.767, 0.676, -1.028, 1.422, 0.453, + ] + ) + data = data.reshape(2,2,10) data[0, 0] = [np.nan] * 10 da = xr.DataArray( data, @@ -86,11 +99,4 @@ def test_loess_smoothing_nan(use_dask): assert out.dims == da.dims # check that the output is all nan on the axis with nan in the input - try: - assert np.isnan(out.values[0, 0]).all() - except np.linalg.LinAlgError: - msg = ( - "This has roughly a 1/50,000,000 chance of occurring. Buy a lottery ticket!" - ) - logging.error(msg) - pass + assert np.isnan(out.values[0, 0]).all() From d6fce9b90aa2903e9997ea21f54b248ad5775fb0 Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Wed, 11 Dec 2024 18:59:47 +0000 Subject: [PATCH 4/8] [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci --- tests/test_sdba/test_loess.py | 52 +++++++++++++++++++++++++++-------- 1 file changed, 41 insertions(+), 11 deletions(-) diff --git a/tests/test_sdba/test_loess.py b/tests/test_sdba/test_loess.py index 99281b740..cb50f388b 100644 --- a/tests/test_sdba/test_loess.py +++ b/tests/test_sdba/test_loess.py @@ -1,7 +1,5 @@ from __future__ import annotations -import logging - import numpy as np import pandas as pd import pytest @@ -77,17 +75,49 @@ def test_loess_smoothing_nan(use_dask): # (random array taken from np.random.randn) data = np.array( [ - -0.993, -0.980, -0.452, -0.076, 0.447, - 0.389, 2.408, 0.966, -0.793, 0.090, - -0.173, 1.713, -1.579, 0.454, -0.272, - -0.005, -0.926, -2.022, -1.661, -0.493, - -0.643, 0.891, 0.194, 0.086, 0.983, - -1.048, 2.032, 1.174, -0.441, -0.204, - -1.126, 0.933, 1.987, 0.638, 0.789, - 0.767, 0.676, -1.028, 1.422, 0.453, + -0.993, + -0.980, + -0.452, + -0.076, + 0.447, + 0.389, + 2.408, + 0.966, + -0.793, + 0.090, + -0.173, + 1.713, + -1.579, + 0.454, + -0.272, + -0.005, + -0.926, + -2.022, + -1.661, + -0.493, + -0.643, + 0.891, + 0.194, + 0.086, + 0.983, + -1.048, + 2.032, + 1.174, + -0.441, + -0.204, + -1.126, + 0.933, + 1.987, + 0.638, + 0.789, + 0.767, + 0.676, + -1.028, + 1.422, + 0.453, ] ) - data = data.reshape(2,2,10) + data = data.reshape(2, 2, 10) data[0, 0] = [np.nan] * 10 da = xr.DataArray( data, From 82e7cdfa1efd1bec7f832db62478e590df603a27 Mon Sep 17 00:00:00 2001 From: SarahG-579462 Date: Wed, 11 Dec 2024 20:02:45 +0000 Subject: [PATCH 5/8] format --- tests/test_sdba/test_loess.py | 54 +++++++++-------------------------- 1 file changed, 13 insertions(+), 41 deletions(-) diff --git a/tests/test_sdba/test_loess.py b/tests/test_sdba/test_loess.py index cb50f388b..4da732fd7 100644 --- a/tests/test_sdba/test_loess.py +++ b/tests/test_sdba/test_loess.py @@ -1,5 +1,7 @@ from __future__ import annotations +import logging + import numpy as np import pandas as pd import pytest @@ -73,50 +75,20 @@ def test_loess_smoothing(use_dask, open_dataset): def test_loess_smoothing_nan(use_dask): # create data with one axis full of nan # (random array taken from np.random.randn) + # fmt: off data = np.array( [ - -0.993, - -0.980, - -0.452, - -0.076, - 0.447, - 0.389, - 2.408, - 0.966, - -0.793, - 0.090, - -0.173, - 1.713, - -1.579, - 0.454, - -0.272, - -0.005, - -0.926, - -2.022, - -1.661, - -0.493, - -0.643, - 0.891, - 0.194, - 0.086, - 0.983, - -1.048, - 2.032, - 1.174, - -0.441, - -0.204, - -1.126, - 0.933, - 1.987, - 0.638, - 0.789, - 0.767, - 0.676, - -1.028, - 1.422, - 0.453, + -0.993, -0.980, -0.452, -0.076, 0.447, + 0.389, 2.408, 0.966, -0.793, 0.090, + -0.173, 1.713, -1.579, 0.454, -0.272, + -0.005, -0.926, -2.022, -1.661, -0.493, + -0.643, 0.891, 0.194, 0.086, 0.983, + -1.048, 2.032, 1.174, -0.441, -0.204, + -1.126, 0.933, 1.987, 0.638, 0.789, + 0.767, 0.676, -1.028, 1.422, 0.453, ] - ) + ) + # fmt: on data = data.reshape(2, 2, 10) data[0, 0] = [np.nan] * 10 da = xr.DataArray( From 19aae7994c96158669e2ed8cbdcb0638c9335bc6 Mon Sep 17 00:00:00 2001 From: Zeitsperre <10819524+Zeitsperre@users.noreply.github.com> Date: Wed, 11 Dec 2024 15:28:52 -0500 Subject: [PATCH 6/8] formatting exceptions --- tests/test_sdba/test_loess.py | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/tests/test_sdba/test_loess.py b/tests/test_sdba/test_loess.py index 4da732fd7..c2d8ff5ec 100644 --- a/tests/test_sdba/test_loess.py +++ b/tests/test_sdba/test_loess.py @@ -1,7 +1,6 @@ +# ruff: noqa: E241 from __future__ import annotations -import logging - import numpy as np import pandas as pd import pytest @@ -13,7 +12,7 @@ _linear_regression, # noqa _loess_nb, # noqa _tricube_weighting, # noqa - loess_smoothing, + loess_smoothing, # noqa ) @@ -87,9 +86,9 @@ def test_loess_smoothing_nan(use_dask): -1.126, 0.933, 1.987, 0.638, 0.789, 0.767, 0.676, -1.028, 1.422, 0.453, ] - ) + ) # fmt: on - data = data.reshape(2, 2, 10) + data = data.reshape(2, 2, 10) # pylint: disable=too-many-function-args data[0, 0] = [np.nan] * 10 da = xr.DataArray( data, From 8b31dc2ab1591e8d959d52b89d6d95429a27723d Mon Sep 17 00:00:00 2001 From: Ouranos Helper Bot Date: Wed, 11 Dec 2024 20:57:48 +0000 Subject: [PATCH 7/8] =?UTF-8?q?Bump=20version:=200.53.3-dev.15=20=E2=86=92?= =?UTF-8?q?=200.53.3-dev.16?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pyproject.toml | 2 +- src/xclim/__init__.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index 0b731fdf7..b5ef1f06e 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -136,7 +136,7 @@ target-version = [ ] [tool.bumpversion] -current_version = "0.53.3-dev.15" +current_version = "0.53.3-dev.16" commit = true commit_args = "--no-verify" tag = false diff --git a/src/xclim/__init__.py b/src/xclim/__init__.py index ca32aa519..b8321d3ac 100644 --- a/src/xclim/__init__.py +++ b/src/xclim/__init__.py @@ -13,7 +13,7 @@ __author__ = """Travis Logan""" __email__ = "logan.travis@ouranos.ca" -__version__ = "0.53.3-dev.15" +__version__ = "0.53.3-dev.16" with _resources.as_file(_resources.files("xclim.data")) as _module_data: From 226c60ebf63b256f15997db1790865f1ae601e84 Mon Sep 17 00:00:00 2001 From: Ouranos Helper Bot Date: Wed, 11 Dec 2024 21:20:34 +0000 Subject: [PATCH 8/8] =?UTF-8?q?Bump=20version:=200.53.3-dev.16=20=E2=86=92?= =?UTF-8?q?=200.53.3-dev.17?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pyproject.toml | 2 +- src/xclim/__init__.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index b5ef1f06e..c62980e8d 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -136,7 +136,7 @@ target-version = [ ] [tool.bumpversion] -current_version = "0.53.3-dev.16" +current_version = "0.53.3-dev.17" commit = true commit_args = "--no-verify" tag = false diff --git a/src/xclim/__init__.py b/src/xclim/__init__.py index b8321d3ac..29a057cab 100644 --- a/src/xclim/__init__.py +++ b/src/xclim/__init__.py @@ -13,7 +13,7 @@ __author__ = """Travis Logan""" __email__ = "logan.travis@ouranos.ca" -__version__ = "0.53.3-dev.16" +__version__ = "0.53.3-dev.17" with _resources.as_file(_resources.files("xclim.data")) as _module_data: