From 565bdd64a320e20d8e4d0ad2c63f6b721d1a3d4a Mon Sep 17 00:00:00 2001 From: Zachary Lentz Date: Tue, 2 Jul 2024 16:19:03 -0700 Subject: [PATCH 1/2] MAINT: remove glx env var, no longer needed and causing issues --- scripts/dev_conda | 8 -------- scripts/pcds_conda | 8 -------- 2 files changed, 16 deletions(-) diff --git a/scripts/dev_conda b/scripts/dev_conda index f23219d7..17990e74 100755 --- a/scripts/dev_conda +++ b/scripts/dev_conda @@ -55,13 +55,5 @@ source "${TOKEN_DIR}/typhos.sh" # The same was done with PyDM and this fixes Designer and friends. if [ -n "${SSH_CONNECTION}" ]; then export QT_QUICK_BACKEND="software" - # Check for errors in the opengl rendering - # Manually fall back to mesa library if we know there is a problem - if [ -x "$(command -v glxinfo)" ] && [ -z "${__GLX_VENDOR_LIBRARY_NAME}" ]; then - # Expecting either a segfault or exit code 1 if there is a problem - if ! { glxinfo -B; } > /dev/null 2>&1; then - export __GLX_VENDOR_LIBRARY_NAME="mesa" - fi - fi fi diff --git a/scripts/pcds_conda b/scripts/pcds_conda index 7ad47665..fa1cd1f2 100755 --- a/scripts/pcds_conda +++ b/scripts/pcds_conda @@ -127,13 +127,5 @@ source "${TOKEN_DIR}/typhos.sh" # The same was done with PyDM and this fixes Designer and friends. if [ -n "${SSH_CONNECTION}" ]; then export QT_QUICK_BACKEND="software" - # Check for errors in the opengl rendering - # Manually fall back to mesa library if we know there is a problem - if [ -x "$(command -v glxinfo)" ] && [ -z "${__GLX_VENDOR_LIBRARY_NAME}" ]; then - # Expecting either a segfault or exit code 1 if there is a problem - if ! { glxinfo -B; } > /dev/null 2>&1; then - export __GLX_VENDOR_LIBRARY_NAME="mesa" - fi - fi fi From ac7cfd896b66f304f41a24bf8c44f09e0d525690 Mon Sep 17 00:00:00 2001 From: Zachary Lentz Date: Tue, 2 Jul 2024 16:32:19 -0700 Subject: [PATCH 2/2] STY: install and use pre-commit --- scripts/dev_conda | 3 +-- scripts/pcds_conda | 1 - 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/scripts/dev_conda b/scripts/dev_conda index 17990e74..0cfce74f 100755 --- a/scripts/dev_conda +++ b/scripts/dev_conda @@ -2,7 +2,7 @@ usage() { cat << EOF -usage: source $0 +usage: source $0 Source this to activate the latest version a pcds conda environment. EOF @@ -56,4 +56,3 @@ source "${TOKEN_DIR}/typhos.sh" if [ -n "${SSH_CONNECTION}" ]; then export QT_QUICK_BACKEND="software" fi - diff --git a/scripts/pcds_conda b/scripts/pcds_conda index fa1cd1f2..929c2d53 100755 --- a/scripts/pcds_conda +++ b/scripts/pcds_conda @@ -128,4 +128,3 @@ source "${TOKEN_DIR}/typhos.sh" if [ -n "${SSH_CONNECTION}" ]; then export QT_QUICK_BACKEND="software" fi -