From 89528f8c9b38ab839e512769bd80e5b755860281 Mon Sep 17 00:00:00 2001 From: Ray Osborn Date: Tue, 4 Jun 2024 10:21:02 -0500 Subject: [PATCH 1/3] Adds the parent group to the weighted data function. --- src/nexusformat/nexus/tree.py | 1 + 1 file changed, 1 insertion(+) diff --git a/src/nexusformat/nexus/tree.py b/src/nexusformat/nexus/tree.py index c3d55b3..07dc993 100644 --- a/src/nexusformat/nexus/tree.py +++ b/src/nexusformat/nexus/tree.py @@ -6395,6 +6395,7 @@ def weighted_data(self): raise NeXusError("No signal defined for this NXdata group") elif weights is None: raise NeXusError("No weights defined for this NXdata group") + result._group = self._group return result def prepare_smoothing(self): From 088fb6fc4619eb10430a267f5cc390bfb2ecc1d3 Mon Sep 17 00:00:00 2001 From: Ray Osborn Date: Tue, 4 Jun 2024 14:01:13 -0500 Subject: [PATCH 2/3] Update Github actions --- .github/workflows/ci.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 30aca67..ad38b4a 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -6,13 +6,13 @@ jobs: runs-on: ${{ matrix.os }} strategy: matrix: - python-version: ["3.7", "3.8", "3.9", "3.10", "3.11"] + python-version: ["3.8", "3.9", "3.10", "3.11", "3.12"] os: [ubuntu-latest, macOS-latest, windows-latest] steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Set up Python ${{ matrix.python-version }} - uses: actions/setup-python@v4 + uses: actions/setup-python@v5 with: python-version: ${{ matrix.python-version }} - name: Install dependencies From c06307eb9415e532ed2631aaa6de320ad996e49e Mon Sep 17 00:00:00 2001 From: Ray Osborn Date: Thu, 6 Jun 2024 10:07:00 -0500 Subject: [PATCH 3/3] Update conda recipe --- conda-recipe/meta.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/conda-recipe/meta.yaml b/conda-recipe/meta.yaml index 8d357c6..ca61d7d 100644 --- a/conda-recipe/meta.yaml +++ b/conda-recipe/meta.yaml @@ -1,10 +1,10 @@ package: name: nexusformat - version: "1.0.4" + version: "1.0.5" source: git_url: https://github.com/nexpy/nexusformat.git - git_tag: v1.0.4 + git_tag: v1.0.5 build: entry_points: