Merge pull request #120 from tillenglert/enable-conda

enable conda
nf-core · May 8, 2024 · 936ebbc · 936ebbc
2 parents 5d05bfa + 046772d
commit 936ebbc
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 6 deletions.
diff --git a/modules/local/plot_score_distribution.nf b/modules/local/plot_score_distribution.nf
@@ -2,7 +2,7 @@ process PLOT_SCORE_DISTRIBUTION {
     label 'cache_lenient'
     label 'process_medium_memory'
 
-    conda "bioconda::bioconductor-alphabeta:1.8.0"
+    conda "bioconda::bioconductor-alphabeta=1.8.0"
     container "${ workflow.containerEngine == 'singularity' && !task.ext.singularity_pull_docker_container ?
         'https://depot.galaxyproject.org/singularity/bioconductor-alphabeta:1.8.0--r41hdfd78af_0' :
         'biocontainers/bioconductor-alphabeta:1.8.0--r41hdfd78af_0' }"

diff --git a/nextflow.config b/nextflow.config
@@ -110,7 +110,7 @@ profiles {
         podman.enabled         = false
         shifter.enabled        = false
         charliecloud.enabled   = false
-        channels               = ['conda-forge', 'bioconda', 'defaults']
+        conda.channels         = ['conda-forge', 'bioconda', 'defaults']
         apptainer.enabled      = false
     }
     mamba {

diff --git a/subworkflows/local/utils_nfcore_metapep_pipeline/main.nf b/subworkflows/local/utils_nfcore_metapep_pipeline/main.nf
@@ -133,10 +133,6 @@ workflow PIPELINE_COMPLETION {
 // Check and validate pipeline parameters
 //
 def validateInputParameters() {
-    // Exit if running this pipeline with -profile conda / -profile mamba
-    if (workflow.profile.tokenize(',').intersect(['conda', 'mamba']).size() >= 1) {
-        error "This pipeline does not support Conda. Please use a container engine such as Docker or Singularity instead."
-    }
     // Exit if peptide length parameters are exchanged
     if (params.min_pep_len > params.max_pep_len) {
         error "The minimum peptide length needs to be smaller or equal than the maximum. See 'https://nf-co.re/metapep/dev/parameters' for more information."