Patch release 1.1.2 with bug fix

.github/ISSUE_TEMPLATE/bug_report.md

@@ -1,10 +1,15 @@
+---
+name: Bug report
+about: Report something that is broken or incorrect
+labels: bug
+---
+
 <!--
 # nf-core/mag bug report
 
 Hi there!
 
 Thanks for telling us about a problem with the pipeline.
-
 Please delete this text and anything that's not relevant from the template below:
 -->
 

.github/ISSUE_TEMPLATE/config.yml

@@ -0,0 +1,8 @@
+blank_issues_enabled: false
+contact_links:
+  - name: Join nf-core
+    url: https://nf-co.re/join
+    about: Please join the nf-core community here
+  - name: "Slack #mag channel"
+    url: https://nfcore.slack.com/channels/mag
+    about: Discussion about the nf-core/mag pipeline

.github/ISSUE_TEMPLATE/feature_request.md

@@ -1,3 +1,9 @@
+---
+name: Feature request
+about: Suggest an idea for the nf-core website
+labels: enhancement
+---
+
 <!--
 # nf-core/mag feature request
 

.github/workflows/awsfulltest.yml

@@ -4,8 +4,9 @@ name: nf-core AWS full size tests
 # It runs the -profile 'test_full' on AWS batch
 
 on:
-  release:
-    types: [published]
+  workflow_run:
+    workflows: ["nf-core Docker push (release)"]
+    types: [completed]
   workflow_dispatch:
 
 jobs:
@@ -15,7 +16,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Setup Miniconda
-        uses: goanpeca/setup-miniconda@v1.0.2
+        uses: conda-incubator/setup-miniconda@v2
         with:
           auto-update-conda: true
           python-version: 3.7

.github/workflows/awstest.yml

@@ -13,7 +13,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Setup Miniconda
-        uses: goanpeca/setup-miniconda@v1.0.2
+        uses: conda-incubator/setup-miniconda@v2
         with:
           auto-update-conda: true
           python-version: 3.7

.github/workflows/branch.yml

@@ -2,7 +2,7 @@ name: nf-core branch protection
 # This workflow is triggered on PRs to master branch on the repository
 # It fails when someone tries to make a PR against the nf-core `master` branch instead of `dev`
 on:
-  pull_request:
+  pull_request_target:
     branches: [master]
 
 jobs:

.github/workflows/ci.yml

@@ -20,46 +20,48 @@ jobs:
     strategy:
       matrix:
         # Nextflow versions: check pipeline minimum and current latest
-        nxf_ver: ['19.10.0', '']
+        nxf_ver: ['20.04.0', '']
     steps:
       - name: Check out pipeline code
         uses: actions/checkout@v2
 
       - name: Check if Dockerfile or Conda environment changed
-        uses: technote-space/get-diff-action@v1
+        uses: technote-space/get-diff-action@v4
         with:
-          PREFIX_FILTER: |
+          FILES: |
             Dockerfile
             environment.yml
 
       - name: Build new docker image
-        if: env.GIT_DIFF
-        run: docker build --no-cache . -t nfcore/mag:1.1.1
+        if: env.MATCHED_FILES
+        run: docker build --no-cache . -t nfcore/mag:1.1.2
 
       - name: Pull docker image
-        if: ${{ !env.GIT_DIFF }}
+        if: ${{ !env.MATCHED_FILES }}
         run: |
           docker pull nfcore/mag:dev
-          docker tag nfcore/mag:dev nfcore/mag:1.1.1
+          docker tag nfcore/mag:dev nfcore/mag:1.1.2
 
       - name: Check if BUSCO Dockerfile or Conda environment changed
-        uses: technote-space/get-diff-action@v1
+        uses: technote-space/get-diff-action@v4
         with:
-          PREFIX_FILTER: |
+          FILES: |
             containers/busco/Dockerfile
             containers/busco/environment.yml
 
       - name: Build new docker image for BUSCO
-        if: env.GIT_DIFF
-        run: docker build --no-cache ./containers/busco/ -t nfcore/magbusco:1.1.1
+        if: env.MATCHED_FILES
+        run: docker build --no-cache ./containers/busco/ -t nfcore/magbusco:1.1.2
 
       - name: Pull docker image for BUSCO
