Merge pull request #18 from yimuchen/fix_shipenv

Added virtual_env detection for ship_env flag

Author: lgray

src/lpcjobqueue/cluster.py

@@ -43,6 +43,7 @@ class LPCCondorJob(HTCondorJob):
     container_prefix = "/cvmfs/unpacked.cern.ch/registry.hub.docker.com/"
     config_name = "lpccondor"
     known_jobs = set()
+    env_name = os.path.basename(os.getenv('VIRTUAL_ENV', '.env'))
 
     def __init__(
         self,
@@ -55,7 +56,7 @@ def __init__(
     ):
         image = self.container_prefix + image
         if ship_env:
-            base_class_kwargs["python"] = ".env/bin/python"
+            base_class_kwargs["python"] = f"{self.env_name}/bin/python"
             base_class_kwargs.setdefault(
                 "worker_extra_args", list(dask.config.get("jobqueue.%s.worker_extra_args" % self.config_name))
             )
@@ -252,8 +253,9 @@ def _build_scratch(self):
         self.scratch_area = tempfile.TemporaryDirectory(dir=tmproot)
         infiles = []
         if self._ship_env:
-            shutil.copytree("/srv/.env", os.path.join(self.scratch_area.name, ".env"))
-            infiles.append(".env")
+            env_path = os.getenv('VIRTUAL_ENV', '/srv/.env')
+            shutil.copytree(env_path, os.path.join(self.scratch_area.name, os.path.basename(env_path)))
+            infiles.append(os.path.basename(env_path))
         for fn in self._transfer_input_files:
             fn = os.path.abspath(fn)
             if any(os.path.commonprefix([fn, p]) == p for p in self.schedd_safe_paths):