Merge branch 'climatological_op' into select_indicators_for_available…

…_vars
Ouranosinc · Nov 29, 2023 · 5a0abdb · 5a0abdb
2 parents ffabb74 + 4cc6928
commit 5a0abdb
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git 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
@@ -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
@@ -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",

diff --git 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'].