opensource/galaxy
3
0
Fork 0
mirror of https://github.com/galaxyproject/galaxy.git synced 2026-09-24 16:30:27 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'release_21.01' into release_21.05

Browse Source
This commit is contained in:
Nicola Soranzo
2021-05-25 21:58:57 +01:00
parent ea143935aa 572584cb34
commit 6bd30ce431
3 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/galaxy/tool_util/deps/dependencies.py
+1 -1
View File
@@ -42,7 +42,7 @@ class ToolInfo:
def __init__(self, container_descriptions=None, requirements=None, requires_galaxy_python_environment=False, env_pass_through=None, guest_ports=None, tool_id=None, tool_version=None, profile=-1):
if env_pass_through is None:
env_pass_through = ["GALAXY_SLOTS"]
env_pass_through = ["GALAXY_SLOTS", "GALAXY_MEMORY_MB", "GALAXY_MEMORY_MB_PER_SLOT"]
if container_descriptions is None:
container_descriptions = []
if requirements is None:
lib/galaxy/tool_util/parser/interface.py
+2 -1
View File
@@ -110,7 +110,8 @@ class ToolSource(metaclass=ABCMeta):
return ["TMPDIR", "TMP", "TEMP"]
def parse_docker_env_pass_through(self):
return ["GALAXY_SLOTS", "HOME", "_GALAXY_JOB_HOME_DIR", "_GALAXY_JOB_TMP_DIR"] + self.parse_tmp_directory_vars()
return ["GALAXY_SLOTS", "GALAXY_MEMORY_MB", "GALAXY_MEMORY_MB_PER_SLOT", "HOME",
"_GALAXY_JOB_HOME_DIR", "_GALAXY_JOB_TMP_DIR"] + self.parse_tmp_directory_vars()
@abstractmethod
def parse_interpreter(self):
packages/tool_util/HISTORY.rst
+7 -1
View File
@@ -6,7 +6,13 @@ History
.. to_doc
---------------------
21.1.1.dev0
21.1.2.dev0
---------------------
---------------------
21.1.1 (2021-05-21)
---------------------