Skip to content

Commit e03cd46

Browse files
authored
Merge pull request #283 from nf-core/dev
Release v2.5.0
2 parents ca7c05a + d6329ee commit e03cd46

File tree

96 files changed

+1730
-385
lines changed

Some content is hidden

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

96 files changed

+1730
-385
lines changed

.github/CONTRIBUTING.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,9 @@ If you're not used to this workflow with git, you can start with some [docs from
2727

2828
## Tests
2929

30+
You can optionally test your changes by running the pipeline locally. Then it is recommended to use the `debug` profile to
31+
receive warnings about process selectors and other debug info. Example: `nextflow run . -profile debug,test,docker --outdir <OUTDIR>`.
32+
3033
When you create a pull request with changes, [GitHub Actions](https://github.com/features/actions) will run automatic tests.
3134
Typically, pull-requests are only fully reviewed when these tests are passing, though of course we can help out before then.
3235

.github/PULL_REQUEST_TEMPLATE.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ Learn more about contributing: [CONTRIBUTING.md](https://github.com/nf-core/scrn
1919
- [ ] If necessary, also make a PR on the nf-core/scrnaseq _branch_ on the [nf-core/test-datasets](https://github.com/nf-core/test-datasets) repository.
2020
- [ ] Make sure your code lints (`nf-core lint`).
2121
- [ ] Ensure the test suite passes (`nextflow run . -profile test,docker --outdir <OUTDIR>`).
22+
- [ ] Check for unexpected warnings in debug mode (`nextflow run . -profile debug,test,docker --outdir <OUTDIR>`).
2223
- [ ] Usage Documentation in `docs/usage.md` is updated.
2324
- [ ] Output Documentation in `docs/output.md` is updated.
2425
- [ ] `CHANGELOG.md` is updated.

.github/workflows/ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ jobs:
4242
sudo rm -rf "/usr/local/share/boost"
4343
sudo rm -rf "$AGENT_TOOLSDIRECTORY"
4444
- name: Check out pipeline code
45-
uses: actions/checkout@v3
45+
uses: actions/checkout@v4
4646

4747
- name: Install Nextflow
4848
uses: nf-core/setup-nextflow@v1

.github/workflows/fix-linting.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ jobs:
1313
runs-on: ubuntu-latest
1414
steps:
1515
# Use the @nf-core-bot token to check out so we can push later
16-
- uses: actions/checkout@v3
16+
- uses: actions/checkout@v4
1717
with:
1818
token: ${{ secrets.nf_core_bot_auth_token }}
1919

@@ -24,7 +24,7 @@ jobs:
2424
env:
2525
GITHUB_TOKEN: ${{ secrets.nf_core_bot_auth_token }}
2626

27-
- uses: actions/setup-node@v3
27+
- uses: actions/setup-node@v4
2828

2929
- name: Install Prettier
3030
run: npm install -g prettier @prettier/plugin-php

.github/workflows/linting.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,9 @@ jobs:
1414
EditorConfig:
1515
runs-on: ubuntu-latest
1616
steps:
17-
- uses: actions/checkout@v3
17+
- uses: actions/checkout@v4
1818

19-
- uses: actions/setup-node@v3
19+
- uses: actions/setup-node@v4
2020

2121
- name: Install editorconfig-checker
2222
run: npm install -g editorconfig-checker
@@ -27,9 +27,9 @@ jobs:
2727
Prettier:
2828
runs-on: ubuntu-latest
2929
steps:
30-
- uses: actions/checkout@v3
30+
- uses: actions/checkout@v4
3131

32-
- uses: actions/setup-node@v3
32+
- uses: actions/setup-node@v4
3333

3434
- name: Install Prettier
3535
run: npm install -g prettier
@@ -40,7 +40,7 @@ jobs:
4040
PythonBlack:
4141
runs-on: ubuntu-latest
4242
steps:
43-
- uses: actions/checkout@v3
43+
- uses: actions/checkout@v4
4444

4545
- name: Check code lints with Black
4646
uses: psf/black@stable
@@ -71,7 +71,7 @@ jobs:
7171
runs-on: ubuntu-latest
7272
steps:
7373
- name: Check out pipeline code
74-
uses: actions/checkout@v3
74+
uses: actions/checkout@v4
7575

7676
- name: Install Nextflow
7777
uses: nf-core/setup-nextflow@v1
File renamed without changes.

.gitpod.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,9 @@ tasks:
44
command: |
55
pre-commit install --install-hooks
66
nextflow self-update
7-
7+
- name: unset JAVA_TOOL_OPTIONS
8+
command: |
9+
unset JAVA_TOOL_OPTIONS
810
vscode:
911
extensions: # based on nf-core.nf-core-extensionpack
1012
- codezombiech.gitignore # Language support for .gitignore files

CHANGELOG.md

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,16 @@
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+
## v2.5.0 - 2024-01-02
7+
8+
- Update template to v2.11.1 ([#279](https://github.com/nf-core/scrnaseq/pull/279))
9+
- Add support for paired GEX+ATAC sequencing using cellranger-arc ([#274](https://github.com/nf-core/scrnaseq/pull/274))
10+
- Increase default runtime limits for some processes ([#281](https://github.com/nf-core/scrnaseq/pull/281), [#284](https://github.com/nf-core/scrnaseq/pull/284))
11+
- Better support for custom protocols ([#273](https://github.com/nf-core/scrnaseq/pull/273)).
12+
- The universc protocol is now specified via the `--protocol` flag
13+
- Any protocol specified is now passed to the respective aligner
14+
- Added a section to the documentation
15+
616
## v2.4.1 - 2023-09-28
717

818
- Fix whitelist logic for dropseq ([#267](https://github.com/nf-core/scrnaseq/pull/267))

README.md

Lines changed: 7 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -31,11 +31,8 @@ The nf-core/scrnaseq pipeline comes with documentation about the pipeline [usage
3131

3232
## Usage
3333

34-
:::note
35-
If you are new to Nextflow and nf-core, please refer to [this page](https://nf-co.re/docs/usage/installation) on how
36-
to set-up Nextflow. Make sure to [test your setup](https://nf-co.re/docs/usage/introduction#how-to-run-a-pipeline)
37-
with `-profile test` before running the workflow on actual data.
38-
:::
34+
> [!NOTE]
35+
> If you are new to Nextflow and nf-core, please refer to [this page](https://nf-co.re/docs/usage/installation) on how to set-up Nextflow. Make sure to [test your setup](https://nf-co.re/docs/usage/introduction#how-to-run-a-pipeline) with `-profile test` before running the workflow on actual data.
3936
4037
First, prepare a samplesheet with your input data that looks as follows:
4138

@@ -62,11 +59,9 @@ nextflow run nf-core/scrnaseq \
6259
--outdir <OUTDIR>
6360
```
6461

65-
:::warning
66-
Please provide pipeline parameters via the CLI or Nextflow `-params-file` option. Custom config files including those
67-
provided by the `-c` Nextflow option can be used to provide any configuration _**except for parameters**_;
68-
see [docs](https://nf-co.re/usage/configuration#custom-configuration-files).
69-
:::
62+
> [!WARNING]
63+
> Please provide pipeline parameters via the CLI or Nextflow `-params-file` option. Custom config files including those provided by the `-c` Nextflow option can be used to provide any configuration _**except for parameters**_;
64+
> see [docs](https://nf-co.re/usage/configuration#custom-configuration-files).
7065
7166
For more details and further functionality, please refer to the [usage documentation](https://nf-co.re/scrnaseq/usage) and the [parameter documentation](https://nf-co.re/scrnaseq/parameters).
7267

@@ -95,12 +90,13 @@ For more details about the output files and reports, please refer to the
9590

9691
nf-core/scrnaseq was originally written by Bailey PJ, Botvinnik O, Marques de Almeida F, Gabernet G, Peltzer A, Sturm G.
9792

98-
We thank the following people for their extensive assistance in the development of this pipeline:
93+
We thank the following people and teams for their extensive assistance in the development of this pipeline:
9994

10095
- @heylf
10196
- @KevinMenden
10297
- @FloWuenne
10398
- @rob-p
99+
- [GHGA](https://www.ghga.de/)
104100

105101
## Contributions and Support
106102

assets/multiqc_config.yml

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,7 @@
11
report_comment: >
2-
3-
This report has been generated by the <a href="https://github.com/nf-core/scrnaseq/releases/tag/2.4.1" target="_blank">nf-core/scrnaseq</a>
2+
This report has been generated by the <a href="https://github.com/nf-core/scrnaseq/releases/tag/2.5.0" target="_blank">nf-core/scrnaseq</a>
43
analysis pipeline. For information about how to interpret these results, please see the
5-
<a href="https://nf-co.re/scrnaseq/2.4.1/docs/output" target="_blank">documentation</a>.
6-
4+
<a href="https://nf-co.re/scrnaseq/2.5.0/docs/output" target="_blank">documentation</a>.
75
report_section_order:
86
"nf-core-scrnaseq-methods-description":
97
order: -1000

0 commit comments

Comments
 (0)