From 19ee5233d5c654223e7f0e5348973f930ff5fb94 Mon Sep 17 00:00:00 2001
From: "Joachim Wuttke (h)" <j.wuttke@fz-juelich.de>
Date: Wed, 4 May 2022 16:46:03 +0200
Subject: [PATCH] plot without invoking original LaTeX processor, unless
USETEX=True
---
.gitlab-ci.yml | 4 ----
Wrap/Python/ba_plot.py | 2 +-
2 files changed, 1 insertion(+), 5 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 0068343a02c..2578bfd4063 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -12,7 +12,6 @@ native_Debian_clang:
script: &native_scr
- pwd
- export PYTHONPATH=$CI_PROJECT_DIR/build/lib
- - export NOTEX=ON
- mkdir build
- cd build
- cmake .. -DCMAKE_CXX_COMPILER_LAUNCHER=ccache -DBA_PY_PACKAGE=ON #-DWERROR=ON
@@ -34,7 +33,6 @@ mac10_15:
- echo PYTHONPATH1_FOLLOWS
- echo $PYTHONPATH
- export PYTHONPATH=$CI_PROJECT_DIR/build/lib:$PYTHONPATH
- - export NOTEX=ON
- export NOPLOT=ON
- echo PYTHONPATH2_FOLLOWS
- echo $PYTHONPATH
@@ -60,7 +58,6 @@ mac12_2:
- echo PYTHONPATH1_FOLLOWS
- echo $PYTHONPATH
- export PYTHONPATH=$CI_PROJECT_DIR/build/lib:$PYTHONPATH
- - export NOTEX=ON
- export NOPLOT=ON
- echo PYTHONPATH2_FOLLOWS
- echo $PYTHONPATH
@@ -104,7 +101,6 @@ windows:
- echo "# Pythonpath1 <$Env:PYTHONPATH>"
- echo "# CI_PRJ_DIR <$Env:CI_PROJECT_DIR>"
- $env:PYTHONPATH += "$CI_PROJECT_DIR/build/lib"
- - $env:NOTEX += "ON"
- echo "# Pythonpath2 <$Env:PYTHONPATH>"
# list powershell properties
- echo "# Path <$Env:Path>"
diff --git a/Wrap/Python/ba_plot.py b/Wrap/Python/ba_plot.py
index a997130c7cf..b887c7b11e4 100644
--- a/Wrap/Python/ba_plot.py
+++ b/Wrap/Python/ba_plot.py
@@ -31,7 +31,7 @@ except Exception as e:
# default values from environment variables
cmap_default = os.environ['CMAP'] if 'CMAP' in os.environ else 'inferno'
-usetex_default = not 'NOTEX' in os.environ
+usetex_default = bool(os.environ['USETEX']) if 'USETEX' in os.environ else False
doplot_default = not 'NOPLOT' in os.environ
label_fontsize = 16
--
GitLab