Skip to content

Commit bd53b11

Browse files
Merge pull request #73 from mahesh-panchal/mahesh-panchal/update-busco-for-68
Update Busco to 5.2.2 and container entrypoint fix.
2 parents 06fc19c + 655e2e5 commit bd53b11

File tree

7 files changed

+38
-6
lines changed

7 files changed

+38
-6
lines changed

AbinitioTraining/nextflow.config

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,12 @@ profiles {
2727
includeConfig "$baseDir/config/software_packages.config"
2828
}
2929

30-
debug { process.beforeScript = 'env' }
30+
mamba {
31+
includeConfig "$baseDir/config/software_packages.config"
32+
conda.useMamba = true
33+
}
34+
35+
debug { process.beforeScript = 'env' }
3136

3237
docker {
3338
docker.enabled = true

AnnotationPreprocessing/AnnotationPreprocessing.nf

Lines changed: 15 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -114,15 +114,27 @@ process busco {
114114
script:
115115
out = "busco_${fasta.baseName}_${lineage}"
116116
"""
117+
# Nextflow changes the container --entrypoint to /bin/bash (container default entrypoint: /usr/local/env-execute)
118+
# Check for container variable initialisation script and source it.
119+
if [ -f "/usr/local/env-activate.sh" ]; then
120+
# . "/usr/local/env-activate.sh" # Errors out because of various unbound variables
121+
export PATH='/usr/local/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin'
122+
export CONDA_PREFIX='/usr/local'
123+
export CONDA_SHLVL='1'
124+
export CONDA_DEFAULT_ENV='/usr/local'
125+
export CONDA_PROMPT_MODIFIER=''
126+
. "/usr/local/etc/conda/activate.d/activate-r-base.sh"
127+
. "/usr/local/etc/conda/activate.d/augustus.sh"
128+
. "/usr/local/etc/conda/activate.d/openjdk_activate.sh"
129+
fi
130+
# If the augustus config directory is not writable, then copy to writeable area
117131
if [ ! -w "\${AUGUSTUS_CONFIG_PATH}" ]; then
118132
# Create writable tmp directory for augustus
119133
AUG_CONF_DIR=\$( mktemp -d -p \$PWD )
120134
cp -r \$AUGUSTUS_CONFIG_PATH/* \$AUG_CONF_DIR
121135
export AUGUSTUS_CONFIG_PATH=\$AUG_CONF_DIR
136+
echo "New AUGUSTUS_CONFIG_PATH=\${AUGUSTUS_CONFIG_PATH}"
122137
fi
123-
# before with buscov4 it was echo "BUSCO_CONFIG_FILE=\$BUSCO_CONFIG_FILE", it stops working for buscov5
124-
echo "BUSCO_CONFIG_FILE=\$AUGUSTUS_CONFIG_PATH/myconfig.ini"
125-
echo "AUGUSTUS_CONFIG_PATH=\$AUGUSTUS_CONFIG_PATH"
126138
busco -c ${task.cpus} -i $fasta -l $lineage -m genome --out $out
127139
"""
128140
}

AnnotationPreprocessing/conda/process_busco.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,4 @@ channels:
66
- defaults
77

88
dependencies:
9-
- busco=5.0.0
9+
- busco=5.2.2

AnnotationPreprocessing/config/software_packages.config

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,6 @@ process {
55
}
66
withName: 'busco' {
77
conda = { singularity.enabled || docker.enabled ? '' : "$baseDir/conda/process_busco.yml" }
8-
container = 'ezlabgva/busco:v5.0.0_cv1'
8+
container = 'quay.io/biocontainers/busco:5.2.2--pyhdfd78af_0'
99
}
1010
}

AnnotationPreprocessing/nextflow.config

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,11 @@ profiles {
2727
includeConfig "$baseDir/config/software_packages.config"
2828
}
2929

30+
mamba {
31+
includeConfig "$baseDir/config/software_packages.config"
32+
conda.useMamba = true
33+
}
34+
3035
singularity {
3136
singularity.enabled = true
3237
includeConfig "$baseDir/config/software_packages.config"

FunctionalAnnotation/nextflow.config

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,11 @@ profiles {
2727
includeConfig "$baseDir/config/software_packages.config"
2828
}
2929

30+
mamba {
31+
includeConfig "$baseDir/config/software_packages.config"
32+
conda.useMamba = true
33+
}
34+
3035
singularity {
3136
singularity.enabled = true
3237
includeConfig "$baseDir/config/software_packages.config"

TranscriptAssembly/nextflow.config

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,11 @@ profiles {
2727
includeConfig "$baseDir/config/software_packages.config"
2828
}
2929

30+
mamba {
31+
includeConfig "$baseDir/config/software_packages.config"
32+
conda.useMamba = true
33+
}
34+
3035
debug { process.beforeScript = 'env' }
3136

3237
docker {

0 commit comments

Comments
 (0)