-        if: ${{ !env.GIT_DIFF }}
+        if: ${{ !env.MATCHED_FILES }}
         run: |
           docker pull nfcore/magbusco:dev
-          docker tag nfcore/magbusco:dev nfcore/magbusco:1.1.1
+          docker tag nfcore/magbusco:dev nfcore/magbusco:1.1.2
 
       - name: Install Nextflow
+        env:
+          CAPSULE_LOG: none
         run: |
           wget -qO- get.nextflow.io | bash
           sudo mv nextflow /usr/local/bin/

.github/workflows/linting.yml

@@ -38,6 +38,8 @@ jobs:
         uses: actions/checkout@v2
 
       - name: Install Nextflow
+        env:
+          CAPSULE_LOG: none
         run: |
           wget -qO- get.nextflow.io | bash
           sudo mv nextflow /usr/local/bin/
@@ -57,12 +59,19 @@ jobs:
           GITHUB_COMMENTS_URL: ${{ github.event.pull_request.comments_url }}
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           GITHUB_PR_COMMIT: ${{ github.event.pull_request.head.sha }}
-        run: nf-core -l lint_log.txt lint ${GITHUB_WORKSPACE}
+        run: nf-core -l lint_log.txt lint ${GITHUB_WORKSPACE} --markdown lint_results.md
+
+      - name: Save PR number
+        if: ${{ always() }}
+        run: echo ${{ github.event.pull_request.number }} > PR_number.txt
 
       - name: Upload linting log file artifact
         if: ${{ always() }}
         uses: actions/upload-artifact@v2
         with:
           name: linting-log-file
-          path: lint_log.txt
+          path: |
+            lint_log.txt
+            lint_results.md
+            PR_number.txt
 

.github/workflows/linting_comment.yml

@@ -0,0 +1,29 @@
+
+name: nf-core linting comment
+# This workflow is triggered after the linting action is complete
+# It posts an automated comment to the PR, even if the PR is coming from a fork
+
+on:
+  workflow_run:
+    workflows: ["nf-core linting"]
+
+jobs:
+  test:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Download lint results
+        uses: dawidd6/action-download-artifact@v2
+        with:
+          workflow: linting.yml
+
+      - name: Get PR number
+        id: pr_number
+        run: echo "::set-output name=pr_number::$(cat linting-logs/PR_number.txt)"
+
+      - name: Post PR comment
+        uses: marocchino/sticky-pull-request-comment@v2
+        with:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          number: ${{ steps.pr_number.outputs.pr_number }}
+          path: linting-logs/lint_results.md
+

.github/workflows/push_dockerhub_dev.yml

@@ -0,0 +1,36 @@
+name: nf-core Docker push (dev)
+# This builds the docker image and pushes it to DockerHub
+# Runs on nf-core repo releases and push event to 'dev' branch (PR merges)
+on:
+  push:
+    branches:
+      - dev
+
+jobs:
+  push_dockerhub:
+    name: Push new Docker image to Docker Hub (dev)
+    runs-on: ubuntu-latest
+    # Only run for the nf-core repo, for releases and merged PRs
+    if: ${{ github.repository == 'nf-core/mag' }}
+    env:
+      DOCKERHUB_USERNAME: ${{ secrets.DOCKERHUB_USERNAME }}
+      DOCKERHUB_PASS: ${{ secrets.DOCKERHUB_PASS }}
+    steps:
+      - name: Check out pipeline code
+        uses: actions/checkout@v2
+
+      - name: Build new docker image
+        run: docker build --no-cache . -t nfcore/mag:dev
+
+      - name: Push Docker image to DockerHub (dev)
+        run: |
+          echo "$DOCKERHUB_PASS" | docker login -u "$DOCKERHUB_USERNAME" --password-stdin
+          docker push nfcore/mag:dev
+
+      - name: Build new docker image for BUSCO
+        run: docker build --no-cache ./containers/busco/ -t nfcore/magbusco:dev
+
+      - name: Push Docker image for BUSCO to DockerHub (dev)
+        run: |
+          echo "$DOCKERHUB_PASS" | docker login -u "$DOCKERHUB_USERNAME" --password-stdin
+          docker push nfcore/magbusco:dev

