From 851de09585b5fd25173c74cf172a1aa336c54fe1 Mon Sep 17 00:00:00 2001 From: Marco Braun <43412203+vindelico@users.noreply.github.com> Date: Tue, 21 Nov 2023 19:35:21 -0500 Subject: [PATCH 1/2] Update aggregate.py --- xscen/aggregate.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xscen/aggregate.py b/xscen/aggregate.py index 14c68058..1719dbbf 100644 --- a/xscen/aggregate.py +++ b/xscen/aggregate.py @@ -129,7 +129,7 @@ def climatological_op( ['max', 'mean', 'median', 'min', 'std', 'sum', 'var', 'linregress']. Operations beyond methods of xarray.core.rolling.DatasetRolling include: - - 'linregress' : Computes the linear regression over the periods or it's windows, using + - 'linregress' : Computes the linear regression over the periods or its windows, using scipy.stats.linregress employing years as regressors. Here the output has a new dimension 'linreg_param' with coordinates: ['slope', 'intercept', 'rvalue', 'pvalue', 'stderr', 'intercept_stderr']. From cb26323b65fa9bc59b81012e0e04ac0e555f05b7 Mon Sep 17 00:00:00 2001 From: Pascal Bourgault Date: Tue, 28 Nov 2023 16:58:44 -0500 Subject: [PATCH 2/2] Temporary pin for xarray --- environment-dev.yml | 2 +- environment.yml | 2 +- setup.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/environment-dev.yml b/environment-dev.yml index f66b3cd8..176b1da0 100644 --- a/environment-dev.yml +++ b/environment-dev.yml @@ -27,7 +27,7 @@ dependencies: - shapely >=2.0 - sparse - toolz - - xarray + - xarray <2023.11.0 - xclim >=0.46.0 - xesmf >=0.7 - zarr diff --git a/environment.yml b/environment.yml index ccd95857..10906c80 100644 --- a/environment.yml +++ b/environment.yml @@ -27,7 +27,7 @@ dependencies: - shapely >=2.0 - sparse - toolz - - xarray + - xarray <2023.11.0 - xclim >=0.46.0 - xesmf >=0.7 - zarr diff --git a/setup.py b/setup.py index f34e9227..4ec6ba87 100644 --- a/setup.py +++ b/setup.py @@ -61,7 +61,7 @@ def run(self): "shapely>=2.0", "sparse", "toolz", - "xarray", + "xarray<2023.11.0", # TODO: UNPIN BEFORE RELEASING "xclim>=0.43", "xesmf>=0.7.0", "zarr",