Skip to content

Commit e049f51

Browse files
authored
Merge pull request #876 from nf-core/dev
Dev -> Master for v3.9 release
2 parents 89bf536 + bddc865 commit e049f51

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

61 files changed

+881
-440
lines changed

.editorconfig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ trim_trailing_whitespace = true
88
indent_size = 4
99
indent_style = space
1010

11-
[*.{md,yml,yaml,html,css,scss,js}]
11+
[*.{md,yml,yaml,html,css,scss,js,cff}]
1212
indent_size = 2
1313

1414
# These files are edited and tested upstream in nf-core/modules

.github/PULL_REQUEST_TEMPLATE.md

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,7 @@ Learn more about contributing: [CONTRIBUTING.md](https://github.com/nf-core/rnas
1515

1616
- [ ] This comment contains a description of changes (with reason).
1717
- [ ] If you've fixed a bug or added code that should be tested, add tests!
18-
- [ ] If you've added a new tool - have you followed the pipeline conventions in the [contribution docs](https://github.com/nf-core/rnaseq/tree/master/.github/CONTRIBUTING.md)
19-
- [ ] If necessary, also make a PR on the nf-core/rnaseq _branch_ on the [nf-core/test-datasets](https://github.com/nf-core/test-datasets) repository.
18+
- [ ] If you've added a new tool - have you followed the pipeline conventions in the [contribution docs](https://github.com/nf-core/rnaseq/tree/master/.github/CONTRIBUTING.md)- [ ] If necessary, also make a PR on the nf-core/rnaseq _branch_ on the [nf-core/test-datasets](https://github.com/nf-core/test-datasets) repository.
2019
- [ ] Make sure your code lints (`nf-core lint`).
2120
- [ ] Ensure the test suite passes (`nextflow run . -profile test,docker --outdir <OUTDIR>`).
2221
- [ ] Usage Documentation in `docs/usage.md` is updated.

.github/workflows/ci.yml

Lines changed: 6 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ on:
1010

1111
env:
1212
NXF_ANSI_LOG: false
13-
CAPSULE_LOG: none
1413

1514
jobs:
1615
test:
@@ -20,27 +19,17 @@ jobs:
2019
runs-on: ubuntu-latest
2120
strategy:
2221
matrix:
23-
# Nextflow versions
24-
include:
25-
# Test pipeline minimum Nextflow version
26-
- NXF_VER: "21.10.3"
27-
NXF_EDGE: ""
28-
# Test latest edge release of Nextflow
29-
- NXF_VER: ""
30-
NXF_EDGE: "1"
22+
NXF_VER:
23+
- "21.10.3"
24+
- "latest-everything"
3125
steps:
3226
- name: Check out pipeline code
3327
uses: actions/checkout@v2
3428

3529
- name: Install Nextflow
36-
env:
37-
NXF_VER: ${{ matrix.NXF_VER }}
38-
# Uncomment only if the edge release is more recent than the latest stable release
39-
# See https://github.com/nextflow-io/nextflow/issues/2467
40-
# NXF_EDGE: ${{ matrix.NXF_EDGE }}
41-
run: |
42-
wget -qO- get.nextflow.io | bash
43-
sudo mv nextflow /usr/local/bin/
30+
uses: nf-core/setup-nextflow@v1
31+
with:
32+
version: "${{ matrix.NXF_VER }}"
4433

4534
- name: Run pipeline with test data
4635
run: |

.github/workflows/linting.yml

Lines changed: 32 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -35,22 +35,48 @@ jobs:
3535
- name: Run Prettier --check
3636
run: prettier --check ${GITHUB_WORKSPACE}
3737

38+
PythonBlack:
39+
runs-on: ubuntu-latest
40+
steps:
41+
- uses: actions/checkout@v2
42+
43+
- name: Check code lints with Black
44+
uses: psf/black@stable
45+
46+
# If the above check failed, post a comment on the PR explaining the failure
47+
- name: Post PR comment
48+
if: failure()
49+
uses: mshick/add-pr-comment@v1
50+
with:
51+
message: |
52+
## Python linting (`black`) is failing
53+
54+
To keep the code consistent with lots of contributors, we run automated code consistency checks.
55+
To fix this CI test, please run:
56+
57+
* Install [`black`](https://black.readthedocs.io/en/stable/): `pip install black`
58+
* Fix formatting errors in your pipeline: `black .`
59+
60+
Once you push these changes the test should pass, and you can hide this comment :+1:
61+
62+
We highly recommend setting up Black in your code editor so that this formatting is done automatically on save. Ask about it on Slack for help!
63+
64+
Thanks again for your contribution!
65+
repo-token: ${{ secrets.GITHUB_TOKEN }}
66+
allow-repeats: false
67+
3868
nf-core:
3969
runs-on: ubuntu-latest
4070
steps:
4171
- name: Check out pipeline code
4272
uses: actions/checkout@v2
4373

4474
- name: Install Nextflow
45-
env:
46-
CAPSULE_LOG: none
47-
run: |
48-
wget -qO- get.nextflow.io | bash
49-
sudo mv nextflow /usr/local/bin/
75+
uses: nf-core/setup-nextflow@v1
5076

5177
- uses: actions/setup-python@v3
5278
with:
53-
python-version: "3.6"
79+
python-version: "3.7"
5480
architecture: "x64"
5581

5682
- name: Install dependencies

.nf-core.yml

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,3 @@ lint:
44
- assets/email_template.html
55
- assets/email_template.txt
66
- lib/NfcoreTemplate.groovy
7-
update:
8-
nf-core/modules:
9-
rseqc/bamstat: "e745e167c1020928ef20ea1397b6b4d230681b4d"
10-
rseqc/inferexperiment: "e745e167c1020928ef20ea1397b6b4d230681b4d"
11-
rseqc/innerdistance: "e745e167c1020928ef20ea1397b6b4d230681b4d"
12-
rseqc/junctionannotation: "e745e167c1020928ef20ea1397b6b4d230681b4d"
13-
rseqc/junctionsaturation: "e745e167c1020928ef20ea1397b6b4d230681b4d"
14-
rseqc/readdistribution: "e745e167c1020928ef20ea1397b6b4d230681b4d"
15-
rseqc/readduplication: "e745e167c1020928ef20ea1397b6b4d230681b4d"
16-
rseqc/tin: "4dbc166a7c30e963511fb5c9870fbcaa158a53a9"

CHANGELOG.md

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,41 @@
33
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)
44
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
55

6+
## [[3.9](https://github.com/nf-core/rnaseq/releases/tag/3.9)] - 2022-09-30
7+
8+
### Enhancements & fixes
9+
10+
- [[#746](https://github.com/nf-core/rnaseq/issues/746)] - Add `tin.py` output to MultiQC report
11+
- [[#841](https://github.com/nf-core/rnaseq/issues/841)] - Turn `--deseq2_vst` on by default
12+
- [[#853](https://github.com/nf-core/rnaseq/issues/853)] - Pipeline fails at email step: Failed to invoke `workflow.onComplete` event handler
13+
- [[#857](https://github.com/nf-core/rnaseq/issues/857)] - Missing parameter required by StringTie if using STAR as aligner
14+
- [[#862](https://github.com/nf-core/rnaseq/issues/862)] - Filter samples that have no reads after trimming
15+
- [[#864](https://github.com/nf-core/rnaseq/issues/864)] - Pre-process transcripts fasta when using `--gencode`
16+
- Expose additional arguments to UMI-tools as pipeline params: `--umitools_bc_pattern2` is required if the UMI is located on read 2. `--umitools_umi_separator` will often be needed in conjunction with `--skip_umi_extract` as most other tools such as Illumina's `BCL Convert` use a colon instead of an underscore to separate the UMIs. The `--umitools_grouping_method` allows to fine-tune handling of similar but non-identical UMIs.
17+
- Updated pipeline template to [nf-core/tools 2.5.1](https://github.com/nf-core/tools/releases/tag/2.5.1)
18+
19+
### Parameters
20+
21+
| Old parameter | New parameter |
22+
| ------------- | ---------------------------- |
23+
| | `--umitools_bc_pattern2` |
24+
| | `--umitools_umi_separator` |
25+
| | `--umitools_grouping_method` |
26+
27+
### Software dependencies
28+
29+
Note, since the pipeline is now using Nextflow DSL2, each process will be run with its own [Biocontainer](https://biocontainers.pro/#/registry). This means that on occasion it is entirely possible for the pipeline to be using different versions of the same tool. However, the overall software dependency changes compared to the last release have been listed below for reference.
30+
31+
| Dependency | Old version | New version |
32+
| ---------- | ----------- | ----------- |
33+
| `hisat2` | 2.2.0 | 2.2.1 |
34+
| `multiqc` | 1.11 | 1.13 |
35+
| `picard` | 2.26.10 | 2.27.4 |
36+
37+
> **NB:** Dependency has been **updated** if both old and new version information is present.
38+
> **NB:** Dependency has been **added** if just the new version information is present.
39+
> **NB:** Dependency has been **removed** if version information isn't present.
40+
641
## [[3.8.1](https://github.com/nf-core/rnaseq/releases/tag/3.8.1)] - 2022-05-27
742

843
- [[#834](https://github.com/nf-core/rnaseq/issues/834)] - `nf-core download` fails with version 3.8 of the pipeline

CITATION.cff

Lines changed: 56 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,56 @@
1+
cff-version: 1.2.0
2+
message: "If you use `nf-core tools` in your work, please cite the `nf-core` publication"
3+
authors:
4+
- family-names: Ewels
5+
given-names: Philip
6+
- family-names: Peltzer
7+
given-names: Alexander
8+
- family-names: Fillinger
9+
given-names: Sven
10+
- family-names: Patel
11+
given-names: Harshil
12+
- family-names: Alneberg
13+
given-names: Johannes
14+
- family-names: Wilm
15+
given-names: Andreas
16+
- family-names: Ulysse Garcia
17+
given-names: Maxime
18+
- family-names: Di Tommaso
19+
given-names: Paolo
20+
- family-names: Nahnsen
21+
given-names: Sven
22+
title: "The nf-core framework for community-curated bioinformatics pipelines."
23+
version: 2.4.1
24+
doi: 10.1038/s41587-020-0439-x
25+
date-released: 2022-05-16
26+
url: https://github.com/nf-core/tools
27+
prefered-citation:
28+
type: article
29+
authors:
30+
- family-names: Ewels
31+
given-names: Philip
32+
- family-names: Peltzer
33+
given-names: Alexander
34+
- family-names: Fillinger
35+
given-names: Sven
36+
- family-names: Patel
37+
given-names: Harshil
38+
- family-names: Alneberg
39+
given-names: Johannes
40+
- family-names: Wilm
41+
given-names: Andreas
42+
- family-names: Ulysse Garcia
43+
given-names: Maxime
44+
- family-names: Di Tommaso
45+
given-names: Paolo
46+
- family-names: Nahnsen
47+
given-names: Sven
48+
doi: 10.1038/s41587-020-0439-x
49+
journal: nature biotechnology
50+
start: 276
51+
end: 278
52+
title: "The nf-core framework for community-curated bioinformatics pipelines."
53+
issue: 3
54+
volume: 38
55+
year: 2020
56+
url: https://dx.doi.org/10.1038/s41587-020-0439-x

README.md

Lines changed: 8 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,14 @@
11
# ![nf-core/rnaseq](docs/images/nf-core-rnaseq_logo_light.png#gh-light-mode-only) ![nf-core/rnaseq](docs/images/nf-core-rnaseq_logo_dark.png#gh-dark-mode-only)
22

3-
[![GitHub Actions CI Status](https://github.com/nf-core/rnaseq/workflows/nf-core%20CI/badge.svg)](https://github.com/nf-core/rnaseq/actions?query=workflow%3A%22nf-core+CI%22)
4-
[![GitHub Actions Linting Status](https://github.com/nf-core/rnaseq/workflows/nf-core%20linting/badge.svg)](https://github.com/nf-core/rnaseq/actions?query=workflow%3A%22nf-core+linting%22)
5-
[![AWS CI](https://img.shields.io/badge/CI%20tests-full%20size-FF9900?logo=Amazon%20AWS)](https://nf-co.re/rnaseq/results)
6-
[![Cite with Zenodo](http://img.shields.io/badge/DOI-10.5281/zenodo.1400710-1073c8)](https://doi.org/10.5281/zenodo.1400710)
3+
[![AWS CI](https://img.shields.io/badge/CI%20tests-full%20size-FF9900?labelColor=000000&logo=Amazon%20AWS)](https://nf-co.re/rnaseq/results)[![Cite with Zenodo](http://img.shields.io/badge/DOI-10.5281/zenodo.1400710-1073c8?labelColor=000000)](https://doi.org/10.5281/zenodo.1400710)
74

85
[![Nextflow](https://img.shields.io/badge/nextflow%20DSL2-%E2%89%A521.10.3-23aa62.svg)](https://www.nextflow.io/)
9-
[![run with conda](http://img.shields.io/badge/run%20with-conda-3EB049?logo=anaconda)](https://docs.conda.io/en/latest/)
10-
[![run with docker](https://img.shields.io/badge/run%20with-docker-0db7ed?logo=docker)](https://www.docker.com/)
11-
[![run with singularity](https://img.shields.io/badge/run%20with-singularity-1d355c.svg)](https://sylabs.io/docs/)
6+
[![run with conda](http://img.shields.io/badge/run%20with-conda-3EB049?labelColor=000000&logo=anaconda)](https://docs.conda.io/en/latest/)
7+
[![run with docker](https://img.shields.io/badge/run%20with-docker-0db7ed?labelColor=000000&logo=docker)](https://www.docker.com/)
8+
[![run with singularity](https://img.shields.io/badge/run%20with-singularity-1d355c.svg?labelColor=000000)](https://sylabs.io/docs/)
129
[![Launch on Nextflow Tower](https://img.shields.io/badge/Launch%20%F0%9F%9A%80-Nextflow%20Tower-%234256e7)](https://tower.nf/launch?pipeline=https://github.com/nf-core/rnaseq)
1310

14-
[![Get help on Slack](http://img.shields.io/badge/slack-nf--core%20%23rnaseq-4A154B?logo=slack)](https://nfcore.slack.com/channels/rnaseq)
15-
[![Follow on Twitter](http://img.shields.io/badge/twitter-%40nf__core-1DA1F2?logo=twitter)](https://twitter.com/nf_core)
16-
[![Watch on YouTube](http://img.shields.io/badge/youtube-nf--core-FF0000?logo=youtube)](https://www.youtube.com/c/nf-core)
11+
[![Get help on Slack](http://img.shields.io/badge/slack-nf--core%20%23rnaseq-4A154B?labelColor=000000&logo=slack)](https://nfcore.slack.com/channels/rnaseq)[![Follow on Twitter](http://img.shields.io/badge/twitter-%40nf__core-1DA1F2?labelColor=000000&logo=twitter)](https://twitter.com/nf_core)[![Watch on YouTube](http://img.shields.io/badge/youtube-nf--core-FF0000?labelColor=000000&logo=youtube)](https://www.youtube.com/c/nf-core)
1712

1813
## Introduction
1914

@@ -69,7 +64,7 @@ The SRA download functionality has been removed from the pipeline (`>=3.2`) and
6964

7065
3. Download the pipeline and test it on a minimal dataset with a single command:
7166

72-
```console
67+
```bash
7368
nextflow run nf-core/rnaseq -profile test,YOURPROFILE --outdir <OUTDIR>
7469
```
7570

@@ -82,13 +77,13 @@ The SRA download functionality has been removed from the pipeline (`>=3.2`) and
8277
8378
4. Start running your own analysis!
8479

85-
```console
80+
```bash
8681
nextflow run nf-core/rnaseq --input samplesheet.csv --outdir <OUTDIR> --genome GRCh37 -profile <docker/singularity/podman/shifter/charliecloud/conda/institute>
8782
```
8883

8984
- An executable Python script called [`fastq_dir_to_samplesheet.py`](https://github.com/nf-core/rnaseq/blob/master/bin/fastq_dir_to_samplesheet.py) has been provided if you would like to auto-create an input samplesheet based on a directory containing FastQ files **before** you run the pipeline (requires Python 3 installed locally) e.g.
9085

91-
```console
86+
```bash
9287
wget -L https://raw.githubusercontent.com/nf-core/rnaseq/master/bin/fastq_dir_to_samplesheet.py
9388
./fastq_dir_to_samplesheet.py <FASTQ_DIR> samplesheet.csv --strandedness reverse
9489
```

0 commit comments

Comments
 (0)