Make laxydl branch and parallelism configurable from compute node env…

…ironment. Fix laxydl pip install instructions.
MonashBioinformaticsPlatform · Oct 22, 2024 · 79e96c0 · 79e96c0
1 parent 1182818
commit 79e96c0
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 7 deletions.
diff --git a/laxy_downloader/README.md b/laxy_downloader/README.md
@@ -6,7 +6,7 @@ Intended to be run by the job script on a compute node.
 ### Install
 
 ```bash
-pip install -e git+https://github.com/MonashBioinformaticsPlatform/laxy/laxy_downloader@master#egg=laxy_downloader
+pip install -e "laxy_downloader @ git+https://github.com/MonashBioinformaticsPlatform/laxy@master#egg=laxy_downloader&subdirectory=laxy_downloader"
 ```
 
 ### Usage

diff --git a/...peline_apps/nf-core-rnaseq/templates/job_scripts/nf-core-rnaseq/3.12.0/scripts/run_job.sh b/...peline_apps/nf-core-rnaseq/templates/job_scripts/nf-core-rnaseq/3.12.0/scripts/run_job.sh
@@ -38,9 +38,9 @@ export PIPELINES_CACHE_PATH="${JOB_PATH}/../../cache/pipelines"
 export SINGULARITY_TMPDIR="${TMPDIR}"
 export AUTH_HEADER_FILE="${JOB_PATH}/.private_request_headers"
 export IGNORE_SELF_SIGNED_CERTIFICATE="{{ IGNORE_SELF_SIGNED_CERTIFICATE }}"
-export LAXYDL_BRANCH=master
+export LAXYDL_BRANCH=${LAXYDL_BRANCH:-master}
 export LAXYDL_USE_ARIA2C=${LAXYDL_USE_ARIA2C:-yes}
-export LAXYDL_PARALLEL_DOWNLOADS=8
+export LAXYDL_PARALLEL_DOWNLOADS=${LAXYDL_PARALLEL_DOWNLOADS:-8}
 
 # These are applied via chmod to all files and directories in the run, upon completion
 export JOB_FILE_PERMS='ug+rw-s,o='

diff --git a/...ine_apps/nf-core-rnaseq/templates/job_scripts/nf-core-rnaseq/default/input/scripts/env.sh b/...ine_apps/nf-core-rnaseq/templates/job_scripts/nf-core-rnaseq/default/input/scripts/env.sh
@@ -23,9 +23,9 @@ export SINGULARITY_CACHEDIR="${JOB_PATH}/../../cache/singularity"
 export SINGULARITY_TMPDIR="${TMP}"
 export AUTH_HEADER_FILE="${JOB_PATH}/.private_request_headers"
 export IGNORE_SELF_SIGNED_CERTIFICATE="{{ IGNORE_SELF_SIGNED_CERTIFICATE }}"
-export LAXYDL_BRANCH=master
+export LAXYDL_BRANCH=${LAXYDL_BRANCH:-master}
 export LAXYDL_USE_ARIA2C=${LAXYDL_USE_ARIA2C:-yes}
-export LAXYDL_PARALLEL_DOWNLOADS=8
+export LAXYDL_PARALLEL_DOWNLOADS=${LAXYDL_PARALLEL_DOWNLOADS:-8}
 
 # These are applied via chmod to all files and directories in the run, upon completion
 export JOB_FILE_PERMS='ug+rw-s,o='

diff --git a/...apps/nf-core-rnaseq/templates/job_scripts/nf-core-rnaseq/default/input/scripts/run_job.sh b/...apps/nf-core-rnaseq/templates/job_scripts/nf-core-rnaseq/default/input/scripts/run_job.sh
@@ -38,9 +38,9 @@ export PIPELINES_CACHE_PATH="${JOB_PATH}/../../cache/pipelines"
 export SINGULARITY_TMPDIR="${TMPDIR}"
 export AUTH_HEADER_FILE="${JOB_PATH}/.private_request_headers"
 export IGNORE_SELF_SIGNED_CERTIFICATE="{{ IGNORE_SELF_SIGNED_CERTIFICATE }}"
-export LAXYDL_BRANCH=master
+export LAXYDL_BRANCH=${LAXYDL_BRANCH:-master}
 export LAXYDL_USE_ARIA2C=${LAXYDL_USE_ARIA2C:-yes}
-export LAXYDL_PARALLEL_DOWNLOADS=8
+export LAXYDL_PARALLEL_DOWNLOADS=${LAXYDL_PARALLEL_DOWNLOADS:-8}
 
 # These are applied via chmod to all files and directories in the run, upon completion
 export JOB_FILE_PERMS='ug+rw-s,o='