From 3bf2f0cd023fe85d2f79a50a00e92391b602a2fa Mon Sep 17 00:00:00 2001 From: Thomas Ubensee <34603111+tomuben@users.noreply.github.com> Date: Wed, 9 Oct 2024 09:56:13 -0300 Subject: [PATCH] #944: Fixed linkernamespace tests and removed Python2 artifacts (#456) --- exaudfclient/.bazelrc | 2 +- exaudfclient/.env.template | 4 +--- .../test/linker_namespace_sanity/linker_namespace_sanity.py | 6 ++---- 3 files changed, 4 insertions(+), 8 deletions(-) diff --git a/exaudfclient/.bazelrc b/exaudfclient/.bazelrc index cdcb2d960..248128c7e 100644 --- a/exaudfclient/.bazelrc +++ b/exaudfclient/.bazelrc @@ -2,7 +2,7 @@ build --lockfile_mode=off --copt='-std=c++17' --force_pic --action_env=PROTOBUF_ # TODO add environment variables for R libraries build:benchmark --define benchmark=true build:java --define java=true --action_env=JAVA_PREFIX -build:python --define python=true --action_env=PYTHON2_SYSPATH --action_env=PYTHON2_PREFIX --action_env=PYTHON2_VERSION --action_env=NUMPY_PREFIX --action_env=PYTHON3_SYSPATH --action_env=PYTHON3_PREFIX --action_env=PYTHON3_VERSION +build:python --define python=true --action_env=NUMPY_PREFIX --action_env=PYTHON3_SYSPATH --action_env=PYTHON3_PREFIX --action_env=PYTHON3_VERSION build:fast-binary --copt='-DCUSTOM_LIBEXAUDFLIB_PATH="/exaudf/base/libexaudflib_complete.so"' --define binary_type=fast_binary //:exaudfclient build:slow-wrapper --define binary_type=slow_wrapper //:exaudfclient build:static-binary //:exaudfclient_static diff --git a/exaudfclient/.env.template b/exaudfclient/.env.template index 44c6f4a86..804b6d699 100644 --- a/exaudfclient/.env.template +++ b/exaudfclient/.env.template @@ -1,7 +1,5 @@ export JAVA_PREFIX= -export PYTHON2_PREFIX= -export PYTHON2_VERSION= -export PYTHON3_PREFIX= +export PYTHON3_PREFIX= export PYTHON3_VERSION= export PROTOBUF_BIN= export PROTOBUF_LIBRARY_PREFIX= diff --git a/test_container/tests/test/linker_namespace_sanity/linker_namespace_sanity.py b/test_container/tests/test/linker_namespace_sanity/linker_namespace_sanity.py index 9942f4d93..039c853a1 100755 --- a/test_container/tests/test/linker_namespace_sanity/linker_namespace_sanity.py +++ b/test_container/tests/test/linker_namespace_sanity/linker_namespace_sanity.py @@ -24,10 +24,8 @@ def setUp(self): def _setup_language_definition(self): lang = getScriptLanguagesFromArgs() - r_py2 = re.compile(r"exaudf/exaudfclient\b") # Match "...exaudf/exaudfclient ..."/"...exaudf/exaudfclient" but not "...exaudf/exaudfclient_py3" - lang_static = r_py2.sub("exaudf/exaudfclient_py2_static", lang) - r_py3 = re.compile(r"exaudf/exaudfclient_py3\b") - lang_static = r_py3.sub("exaudf/exaudfclient_py3_static", lang_static) + r_py3 = re.compile(r"exaudf/exaudfclient\b") + lang_static = r_py3.sub("exaudf/exaudfclient_static", lang) alter_session_query_str = "ALTER SESSION SET SCRIPT_LANGUAGES='%s'" % lang_static print(alter_session_query_str) self.query(alter_session_query_str)