From c23abaf54c210643667f43a932ab5bf749f78ea9 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 13 Aug 2026 15:23:19 +0000 Subject: [PATCH 1/2] Bump prefix-dev/setup-pixi from 0.10.0 to 0.10.1 Bumps [prefix-dev/setup-pixi](https://github.com/prefix-dev/setup-pixi) from 0.10.0 to 0.10.1. - [Release notes](https://github.com/prefix-dev/setup-pixi/releases) - [Commits](https://github.com/prefix-dev/setup-pixi/compare/v0.10.0...v0.10.1) --- updated-dependencies: - dependency-name: prefix-dev/setup-pixi dependency-version: 0.10.1 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- .github/workflows/build-and-test.yml | 4 ++-- .github/workflows/release.yaml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml index 7bb84d9..b184770 100644 --- a/.github/workflows/build-and-test.yml +++ b/.github/workflows/build-and-test.yml @@ -31,7 +31,7 @@ jobs: os: macos-15-intel steps: - uses: actions/checkout@v7 - - uses: prefix-dev/setup-pixi@v0.10.0 + - uses: prefix-dev/setup-pixi@v0.10.1 with: cache: true - name: Build installer @@ -74,7 +74,7 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v7 - - uses: prefix-dev/setup-pixi@v0.10.0 + - uses: prefix-dev/setup-pixi@v0.10.1 with: cache: true environments: release diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index d948326..45f6e63 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -18,7 +18,7 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v7 - - uses: prefix-dev/setup-pixi@v0.10.0 + - uses: prefix-dev/setup-pixi@v0.10.1 with: cache: true environments: release From f226d901279813e059d50f80929d582f86ac2802 Mon Sep 17 00:00:00 2001 From: Chris Burr Date: Thu, 27 Aug 2026 11:23:33 +0200 Subject: [PATCH 2/2] HACK: DO NOT MERGE - point integration tests at DIRAC fix branches Temporarily clone chrisburr/DIRAC fix/plot-tests-numpy-bins-{v8r0,v9r0, integration} instead of DIRACGrid/DIRAC, to check that they fix the Test_Plots.py::test_histogram failure that is blocking this PR. Revert this commit before merging. --- .github/workflows/build-and-test.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml index b184770..2bd5a5a 100644 --- a/.github/workflows/build-and-test.yml +++ b/.github/workflows/build-and-test.yml @@ -197,7 +197,10 @@ jobs: - name: Prepare environment run: | pip install typer pyyaml gitpython packaging - git clone https://github.com/DIRACGrid/DIRAC.git -b "${{ matrix.dirac-branch }}" DIRACRepo + # HACK: DO NOT MERGE - clone the plot-test fix branches instead of the real ones + git clone https://github.com/chrisburr/DIRAC.git -b "fix/plot-tests-numpy-bins-${DIRAC_BRANCH#rel-}" DIRACRepo + env: + DIRAC_BRANCH: ${{ matrix.dirac-branch }} - name: Run tests run: | DIRACOS_TARBALL_PATH=$(echo ${PWD}/DIRACOS-*.sh)