From 143e000ea02972910fecc7f8e0b8bc8a6547e34c Mon Sep 17 00:00:00 2001 From: Pete Peterson Date: Mon, 22 Dec 2025 13:17:40 -0500 Subject: [PATCH 1/2] Get --version argument working again --- .gitignore | 3 +++ src/mantidworkbenchnightly | 2 +- src/mantidworkbenchqa | 2 +- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 9659566..86c6a9f 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,5 @@ # ./rpmbuild creates tarballs as part of the process *.tar.gz +# pixi environments +.pixi/* +!.pixi/config.toml diff --git a/src/mantidworkbenchnightly b/src/mantidworkbenchnightly index 02cb331..b475e84 100644 --- a/src/mantidworkbenchnightly +++ b/src/mantidworkbenchnightly @@ -1,4 +1,4 @@ #!/bin/bash # call the main mantidworkbench with an environment PIXI_ENV="mantid_dev" -"$(dirname "$(realpath "$0")")/mantidworkbench" --env "${PIXI_ENV}" +"$(dirname "$(realpath "$0")")/mantidworkbench" --env "${PIXI_ENV}" "$@" diff --git a/src/mantidworkbenchqa b/src/mantidworkbenchqa index 9c0acee..ba015aa 100644 --- a/src/mantidworkbenchqa +++ b/src/mantidworkbenchqa @@ -1,4 +1,4 @@ #!/bin/bash # call the main mantidworkbench with an environment PIXI_ENV="mantid_qa" -"$(dirname "$(realpath "$0")")/mantidworkbench" --env "${PIXI_ENV}" +"$(dirname "$(realpath "$0")")/mantidworkbench" --env "${PIXI_ENV}" "$@" -- GitLab From 732cf4d1c5245005eb3887a1ce41474faa151ae9 Mon Sep 17 00:00:00 2001 From: Pete Peterson Date: Tue, 23 Dec 2025 12:00:48 -0500 Subject: [PATCH 2/2] Bump the version number --- rpm/nsd-app-wrap.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rpm/nsd-app-wrap.spec b/rpm/nsd-app-wrap.spec index 970d136..634294f 100644 --- a/rpm/nsd-app-wrap.spec +++ b/rpm/nsd-app-wrap.spec @@ -1,5 +1,5 @@ Name: nsd-app-wrap -Version: 2.15 +Version: 2.16 Release: 1%{?dist} Summary: Wrapper scripts to launch python applications installed via anaconda Vendor: Peter F. Peterson -- GitLab