Tv poncho clean (#4240)

* set PONCHO_PREFIX in run_in_env

* use python in PONCHO_PREFIX if defined

* lint

* use python version major version

Author: btovar

poncho/src/poncho/package_create.py

@@ -108,6 +108,7 @@ def _copy_run_in_env(env_dir):
         f.write(
             'env_dir=$(dirname $( cd -- "$( dirname -- "$0" )" > /dev/null 2>&1 && pwd ))\n'
         )
+        f.write('export PONCHO_PREFIX="${env_dir}"\n')
         f.write('exec "${env_dir}"/bin/poncho_package_run -e ${env_dir} "$@"\n')
     os.chmod(f"{env_dir}/env/bin/run_in_env", 0o755)
 

taskvine/src/bindings/python3/ndcctools/taskvine/task.py

@@ -15,10 +15,10 @@
 
 import copy
 import os
-import sys
 import textwrap
 import uuid
 import cloudpickle
+import sys
 
 
 ##
@@ -1002,11 +1002,8 @@ def output(self):
     def disable_output_serialization(self):
         self._serialize_output = False
 
-    def _python_function_command(self, remote_env_dir=None):
-        if remote_env_dir:
-            py_exec = "python"
-        else:
-            py_exec = f"python{sys.version_info[0]}"
+    def _python_function_command(self):
+        py_exec = "${PONCHO_PREFIX:+${PONCHO_PREFIX}/bin/}" + f"python{sys.version_info[0]}"
 
         command = f"{py_exec} w_{self._id} f_{self._id} a_{self._id} o_{self._id}"
         return command