From 84480b26c542abc5e70dd2f1c4eefe885bb8794e Mon Sep 17 00:00:00 2001 From: Pascal Bourgault Date: Wed, 15 May 2024 13:50:09 -0400 Subject: [PATCH 1/3] Fix xr combine kwargs in extract --- xscen/extract.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/xscen/extract.py b/xscen/extract.py index f5abc8ef..1c65a2eb 100644 --- a/xscen/extract.py +++ b/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: From cafb135b821655d814b27702c82f3fbbdf40b27f Mon Sep 17 00:00:00 2001 From: Pascal Bourgault Date: Wed, 15 May 2024 13:55:17 -0400 Subject: [PATCH 2/3] upd chgs --- CHANGES.rst | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/CHANGES.rst b/CHANGES.rst index cb61b94e..dfb3e87e 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -2,6 +2,14 @@ Changelog ========= +v0.9.1 (unreleased) +------------------- +Contributors to this version: Pascal Bourgault (:user:`aulemahal`). + +Bug fixes +^^^^^^^^^ +* Fixed defaults for ``xr_combine_kwargs`` in ``extract_dataset`` (:pull:`402`). + v0.9.0 (2024-05-07) ------------------- Contributors to this version: Trevor James Smith (:user:`Zeitsperre`), Pascal Bourgault (:user:`aulemahal`), Gabriel Rondeau-Genesse (:user:`RondeauG`), Juliette Lavoie (:user:`juliettelavoie`), Marco Braun (:user:`vindelico`). From 94fe40d34a8f86836f2871f15e55f265a50b094e Mon Sep 17 00:00:00 2001 From: "bumpversion[bot]" Date: Wed, 15 May 2024 20:01:19 +0000 Subject: [PATCH 3/3] =?UTF-8?q?Bump=20version:=200.9.0=20=E2=86=92=200.9.1?= =?UTF-8?q?-dev.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .cruft.json | 2 +- pyproject.toml | 2 +- xscen/__init__.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.cruft.json b/.cruft.json index 8f978c3c..bc0452df 100644 --- a/.cruft.json +++ b/.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", diff --git a/pyproject.toml b/pyproject.toml index 68ffa4aa..8f143aaa 100644 --- a/pyproject.toml +++ b/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 diff --git a/xscen/__init__.py b/xscen/__init__.py index ff741d6a..c5f74553 100644 --- a/xscen/__init__.py +++ b/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(