Skip to content

Commit 6995330

Browse files
authored
Merge pull request #832 from nf-core/dev
Dev -> Master for v3.8 release
2 parents e0dfce9 + 8f59050 commit 6995330

File tree

24 files changed

+597
-125
lines changed

24 files changed

+597
-125
lines changed

.github/workflows/branch.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ jobs:
1313
- name: Check PRs
1414
if: github.repository == 'nf-core/rnaseq'
1515
run: |
16-
"{ [[ ${{github.event.pull_request.head.repo.full_name }} == nf-core/rnaseq ]] && [[ $GITHUB_HEAD_REF = "dev" ]]; } || [[ $GITHUB_HEAD_REF == "patch" ]]"
16+
{ [[ ${{github.event.pull_request.head.repo.full_name }} == nf-core/rnaseq ]] && [[ $GITHUB_HEAD_REF = "dev" ]]; } || [[ $GITHUB_HEAD_REF == "patch" ]]
1717
1818
# If the above check failed, post a comment on the PR explaining the failure
1919
# NOTE - this doesn't currently work if the PR is coming from a fork, due to limitations in GitHub actions secrets
@@ -42,4 +42,3 @@ jobs:
4242
Thanks again for your contribution!
4343
repo-token: ${{ secrets.GITHUB_TOKEN }}
4444
allow-repeats: false
45-
#

.github/workflows/ci.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -143,5 +143,3 @@ jobs:
143143
- name: Run pipeline with Salmon and various parameters
144144
run: |
145145
nextflow run ${GITHUB_WORKSPACE} -profile test,docker --pseudo_aligner salmon ${{ matrix.parameters }} --outdir ./results
146-
147-
#

.github/workflows/fix-linting.yml

Lines changed: 55 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,55 @@
1+
name: Fix linting from a comment
2+
on:
3+
issue_comment:
4+
types: [created]
5+
6+
jobs:
7+
deploy:
8+
# Only run if comment is on a PR with the main repo, and if it contains the magic keywords
9+
if: >
10+
contains(github.event.comment.html_url, '/pull/') &&
11+
contains(github.event.comment.body, '@nf-core-bot fix linting') &&
12+
github.repository == 'nf-core/rnaseq'
13+
runs-on: ubuntu-latest
14+
steps:
15+
# Use the @nf-core-bot token to check out so we can push later
16+
- uses: actions/checkout@v3
17+
with:
18+
token: ${{ secrets.nf_core_bot_auth_token }}
19+
20+
# Action runs on the issue comment, so we don't get the PR by default
21+
# Use the gh cli to check out the PR
22+
- name: Checkout Pull Request
23+
run: gh pr checkout ${{ github.event.issue.number }}
24+
env:
25+
GITHUB_TOKEN: ${{ secrets.nf_core_bot_auth_token }}
26+
27+
- uses: actions/setup-node@v2
28+
29+
- name: Install Prettier
30+
run: npm install -g prettier @prettier/plugin-php
31+
32+
# Check that we actually need to fix something
33+
- name: Run 'prettier --check'
34+
id: prettier_status
35+
run: |
36+
if prettier --check ${GITHUB_WORKSPACE}; then
37+
echo "::set-output name=result::pass"
38+
else
39+
echo "::set-output name=result::fail"
40+
fi
41+
42+
- name: Run 'prettier --write'
43+
if: steps.prettier_status.outputs.result == 'fail'
44+
run: prettier --write ${GITHUB_WORKSPACE}
45+
46+
- name: Commit & push changes
47+
if: steps.prettier_status.outputs.result == 'fail'
48+
run: |
49+
git config user.email "[email protected]"
50+
git config user.name "nf-core-bot"
51+
git config push.default upstream
52+
git add .
53+
git status
54+
git commit -m "[automated] Fix linting with Prettier"
55+
git push

.github/workflows/linting.yml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ jobs:
4848
wget -qO- get.nextflow.io | bash
4949
sudo mv nextflow /usr/local/bin/
5050
51-
- uses: actions/setup-python@v1
51+
- uses: actions/setup-python@v3
5252
with:
5353
python-version: "3.6"
5454
architecture: "x64"
@@ -78,5 +78,3 @@ jobs:
7878
lint_log.txt
7979
lint_results.md
8080
PR_number.txt
81-
82-
#

.github/workflows/linting_comment.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,4 +26,3 @@ jobs:
2626
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
2727
number: ${{ steps.pr_number.outputs.pr_number }}
2828
path: linting-logs/lint_results.md
29-
#

.prettierignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
email_template.html
12
.nextflow*
23
work/
34
data/