.github/workflows/push_dockerhub.yml → .github/workflows/push_dockerhub_release.yml

@@ -1,16 +1,13 @@
-name: nf-core Docker push
+name: nf-core Docker push (release)
 # This builds the docker image and pushes it to DockerHub
 # Runs on nf-core repo releases and push event to 'dev' branch (PR merges)
 on:
-  push:
-    branches:
-      - dev
   release:
     types: [published]
 
 jobs:
   push_dockerhub:
-    name: Push new Docker image to Docker Hub
+    name: Push new Docker image to Docker Hub (release)
     runs-on: ubuntu-latest
     # Only run for the nf-core repo, for releases and merged PRs
     if: ${{ github.repository == 'nf-core/mag' }}
@@ -24,15 +21,7 @@ jobs:
       - name: Build new docker image
         run: docker build --no-cache . -t nfcore/mag:latest
 
-      - name: Push Docker image to DockerHub (dev)
-        if: ${{ github.event_name == 'push' }}
-        run: |
-          echo "$DOCKERHUB_PASS" | docker login -u "$DOCKERHUB_USERNAME" --password-stdin
-          docker tag nfcore/mag:latest nfcore/mag:dev
-          docker push nfcore/mag:dev
-
       - name: Push Docker image to DockerHub (release)
-        if: ${{ github.event_name == 'release' }}
         run: |
           echo "$DOCKERHUB_PASS" | docker login -u "$DOCKERHUB_USERNAME" --password-stdin
           docker push nfcore/mag:latest
@@ -42,15 +31,7 @@ jobs:
       - name: Build new docker image for BUSCO
         run: docker build --no-cache ./containers/busco/ -t nfcore/magbusco:latest
 
-      - name: Push Docker image for BUSCO to DockerHub (dev)
-        if: ${{ github.event_name == 'push' }}
-        run: |
-          echo "$DOCKERHUB_PASS" | docker login -u "$DOCKERHUB_USERNAME" --password-stdin
-          docker tag nfcore/magbusco:latest nfcore/magbusco:dev
-          docker push nfcore/magbusco:dev
-
       - name: Push Docker image for BUSCO to DockerHub (release)
-        if: ${{ github.event_name == 'release' }}
         run: |
           echo "$DOCKERHUB_PASS" | docker login -u "$DOCKERHUB_USERNAME" --password-stdin
           docker push nfcore/magbusco:latest

CHANGELOG.md

