From 1ace05b5aba2bdbc847ecf58fa72228f4c8d017c Mon Sep 17 00:00:00 2001 From: chrin Date: Fri, 3 Jan 2025 17:01:00 +0100 Subject: [PATCH] gui.py: attributes dictionary for HIPA specific keys corrected in end-of-year clear_savings routine; Use cafe-1.12.0 in hush.sh which specifically links epics 7.0.8 libraries and define LD_PRELOAD with ca for python 3.7 --- hush.sh | 11 ++++++++--- .../__pycache__/hush_resources.cpython-37.pyc | Bin 10099 -> 10099 bytes 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/hush.sh b/hush.sh index b7d5442..1974ac4 100755 --- a/hush.sh +++ b/hush.sh @@ -17,6 +17,9 @@ else echo "Interactive/sourced script" fi +_EPICS_HOST_ARCH=${RHREL}-x86_64 +_EPICS_BASE=base-7.0.8 + # Select Python Version here. Currently one of 3.5, 3.7, 3.8 and 3.10 PYTHON_VERSION=3.10 @@ -32,6 +35,7 @@ if [ "$1" ]; then elif [ "$1" == "3.7" -o "$1" == "37" ]; then PYTHON_VERSION=3.7 PYTHON_VERSION_DIR=37 + export LD_PRELOAD=/usr/local/epics/${_EPICS_BASE}/lib/${_EPICS_HOST_ARCH}/libca.so:/usr/local/epics/${_EPICS_BASE}/lib/${_EPICS_HOST_ARCH}/libCom.so elif [ "$1" == "3.8" -o "$1" == "38" ]; then PYTHON_VERSION=3.8 PYTHON_VERSION_DIR=38 @@ -50,13 +54,11 @@ fi echo "PYTHON_VERSION $PYTHON_VERSION" -_EPICS_HOST_ARCH=${RHREL}-x86_64 -#_EPICS_HOST_ARCH=${EPICS_HOST_ARCH} . /opt/gfa/python $PYTHON_VERSION #C_EXT version for Py 3.5, 3.7. 3.8, 3.10: -export PYTHONPATH=.:/opt/gfa/cafe/python/pycafe/cafe-1.21.0-0/lib/${_EPICS_HOST_ARCH}:/hipa/bd/applications/deps/apps4ops/v1.11.0 +export PYTHONPATH=.:/opt/gfa/cafe/python/pycafe/cafe-1.21.0/lib/${_EPICS_HOST_ARCH}:/hipa/bd/applications/deps/apps4ops/v1.12.0 echo $PYTHONPATH @@ -111,3 +113,6 @@ else fi +if [ "${PYTHON_VERSION}" == "3.7" ] ; then + unset LD_PRELOAD +fi diff --git a/pyrcc5/__pycache__/hush_resources.cpython-37.pyc b/pyrcc5/__pycache__/hush_resources.cpython-37.pyc index e4bcef12bb90b7d64b83668ceb71d2384430855f..95b4bb44312b8aeea7cebdd0b50026f62e08bc21 100644 GIT binary patch delta 27 hcmezD_t}rfiI