Merge branch 'master' into refactoring/967_add_ctpg_script_options_pa…

…rser
exasol · Oct 9, 2024 · 8d6c91e · 8d6c91e
2 parents e3ec6aa + 3bf2f0c
commit 8d6c91e
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 8 deletions.
diff --git 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
@@ -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
@@ -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)