@@ -3,7 +3,17 @@
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
-## v1.1.1 - 2019/11/10
+## v1.1.2 - 2020/11/24
+
+### `Changed`
+
+- [#135](https://github.com/nf-core/mag/pull/135) - Update to nf-core 1.12 `TEMPLATE`
+
+### `Fixed`
+
+- [#133](https://github.com/nf-core/mag/pull/133) - Fixed processing of `--input` parameter [#131](https://github.com/nf-core/mag/issues/131)
+
+## v1.1.1 - 2020/11/10
 
 ### `Added`
 

Dockerfile

@@ -1,4 +1,4 @@
-FROM nfcore/base:1.11
+FROM nfcore/base:1.12
 LABEL authors="Hadrien Gourlé <[email protected]>, Daniel Straub <[email protected]>, Sabrina Krakau <[email protected]>" \
       description="Docker image containing all software requirements for the nf-core/mag pipeline"
 
@@ -7,10 +7,10 @@ COPY environment.yml /
 RUN conda env create --quiet -f /environment.yml && conda clean -a
 
 # Add conda installation dir to PATH (instead of doing 'conda activate')
-ENV PATH /opt/conda/envs/nf-core-mag-1.1.1/bin:$PATH
+ENV PATH /opt/conda/envs/nf-core-mag-1.1.2/bin:$PATH
 
 # Dump the details of the installed packages to a file for posterity
-RUN conda env export --name nf-core-mag-1.1.1 > nf-core-mag-1.1.1.yml
+RUN conda env export --name nf-core-mag-1.1.2 > nf-core-mag-1.1.2.yml
 
 # Instruct R processes to use these empty files instead of clashing with a local version
 RUN touch .Rprofile

README.md

@@ -4,7 +4,7 @@
 
 [![GitHub Actions CI Status](https://github.com/nf-core/mag/workflows/nf-core%20CI/badge.svg)](https://github.com/nf-core/mag/actions)
 [![GitHub Actions Linting Status](https://github.com/nf-core/mag/workflows/nf-core%20linting/badge.svg)](https://github.com/nf-core/mag/actions)
-[![Nextflow](https://img.shields.io/badge/nextflow-%E2%89%A519.10.0-brightgreen.svg)](https://www.nextflow.io/)
+[![Nextflow](https://img.shields.io/badge/nextflow-%E2%89%A520.04.0-brightgreen.svg)](https://www.nextflow.io/)
 
 [![install with bioconda](https://img.shields.io/badge/install%20with-bioconda-brightgreen.svg)](https://bioconda.github.io/)
 [![Docker](https://img.shields.io/docker/automated/nfcore/mag.svg)](https://hub.docker.com/r/nfcore/mag)

assets/sendmail_template.txt

@@ -14,7 +14,7 @@ Content-Transfer-Encoding: base64
 Content-ID: <nfcorepipelinelogo>
 Content-Disposition: inline; filename="nf-core-mag_logo.png"
 
-<% out << new File("$baseDir/assets/nf-core-mag_logo.png").
+<% out << new File("$projectDir/assets/nf-core-mag_logo.png").
   bytes.
   encodeBase64().
   toString().

conf/base.config

@@ -106,23 +106,23 @@ process {
     time = { check_max (8.h * task.attempt, 'time' ) }
   }
   withName: busco {
-    container = 'nfcore/magbusco:1.1.1'
+    container = 'nfcore/magbusco:1.1.2'
     profiles {
       conda {
         conda = "$baseDir/containers/busco/environment.yml"
       }
     }
   }
   withName: busco_plot {
-    container = 'nfcore/magbusco:1.1.1'
+    container = 'nfcore/magbusco:1.1.2'
     profiles {
       conda {
         conda = "$baseDir/containers/busco/environment.yml"
       }
     }
   }
   withName: get_busco_version {
-    container = 'nfcore/magbusco:1.1.1'
+    container = 'nfcore/magbusco:1.1.2'
     profiles {
       conda {
         conda = "$baseDir/containers/busco/environment.yml"

containers/busco/Dockerfile

@@ -1,4 +1,4 @@
-FROM nfcore/base:1.11
+FROM nfcore/base:1.12
 LABEL authors="Hadrien Gourlé <[email protected]>, Daniel Straub <[email protected]>, Sabrina Krakau <[email protected]>" \
       description="Docker image containing BUSCO requirements for the nf-core/mag pipeline"
 
@@ -11,10 +11,10 @@ RUN apt-get update
 RUN apt-get install -y libxt6
 
 # Add conda installation dir to PATH (instead of doing 'conda activate')
-ENV PATH /opt/conda/envs/nf-core-mag-busco-1.1.1/bin:$PATH
+ENV PATH /opt/conda/envs/nf-core-mag-busco-1.1.2/bin:$PATH
 
 # Dump the details of the installed packages to a file for posterity
-RUN conda env export --name nf-core-mag-busco-1.1.1 > nf-core-mag-busco-1.1.1.yml
+RUN conda env export --name nf-core-mag-busco-1.1.2 > nf-core-mag-busco-1.1.2.yml
 
 # Instruct R processes to use these empty files instead of clashing with a local version
 RUN touch .Rprofile

containers/busco/environment.yml

@@ -1,6 +1,6 @@
 # You can use this file to create a conda environment for this pipeline:
 #   conda env create -f environment.yml
-name: nf-core-mag-busco-1.1.1
+name: nf-core-mag-busco-1.1.2
 channels:
   - conda-forge
   - bioconda