From bfd88e5e2197e2aa73591574bd0a802648d4ff7e Mon Sep 17 00:00:00 2001 From: krzywon Date: Tue, 2 Jun 2026 14:40:03 -0400 Subject: [PATCH 1/4] bumps VarStats.name -> bumps VarStats.label --- src/sas/qtgui/Utilities/PlotView.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/sas/qtgui/Utilities/PlotView.py b/src/sas/qtgui/Utilities/PlotView.py index de9610c8ba..046cde7911 100644 --- a/src/sas/qtgui/Utilities/PlotView.py +++ b/src/sas/qtgui/Utilities/PlotView.py @@ -131,7 +131,7 @@ def _parse_stats(self): if parsed: # Use parse_var to extract all values, then format them for display row_data = [ - parsed.name, + parsed.label, f"{parsed.mean:.6g}", f"{parsed.median:.6g}", f"{parsed.best:.6g}", From 38eafa66e1e1201a575a54961efac1d50c5bf8bd Mon Sep 17 00:00:00 2001 From: krzywon Date: Tue, 2 Jun 2026 14:41:46 -0400 Subject: [PATCH 2/4] Increment bumps to v1.0.5 to include fix for VarStats API change --- build_tools/requirements-release-macos-latest.txt | 2 +- build_tools/requirements-release-ubuntu-22.04.txt | 2 +- build_tools/requirements-release-ubuntu-latest.txt | 2 +- build_tools/requirements-release-windows-latest.txt | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/build_tools/requirements-release-macos-latest.txt b/build_tools/requirements-release-macos-latest.txt index fa57ca9846..1632f62e03 100644 --- a/build_tools/requirements-release-macos-latest.txt +++ b/build_tools/requirements-release-macos-latest.txt @@ -17,7 +17,7 @@ beautifulsoup4==4.14.3 bidict==0.23.1 blinker==1.9.0 BTrees==6.4 -bumps==1.0.4 +bumps==1.0.5 certifi==2026.4.22 cffi==2.0.0 cfgv==3.5.0 diff --git a/build_tools/requirements-release-ubuntu-22.04.txt b/build_tools/requirements-release-ubuntu-22.04.txt index 8faec26011..d668df5703 100644 --- a/build_tools/requirements-release-ubuntu-22.04.txt +++ b/build_tools/requirements-release-ubuntu-22.04.txt @@ -16,7 +16,7 @@ beautifulsoup4==4.14.3 bidict==0.23.1 blinker==1.9.0 BTrees==6.4 -bumps==1.0.4 +bumps==1.0.5 certifi==2026.4.22 cffi==2.0.0 cfgv==3.5.0 diff --git a/build_tools/requirements-release-ubuntu-latest.txt b/build_tools/requirements-release-ubuntu-latest.txt index 8faec26011..d668df5703 100644 --- a/build_tools/requirements-release-ubuntu-latest.txt +++ b/build_tools/requirements-release-ubuntu-latest.txt @@ -16,7 +16,7 @@ beautifulsoup4==4.14.3 bidict==0.23.1 blinker==1.9.0 BTrees==6.4 -bumps==1.0.4 +bumps==1.0.5 certifi==2026.4.22 cffi==2.0.0 cfgv==3.5.0 diff --git a/build_tools/requirements-release-windows-latest.txt b/build_tools/requirements-release-windows-latest.txt index 6f170f41b4..3b738190b9 100644 --- a/build_tools/requirements-release-windows-latest.txt +++ b/build_tools/requirements-release-windows-latest.txt @@ -16,7 +16,7 @@ beautifulsoup4==4.14.3 bidict==0.23.1 blinker==1.9.0 BTrees==6.4 -bumps==1.0.4 +bumps==1.0.5 certifi==2026.4.22 cffi==2.0.0 cfgv==3.5.0 From c4c56a22000fff966fc1809580706f724f3dc507 Mon Sep 17 00:00:00 2001 From: krzywon Date: Tue, 2 Jun 2026 15:23:15 -0400 Subject: [PATCH 3/4] Use bumps v1.0.5rc0 for testing --- build_tools/requirements-release-macos-latest.txt | 2 +- build_tools/requirements-release-ubuntu-22.04.txt | 2 +- build_tools/requirements-release-ubuntu-latest.txt | 2 +- build_tools/requirements-release-windows-latest.txt | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/build_tools/requirements-release-macos-latest.txt b/build_tools/requirements-release-macos-latest.txt index 1632f62e03..95199e8cd1 100644 --- a/build_tools/requirements-release-macos-latest.txt +++ b/build_tools/requirements-release-macos-latest.txt @@ -17,7 +17,7 @@ beautifulsoup4==4.14.3 bidict==0.23.1 blinker==1.9.0 BTrees==6.4 -bumps==1.0.5 +bumps==1.0.5rc0 certifi==2026.4.22 cffi==2.0.0 cfgv==3.5.0 diff --git a/build_tools/requirements-release-ubuntu-22.04.txt b/build_tools/requirements-release-ubuntu-22.04.txt index d668df5703..9ff20aff21 100644 --- a/build_tools/requirements-release-ubuntu-22.04.txt +++ b/build_tools/requirements-release-ubuntu-22.04.txt @@ -16,7 +16,7 @@ beautifulsoup4==4.14.3 bidict==0.23.1 blinker==1.9.0 BTrees==6.4 -bumps==1.0.5 +bumps==1.0.5rc0 certifi==2026.4.22 cffi==2.0.0 cfgv==3.5.0 diff --git a/build_tools/requirements-release-ubuntu-latest.txt b/build_tools/requirements-release-ubuntu-latest.txt index d668df5703..9ff20aff21 100644 --- a/build_tools/requirements-release-ubuntu-latest.txt +++ b/build_tools/requirements-release-ubuntu-latest.txt @@ -16,7 +16,7 @@ beautifulsoup4==4.14.3 bidict==0.23.1 blinker==1.9.0 BTrees==6.4 -bumps==1.0.5 +bumps==1.0.5rc0 certifi==2026.4.22 cffi==2.0.0 cfgv==3.5.0 diff --git a/build_tools/requirements-release-windows-latest.txt b/build_tools/requirements-release-windows-latest.txt index 3b738190b9..c999d20a1f 100644 --- a/build_tools/requirements-release-windows-latest.txt +++ b/build_tools/requirements-release-windows-latest.txt @@ -16,7 +16,7 @@ beautifulsoup4==4.14.3 bidict==0.23.1 blinker==1.9.0 BTrees==6.4 -bumps==1.0.5 +bumps==1.0.5rc0 certifi==2026.4.22 cffi==2.0.0 cfgv==3.5.0 From b29af40e081a8ec248f08d4952df8a540f046c58 Mon Sep 17 00:00:00 2001 From: krzywon Date: Tue, 9 Jun 2026 12:12:25 -0400 Subject: [PATCH 4/4] Pass the release branch flag to the install-wheel action and use that for the release build check --- .github/actions/install-wheel/action.yml | 6 ++++-- .github/workflows/ci.yml | 1 + 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/.github/actions/install-wheel/action.yml b/.github/actions/install-wheel/action.yml index 8bf1bdc428..266401dc7d 100644 --- a/.github/actions/install-wheel/action.yml +++ b/.github/actions/install-wheel/action.yml @@ -8,6 +8,8 @@ inputs: required: true os: required: true + release-build: + required: false runs: using: "composite" @@ -58,7 +60,7 @@ runs: uv pip install dist/*whl - name: Install Python dependencies - if: ${{ ! env.RELEASE_BRANCH_BUILD }} + if: ${{ ! inputs.release-build }} shell: bash run: | uv pip install -r build_tools/requirements.txt @@ -67,7 +69,7 @@ runs: ### For pull_requests with the release branch as the base -or- branches with the name *release* - name: Install Python dependencies for release branches - if: ${{ env.RELEASE_BRANCH_BUILD }} + if: ${{ inputs.release-build }} shell: bash run: | uv pip install --no-deps -r build_tools/requirements-release-${{ matrix.os }}.txt diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index a729ee323b..0d7ed52824 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -303,6 +303,7 @@ jobs: with: python-version: ${{ matrix.python-version }} os: ${{ matrix.os }} + release-build: ${{ env.RELEASE_BRANCH_BUILD }} ### Run tests