Merge branch 'usegalaxy-eu:master' into master

usegalaxy-eu · Jul 30, 2024 · 7ecbcfa · 7ecbcfa
2 parents 164d6bc + f489d9a
commit 7ecbcfa
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 0 deletions.
diff --git a/files/galaxy/tpv/tools.yml b/files/galaxy/tpv/tools.yml
@@ -1333,6 +1333,7 @@ tools:
     mem: 12
     env:
       GENEMARK_PATH: /usr/local/tools/genemark/etp.for_braker/bin/gmes/
+      _GALAXY_JOB_TMP_DIR: '/tmp'
     params:
       singularity_run_extra_arguments: "--env GENEMARK_PATH=/usr/local/tools/genemark/etp.for_braker/bin/gmes/"
     scheduling:

diff --git a/templates/galaxy/config/tool_conf.xml.j2 b/templates/galaxy/config/tool_conf.xml.j2
@@ -385,6 +385,7 @@
   <section id="single-cell-section-interactivetools" name="Interactive tools">
     <tool file="interactive/interactivetool_jupyter_notebook.xml" />
     <tool file="interactive/interactivetool_jupyter_notebook_1.0.0.xml" />
+    <tool file="interactive/interactivetool_jupyter_notebook_1.0.1.xml" />
     <tool file="interactive/interactivetool_rstudio.xml" />
     <tool file="interactive/interactivetool_rstudio_0_3.xml" />
     <tool file="interactive/interactivetool_cellxgene.xml" />