Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

change to epytope 3.3.1 version and new multi container for peptide prediction #200

Closed
wants to merge 13 commits into from
6 changes: 3 additions & 3 deletions modules/local/epytope_check_requested_models.nf
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
process EPYTOPE_CHECK_REQUESTED_MODELS {
label 'process_low'

conda "bioconda::epytope=3.1.0"
conda "bioconda::epytope=3.3.1"
container "${ workflow.containerEngine == 'singularity' && !task.ext.singularity_pull_docker_container ?
'https://depot.galaxyproject.org/singularity/epytope:3.1.0--pyh5e36f6f_0' :
'biocontainers/epytope:3.1.0--pyh5e36f6f_0' }"
'https://depot.galaxyproject.org/singularity/epytope:3.3.1--pyh7cba7a3_0' :
'biocontainers/epytope:3.3.1--pyh7cba7a3_0' }"

input:
tuple val(meta), path(input_file)
Expand Down
6 changes: 3 additions & 3 deletions modules/local/epytope_generate_peptides.nf
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@ process EPYTOPE_GENERATE_PEPTIDES {
label 'process_low'
tag "${meta.sample}"

conda "bioconda::epytope=3.1.0"
conda "bioconda::epytope=3.3.1"
container "${ workflow.containerEngine == 'singularity' && !task.ext.singularity_pull_docker_container ?
'https://depot.galaxyproject.org/singularity/epytope:3.1.0--pyh5e36f6f_0' :
'biocontainers/epytope:3.1.0--pyh5e36f6f_0' }"
'https://depot.galaxyproject.org/singularity/epytope:3.3.1--pyh7cba7a3_0' :
'biocontainers/epytope:3.3.1--pyh7cba7a3_0' }"

input:
tuple val(meta), path(raw)
Expand Down
4 changes: 1 addition & 3 deletions modules/local/epytope_peptide_prediction.nf
christopher-mohr marked this conversation as resolved.
Show resolved Hide resolved
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,7 @@ process EPYTOPE_PEPTIDE_PREDICTION {
label 'process_low'

conda "conda-forge::coreutils=9.1 conda-forge::tcsh=6.20.00 bioconda::epytope=3.1.0 conda-forge::gawk=5.1.0 conda-forge::perl=5.32.1"
container "${ workflow.containerEngine == 'singularity' && !task.ext.singularity_pull_docker_container ?
'https://depot.galaxyproject.org/singularity/mulled-v2-11bbf0d242ea96f7b9c08d5b5bc26f2cd5ac5943:3419f320edefe6077631798f50d7bd4f8dc4763f-0' :
'biocontainers/mulled-v2-11bbf0d242ea96f7b9c08d5b5bc26f2cd5ac5943:3419f320edefe6077631798f50d7bd4f8dc4763f-0' }"
container 'ghcr.io/jonasscheid/epitopeprediction-2:0.3.0'

input:
tuple val(meta), path(splitted), path(software_versions)
Expand Down
8 changes: 4 additions & 4 deletions modules/local/epytope_show_supported_models.nf
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
process EPYTOPE_SHOW_SUPPORTED_MODELS {
label 'process_low'

conda "bioconda::epytope=3.1.0"
conda "bioconda::epytope=3.3.1"
container "${ workflow.containerEngine == 'singularity' && !task.ext.singularity_pull_docker_container ?
'https://depot.galaxyproject.org/singularity/epytope:3.1.0--pyh5e36f6f_0' :
'biocontainers/epytope:3.1.0--pyh5e36f6f_0' }"

'https://depot.galaxyproject.org/singularity/epytope:3.3.1--pyh7cba7a3_0' :
'quay.io/biocontainers/epytope:3.3.1--pyh7cba7a3_0' }"
input:
tuple val(meta), path(raw), path(software_versions)

Expand Down
2 changes: 1 addition & 1 deletion modules/local/external_tools_import.nf
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ process EXTERNAL_TOOLS_IMPORT {
# Substitution 3: NMHOME should be the folder in which the tcsh script itself resides
#
sed -i.bak \
-e 's_bin/tcsh.*\$_usr/bin/env tcsh_' \
-e 's_bin/tcsh.*\$_opt/conda/bin/tcsh_' \
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is this changed because of the container? Shouldn't this be container-unrelated?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good catch, that needs to be adjusted to the paths in the new container. That one was from the Conda-based container.

-e "s_/scratch_/tmp_" \
-e "s_setenv[[:space:]]NMHOME.*_setenv NMHOME \\`realpath -s \\\$0 | sed -r 's/[^/]+\$//'\\`_ " "${toolname}/${toolbinaryname}"

Expand Down
6 changes: 3 additions & 3 deletions modules/local/get_prediction_versions.nf
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
process GET_PREDICTION_VERSIONS {
label 'process_low'

conda "bioconda::epytope=3.1.0"
conda "bioconda::epytope=3.3.1"
container "${ workflow.containerEngine == 'singularity' && !task.ext.singularity_pull_docker_container ?
'https://depot.galaxyproject.org/singularity/epytope:3.1.0--pyh5e36f6f_0' :
'biocontainers/epytope:3.1.0--pyh5e36f6f_0' }"
'https://depot.galaxyproject.org/singularity/epytope:3.3.1--pyh7cba7a3_0' :
'quay.io/biocontainers/epytope:3.3.1--pyh7cba7a3_0' }"

input:
val external_tool_versions
Expand Down
Loading