From 06d4c98136755ae08a0e70161e124f8e591e7134 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 26 Aug 2024 01:24:18 +0200 Subject: [PATCH] Bump the runtime-dependencies group across 1 directory with 2 updates (#1525) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Bump the runtime-dependencies group across 1 directory with 3 updates Bumps the runtime-dependencies group with 3 updates in the / directory: [numpy](https://github.com/numpy/numpy), [scipy](https://github.com/scipy/scipy) and [xarray](https://github.com/pydata/xarray). Updates `numpy` from 2.0.1 to 2.1.0 - [Release notes](https://github.com/numpy/numpy/releases) - [Changelog](https://github.com/numpy/numpy/blob/main/doc/RELEASE_WALKTHROUGH.rst) - [Commits](https://github.com/numpy/numpy/compare/v2.0.1...v2.1.0) Updates `scipy` from 1.14.0 to 1.14.1 - [Release notes](https://github.com/scipy/scipy/releases) - [Commits](https://github.com/scipy/scipy/compare/v1.14.0...v1.14.1) Updates `xarray` from 2024.6.0 to 2024.7.0 - [Release notes](https://github.com/pydata/xarray/releases) - [Changelog](https://github.com/pydata/xarray/blob/main/HOW_TO_RELEASE.md) - [Commits](https://github.com/pydata/xarray/compare/v2024.06.0...v2024.07.0) --- updated-dependencies: - dependency-name: numpy dependency-type: direct:production update-type: version-update:semver-minor dependency-group: runtime-dependencies - dependency-name: scipy dependency-type: direct:production update-type: version-update:semver-patch dependency-group: runtime-dependencies - dependency-name: xarray dependency-type: direct:production update-type: version-update:semver-minor dependency-group: runtime-dependencies ... Signed-off-by: dependabot[bot] * 🚧 Revert raising of numpy version since we know it isn't compatible * 🩹 Forward port fix error with xarray==2024.7.0 from main --------- Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: s-weigand --- glotaran/optimization/data.py | 5 ++++- requirements_pinned.txt | 4 ++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/glotaran/optimization/data.py b/glotaran/optimization/data.py index 8267c9f17..85780644a 100644 --- a/glotaran/optimization/data.py +++ b/glotaran/optimization/data.py @@ -468,7 +468,10 @@ def align_groups( # as an alternative to the more elegant xarray built-in which is limited to 32 datasets # aligned_group_labels = aligned_groups.str.join(dim="dataset").data aligned_group_labels = np.asarray( - ["".join(sub_arr.values) for _, sub_arr in aligned_groups.groupby("global")] + tuple( + "".join(sub_arr.to_numpy().flatten()) + for _, sub_arr in aligned_groups.groupby("global", squeeze=False) + ) ) group_definitions: dict[str, list[str]] = {} diff --git a/requirements_pinned.txt b/requirements_pinned.txt index df2b8a49e..3af339917 100644 --- a/requirements_pinned.txt +++ b/requirements_pinned.txt @@ -8,7 +8,7 @@ openpyxl==3.1.5 pandas==2.2.2 pydantic==2.8.2 ruamel.yaml==0.18.6 -scipy==1.14.0 +scipy==1.14.1 sdtfile==2024.5.24 tabulate==0.9.0 -xarray==2024.6.0 +xarray==2024.7.0