added singularity; edge NXF version

.github/workflows/bowtie_align.yml

@@ -16,14 +16,18 @@ on:
 jobs:
     ci_test:
         runs-on: ubuntu-latest
+        strategy:
+            matrix:
+                nxf_version: [20.11.0-edge]
         env:
             NXF_ANSI_LOG: false
         steps:
             - uses: actions/checkout@v2
 
             - name: Install Nextflow
+              env:
+                NXF_VER: ${{ matrix.nxf_version }}
               run: |
-                  export NXF_VER="20.07.1"
               wget -qO- get.nextflow.io | bash
               sudo mv nextflow /usr/local/bin/
 

.github/workflows/bowtie_index.yml

@@ -14,17 +14,22 @@ on:
 jobs:
     ci_test:
         runs-on: ubuntu-latest
+        strategy:
+            matrix:
+                nxf_version: [20.11.0-edge]
         env:
             NXF_ANSI_LOG: false
         steps:
             - uses: actions/checkout@v2
 
             - name: Install Nextflow
+              env:
+                NXF_VER: ${{ matrix.nxf_version }}
               run: |
-                  export NXF_VER="20.07.1"
               wget -qO- get.nextflow.io | bash
               sudo mv nextflow /usr/local/bin/
 
+
             - name: Set up Python
               uses: actions/setup-python@v2
               with:

software/bowtie/align/main.nf

@@ -12,7 +12,11 @@ process BOWTIE_ALIGN {
         saveAs: { filename -> saveFiles(filename:filename, options:params.options, publish_dir:getSoftwareName(task.process), publish_id:meta.id) }
 
     conda (params.enable_conda ? "bioconda::bowtie=1.3.0 bioconda::samtools=1.10" : null)
+    if (workflow.containerEngine == 'singularity' && !params.singularity_pull_docker_container) {
+        container "https://depot.galaxyproject.org/singularity/mulled-v2-ffbf83a6b0ab6ec567a336cf349b80637135bca3:9e14e16c284d6860574cf5b624bbc44c793cb024-0"
+    } else {
         container "quay.io/biocontainers/mulled-v2-ffbf83a6b0ab6ec567a336cf349b80637135bca3:9e14e16c284d6860574cf5b624bbc44c793cb024-0"
+    }
 
     input:
     tuple val(meta), path(reads)

software/bowtie/align/meta.yml

@@ -29,6 +29,11 @@ params:
         description: |
             Run the module with Conda using the software specified
             via the `conda` directive
+    - singularity_pull_docker_container:
+        type: boolean
+        description: |
+            Instead of directly downloading Singularity images for use with Singularity,
+            force the workflow to pull and convert Docker containers instead.
     - save_unaligned:
         type: boolean
         description: Save unaligned reads

software/bowtie/index/main.nf

@@ -12,8 +12,11 @@ process BOWTIE_INDEX {
         saveAs: { filename -> saveFiles(filename:filename, options:params.options, publish_dir:getSoftwareName(task.process), publish_id:'') }
 
     conda (params.enable_conda ? "bioconda::bowtie=1.3.0" : null)
+    if (workflow.containerEngine == 'singularity' && !params.singularity_pull_docker_container) {
+        container "https://depot.galaxyproject.org/singularity/bowtie:1.3.0--py38hed8969a_1"
+    } else {
         container "quay.io/biocontainers/bowtie:1.3.0--py38hed8969a_1"
-    
+    }
 
     input:
     path fasta

software/bowtie/index/meta.yml

@@ -29,6 +29,11 @@ params:
         description: |
             Run the module with Conda using the software specified
             via the `conda` directive
+    - singularity_pull_docker_container:
+        type: boolean
+        description: |
+            Instead of directly downloading Singularity images for use with Singularity,
+            force the workflow to pull and convert Docker containers instead.        
 input:
     - fasta:
         type: file