Merge branch 'main' into fix-template

.cruft.json

@@ -11,7 +11,7 @@
       "project_slug": "xscen",
       "project_short_description": "A climate change scenario-building analysis framework, built with xclim/xarray.",
       "pypi_username": "RondeauG",
-      "version": "0.9.0",
+      "version": "0.9.1-dev.0",
       "use_pytest": "y",
       "use_black": "y",
       "use_conda": "y",

CHANGES.rst

@@ -4,12 +4,14 @@ Changelog
 
 v0.9.1 (unreleased)
 -------------------
-Contributors to this version: Juliette Lavoie (:user:`juliettelavoie`)
+Contributors to this version: Pascal Bourgault (:user:`aulemahal`), Juliette Lavoie (:user:`juliettelavoie`).
 
 Bug fixes
 ^^^^^^^^^
-* Fix bug with `xs.utils.update_attr`(:issue:`404`, :pull:`405`).
-* Fixes to template 1 due to new changes in versions of dependencies. ( :pull:`405`).
+* Fixed defaults for ``xr_combine_kwargs`` in ``extract_dataset`` (:pull:`402`).
+* Fixed bug with `xs.utils.update_attr`(:issue:`404`, :pull:`405`).
+* Fixed template 1 bugs due to changes in versions of dependencies. ( :pull:`405`).
+
 
 v0.9.0 (2024-05-07)
 -------------------

pyproject.toml

@@ -127,7 +127,7 @@ target-version = [
 ]
 
 [tool.bumpversion]
-current_version = "0.9.0"
+current_version = "0.9.1-dev.0"
 commit = true
 commit_args = "--no-verify"
 tag = false

xscen/__init__.py

@@ -51,7 +51,7 @@
 
 __author__ = """Gabriel Rondeau-Genesse"""
 __email__ = "rondeau-genesse.gabriel@ouranos.ca"
-__version__ = "0.9.0"
+__version__ = "0.9.1-dev.0"
 
 
 def warning_on_one_line(

xscen/extract.py

@@ -281,7 +281,9 @@ def extract_dataset(  # noqa: C901
             slices = []
             for period in periods_extract:
                 slices.extend([ds.sel({"time": slice(period[0], period[1])})])
-            ds = xr.concat(slices, dim="time", **xr_combine_kwargs)
+            ds = xr.concat(
+                slices, dim="time", **xr_kwargs["xarray_combine_by_coords_kwargs"]
+            )
 
         # subset to the region
         if region is not None: