Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

316 update cellranger modules to latest nf coremodules versions #317

Merged
Merged
Show file tree
Hide file tree
Changes from 4 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
- Update to kallisto|bustools v0.28.2 ([#294](https://github.com/nf-core/scrnaseq/pull/294))
- Fix cellrangerarc matrix conversions and protocol selection ([#300](https://github.com/nf-core/scrnaseq/pull/300))
- Add new emptydrops calling module ([#301](https://github.com/nf-core/scrnaseq/pull/301))
- Update cellranger modules to latest version ([[#316](https://github.com/nf-core/scrnaseq/issues/316)])

## v2.5.1

Expand Down
2 changes: 1 addition & 1 deletion conf/modules.config
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ if(params.aligner == "cellranger") {
path: "${params.outdir}/${params.aligner}/count",
mode: params.publish_dir_mode
]
ext.args = {"--chemistry ${meta.chemistry} " + (meta.expected_cells ? "--expect-cells ${meta.expected_cells}" : '')}
ext.args = {"--chemistry ${meta.chemistry} --create-bam false " + (meta.expected_cells ? "--expect-cells ${meta.expected_cells}" : '')}
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why? E.g. RNA velocity analysis relies on this, I'd expect a couple of users complain about this being default all of a sudden.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

New version of cellranger requires this parameter to be used.

Did not know it was used by other workflows. Should I default to true or make a parameter?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I see. A parameter would be nice, but I don't mind setting to true and following up on this separately.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Now defaulting to true. Anyways, users can still overwrite if needed as it is a ext.args. So, we can consider having a param later upon request.

time = { check_max( 240.h * task.attempt, 'time' ) }
}
}
Expand Down
6 changes: 3 additions & 3 deletions modules.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,17 +7,17 @@
"nf-core": {
"cellranger/count": {
"branch": "master",
"git_sha": "92ca535c5a8c0fe89eb71e649ee536bd355ce4fc",
"git_sha": "e66183d2ab6a5c2f3fd66b2bee942287cf65536c",
"installed_by": ["modules"]
},
"cellranger/mkgtf": {
"branch": "master",
"git_sha": "575e1bc54b083fb15e7dd8b5fcc40bea60e8ce83",
"git_sha": "e66183d2ab6a5c2f3fd66b2bee942287cf65536c",
"installed_by": ["modules"]
},
"cellranger/mkref": {
"branch": "master",
"git_sha": "3f5420aa22e00bd030a2556dfdffc9e164ec0ec5",
"git_sha": "e66183d2ab6a5c2f3fd66b2bee942287cf65536c",
"installed_by": ["modules"]
},
"cellrangerarc/count": {
Expand Down
12 changes: 3 additions & 9 deletions modules/nf-core/cellranger/count/main.nf

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 0 additions & 8 deletions modules/nf-core/cellranger/count/meta.yml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

17 changes: 9 additions & 8 deletions modules/nf-core/cellranger/count/tests/main.nf.test

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

74 changes: 13 additions & 61 deletions modules/nf-core/cellranger/count/tests/main.nf.test.snap

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion modules/nf-core/cellranger/count/tests/nextflow.config

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 0 additions & 5 deletions modules/nf-core/cellranger/mkgtf/environment.yml

This file was deleted.

18 changes: 17 additions & 1 deletion modules/nf-core/cellranger/mkgtf/main.nf

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion modules/nf-core/cellranger/mkgtf/meta.yml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

53 changes: 53 additions & 0 deletions modules/nf-core/cellranger/mkgtf/tests/main.nf.test

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading
Loading