Merge pull request #971 from mvdbeek/venv

Allow passing through GALAXY_VIRTUAL_ENV variable to venv setup
galaxyproject · Nov 21, 2019 · ed7f992 · ed7f992
2 parents 66fbb3a + 70a8c24
commit ed7f992
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/planemo/galaxy/run.py b/planemo/galaxy/run.py
@@ -49,7 +49,9 @@ def setup_venv(ctx, kwds):
 
 
 def locate_galaxy_virtualenv(ctx, kwds):
-    if not kwds.get("no_cache_galaxy", False):
+    if os.environ.get("GALAXY_VIRTUAL_ENV"):
+        venv_command = ""
+    elif not kwds.get("no_cache_galaxy", False):
         workspace = ctx.workspace
         galaxy_branch = kwds.get("galaxy_branch") or "master"
         shared_venv_path = os.path.join(workspace, "gx_venv")