CHANGELOG.md

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,27 @@
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.8](https://github.com/nf-core/rnaseq/releases/tag/3.8)] - 2022-05-25
7+
8+
### :warning: Major enhancements
9+
10+
Fixed quite a well hidden bug in the UMI processing mode of the pipeline when using `--with_umi --aligner star_salmon` as reported by [Lars Roed Ingerslev](https://github.com/lars-work-sund). Paired-end BAM files were not appropriately name sorted after `umi_tools dedup` which ultimately resulted in incorrect reading and quantification with Salmon. If you have used previous versions of the pipeline to analyse paired-end UMI data it will need to be reprocessed using this version of the pipeline. See [#828](https://github.com/nf-core/rnaseq/issues/828) for more context.
11+
12+
### Enhancements & fixes
13+
14+
- [[#824](https://github.com/nf-core/rnaseq/issues/824)] - Add explicit docs for usage of featureCounts in the pipeline
15+
- [[#825](https://github.com/nf-core/rnaseq/issues/825)] - Pipeline fails due to trimming related removal of all reads from a sample
16+
- [[#827](https://github.com/nf-core/rnaseq/issues/827)] - Control generation of --output-stats when running umi-tools dedup
17+
- [[#828](https://github.com/nf-core/rnaseq/issues/828)] - Filter BAM output of UMI-tools dedup before passing to Salmon quant
18+
- Updated pipeline template to [nf-core/tools 2.4.1](https://github.com/nf-core/tools/releases/tag/2.4.1)
19+
20+
### Parameters
21+
22+
| Old parameter | New parameter |
23+
| ------------- | ------------------------ |
24+
| | `--min_trimmed_reads` |
25+
| | `--umitools_dedup_stats` |
26+
627
## [[3.7](https://github.com/nf-core/rnaseq/releases/tag/3.7)] - 2022-05-03
728

829
### :warning: Major enhancements

LICENSE

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
MIT License
22

3-
Copyright (c) Phil Ewels, Rickard Hammarén
3+
Copyright (c) Harshil Patel, Phil Ewels, Rickard Hammarén
44

55
Permission is hereby granted, free of charge, to any person obtaining a copy
66
of this software and associated documentation files (the "Software"), to deal

README.md

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -2,17 +2,18 @@
22

33
[![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)
44
[![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?labelColor=000000&logo=Amazon%20AWS)](https://nf-co.re/rnaseq/results)
6-
[![Cite with Zenodo](http://img.shields.io/badge/DOI-10.5281/zenodo.1400710-1073c8?labelColor=000000)](https://doi.org/10.5281/zenodo.1400710)
7-
8-
[![Nextflow](https://img.shields.io/badge/nextflow%20DSL2-%E2%89%A521.10.3-23aa62.svg?labelColor=000000)](https://www.nextflow.io/)
9-
[![run with conda](http://img.shields.io/badge/run%20with-conda-3EB049?labelColor=000000&logo=anaconda)](https://docs.conda.io/en/latest/)
10-
[![run with docker](https://img.shields.io/badge/run%20with-docker-0db7ed?labelColor=000000&logo=docker)](https://www.docker.com/)
11-
[![run with singularity](https://img.shields.io/badge/run%20with-singularity-1d355c.svg?labelColor=000000)](https://sylabs.io/docs/)
12-
13-
[![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)
14-
[![Follow on Twitter](http://img.shields.io/badge/twitter-%40nf__core-1DA1F2?labelColor=000000&logo=twitter)](https://twitter.com/nf_core)
15-
[![Watch on YouTube](http://img.shields.io/badge/youtube-nf--core-FF0000?labelColor=000000&logo=youtube)](https://www.youtube.com/c/nf-core)
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)
7+
8+
[![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/)
12+
[![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)
13+
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)
1617

1718
## Introduction
1819

assets/email_template.html

Lines changed: 36 additions & 86 deletions
Original file line numberDiff line numberDiff line change
@@ -1,33 +1,24 @@
11
<html>
2-
<head>
3-
<meta charset="utf-8" />
4-
<meta http-equiv="X-UA-Compatible" content="IE=edge" />
5-
<meta name="viewport" content="width=device-width, initial-scale=1" />
2+
<head>
3+
<meta charset="utf-8">
4+
<meta http-equiv="X-UA-Compatible" content="IE=edge">
5+
<meta name="viewport" content="width=device-width, initial-scale=1">
66

7-
<!-- prettier-ignore -->
8-
<meta name="description" content="nf-core/rnaseq: Nextflow RNA-Seq analysis pipeline, part of the nf-core community." />
9-
<title>nf-core/rnaseq Pipeline Report</title>
10-
</head>
11-
<body>
12-
<div style="font-family: Helvetica, Arial, sans-serif; padding: 30px; max-width: 800px; margin: 0 auto">
13-
<img src="cid:nfcorepipelinelogo" />
7+
<meta name="description" content="nf-core/rnaseq: Nextflow RNA-Seq analysis pipeline, part of the nf-core community.">
8+
<title>nf-core/rnaseq Pipeline Report</title>
9+
</head>
10+
<body>
11+
<div style="font-family: Helvetica, Arial, sans-serif; padding: 30px; max-width: 800px; margin: 0 auto;">
1412

15-
<h1>nf-core/rnaseq v${version}</h1>
16-
<h2>Run Name: $runName</h2>
13+
<img src="cid:nfcorepipelinelogo">
1714

18-
<% if (!success){ out << """
19-
<div
20-
style="
21-
color: #a94442;
22-
background-color: #f2dede;
23-
border-color: #ebccd1;
24-
padding: 15px;
25-
margin-bottom: 20px;
26-
border: 1px solid transparent;
27-
border-radius: 4px;
28-
"
29-
>
30-
<h4 style="margin-top: 0; color: inherit">nf-core/rnaseq execution completed unsuccessfully!</h4>
15+
<h1>nf-core/rnaseq v${version}</h1>
16+
<h2>Run Name: $runName</h2>
17+
18+
<% if (!success){
19+
out << """
20+
<div style="color: #a94442; background-color: #f2dede; border-color: #ebccd1; padding: 15px; margin-bottom: 20px; border: 1px solid transparent; border-radius: 4px;">
21+
<h4 style="margin-top:0; color: inherit;">nf-core/rnaseq execution completed unsuccessfully!</h4>
3122
<p>The exit status of the task that caused the workflow execution to fail was: <code>$exitStatus</code>.</p>
3223
<p>The full error message was:</p>
3324
<pre style="white-space: pre-wrap; overflow: visible; margin-bottom: 0">${errorReport}</pre>
@@ -69,67 +60,26 @@ <h4 style="margin-top: 0; color: inherit">nf-core/rnaseq execution completed wit
6960
"
7061
>
7162
nf-core/rnaseq execution completed successfully!
72-
</div>
73-
""" } %>
63+
</div>
64+
"""
65+
}
66+
%>
7467

75-
<p>The workflow was completed at <strong>$dateComplete</strong> (duration: <strong>$duration</strong>)</p>
76-
<p>The command used to launch the workflow was as follows:</p>
77-
<pre
78-
style="
79-
white-space: pre-wrap;
80-
overflow: visible;
81-
background-color: #ededed;
82-
padding: 15px;
83-
border-radius: 4px;
84-
margin-bottom: 30px;
85-
"
86-
>
87-
$commandLine</pre
88-
>
68+
<p>The workflow was completed at <strong>$dateComplete</strong> (duration: <strong>$duration</strong>)</p>
69+
<p>The command used to launch the workflow was as follows:</p>
70+
<pre style="white-space: pre-wrap; overflow: visible; background-color: #ededed; padding: 15px; border-radius: 4px; margin-bottom:30px;">$commandLine</pre>
8971

90-
<h3>Pipeline Configuration:</h3>
91-
<table
92-
style="
93-
width: 100%;
94-
max-width: 100%;
95-
border-spacing: 0;
96-
border-collapse: collapse;
97-
border: 0;
98-
margin-bottom: 30px;
99-
"
100-
>
101-
<tbody style="border-bottom: 1px solid #ddd">
102-
<% out << summary.collect{ k,v -> "
103-
<tr>
104-
<th
105-
style="
106-
text-align: left;
107-
padding: 8px 0;
108-
line-height: 1.42857143;
109-
vertical-align: top;
110-
border-top: 1px solid #ddd;
111-
"
112-
>
113-
$k
114-
</th>
115-
<td
116-
style="
117-
text-align: left;
118-
padding: 8px;
119-
line-height: 1.42857143;
120-
vertical-align: top;
121-
border-top: 1px solid #ddd;
122-
"
123-
>
124-
<pre style="white-space: pre-wrap; overflow: visible">$v</pre>
125-
</td>
126-
</tr>
127-
" }.join("\n") %>
128-
</tbody>
129-
</table>
72+
<h3>Pipeline Configuration:</h3>
73+
<table style="width:100%; max-width:100%; border-spacing: 0; border-collapse: collapse; border:0; margin-bottom: 30px;">
74+
<tbody style="border-bottom: 1px solid #ddd;">
75+
<% out << summary.collect{ k,v -> "<tr><th style='text-align:left; padding: 8px 0; line-height: 1.42857143; vertical-align: top; border-top: 1px solid #ddd;'>$k</th><td style='text-align:left; padding: 8px; line-height: 1.42857143; vertical-align: top; border-top: 1px solid #ddd;'><pre style='white-space: pre-wrap; overflow: visible;'>$v</pre></td></tr>" }.join("\n") %>
76+
</tbody>
77+
</table>
13078

131-
<p>nf-core/rnaseq</p>
132-
<p><a href="https://github.com/nf-core/rnaseq">https://github.com/nf-core/rnaseq</a></p>
133-
</div>
134-
</body>
79+
<p>nf-core/rnaseq</p>
80+
<p><a href="https://github.com/nf-core/rnaseq">https://github.com/nf-core/rnaseq</a></p>
81+
82+
</div>
83+
84+
</body>
13585
</html>

0 commit comments

Comments
 (0)