Commit 5e2e64ad authored by Borreguero Calvo, Jose's avatar Borreguero Calvo, Jose
Browse files

Merge branch 'mts_qa_env' into 'main' 

mantidtotalscattering qa environment

See merge request !18
parents b4be7b32 5fc48813

mantidtotalscattering

+4 −1
Original line number Diff line number Diff line
@@ -6,7 +6,9 @@ if [ -n "$1" ]; then 
  if [ "$1" == "--dev" ]; then

    CONDA_ENVIRON=mantidtotalscattering-dev

    shift  # drop this argument



  elif [ "$1" == "--qa" ]; then

    CONDA_ENVIRON=mantidtotalscattering-qa

    shift

  fi

fi
@@ -17,4 +19,5 @@ source "$(dirname "$(realpath "$0")")/nsd-app-wrap.sh" 
activate_conda_environment "${CONDA_ENVIRON}"



# start the application

echo "$@"

mantidtotalscattering "$@"

nsd-app-wrap.spec

+4 −1
Original line number Diff line number Diff line 
%global srcname nsd-app-wrap



Name:           nsd-app-wrap

Version:        1.32

Version:        1.33

Release:        1%{?dist}

Summary:        Wrapper scripts to launch python applications installed via anaconda

Vendor:         Peter F. Peterson
@@ -67,6 +67,9 @@ install -m 644 jupyter.local.desktop %{buildroot}%{_datadir}/applications/ 
%license LICENSE



%changelog

* Tue Dec 20 2022 Pete Peterson

- Add support for qa environment of mantidtotalscattering



* Mon Nov 14 2022 Pete Peterson

- Take over starting mantidworkbench and mantidpython with conda