Skip to content

Commit

Permalink
Merge branch 'dev' into pipeline_level_tests_simple
Browse files Browse the repository at this point in the history
  • Loading branch information
adamrtalbot committed Apr 5, 2024
2 parents fe8673b + f6fa12c commit bcc1a00
Show file tree
Hide file tree
Showing 23 changed files with 440 additions and 297 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,7 @@ Thank you to everyone else that has contributed by reporting bugs, enhancements
- [PR #1261](https://github.com/nf-core/rnaseq/pull/1261) - Add more tests for PREPARE_GENOME
- [PR #1265](https://github.com/nf-core/rnaseq/pull/1265) - Small updates noticed during code review
- [PR #1266](https://github.com/nf-core/rnaseq/pull/1266) - Delete unecessary tags from nf.test files for modules and subworkflows
- [PR #1278](https://github.com/nf-core/rnaseq/pull/1278) - Delocalise pseudo quant workflow

### Parameters

Expand Down
21 changes: 13 additions & 8 deletions modules.json
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
"custom/tx2gene": {
"branch": "master",
"git_sha": "ec155021a9104441bf6a9bae3b55d1b5b0bfdb3a",
"installed_by": ["modules"]
"installed_by": ["modules", "quantify_pseudo_alignment"]
},
"dupradar": {
"branch": "master",
Expand Down Expand Up @@ -88,7 +88,7 @@
"kallisto/quant": {
"branch": "master",
"git_sha": "de5811dd9ca15af1e131806001bcaae909e42021",
"installed_by": ["modules"]
"installed_by": ["modules", "quantify_pseudo_alignment"]
},
"multiqc": {
"branch": "master",
Expand All @@ -97,7 +97,7 @@
},
"picard/markduplicates": {
"branch": "master",
"git_sha": "ec833ac4c29db6005d18baccf3306f557c46b006",
"git_sha": "1943aa60f7490c3d6740e8872e6e69122ccc8087",
"installed_by": ["bam_markduplicates_picard"]
},
"preseq/lcextrap": {
Expand Down Expand Up @@ -168,7 +168,7 @@
"salmon/quant": {
"branch": "master",
"git_sha": "03a8562231d575c313266c193a980594b941e3ea",
"installed_by": ["fastq_subsample_fq_salmon", "modules"]
"installed_by": ["fastq_subsample_fq_salmon", "modules", "quantify_pseudo_alignment"]
},
"samtools/flagstat": {
"branch": "master",
Expand Down Expand Up @@ -227,7 +227,7 @@
"summarizedexperiment/summarizedexperiment": {
"branch": "master",
"git_sha": "05a252a330273c67795aed2b18e86c53c4c9382a",
"installed_by": ["modules"]
"installed_by": ["modules", "quantify_pseudo_alignment"]
},
"trimgalore": {
"branch": "master",
Expand All @@ -236,8 +236,8 @@
},
"tximeta/tximport": {
"branch": "master",
"git_sha": "03a8562231d575c313266c193a980594b941e3ea",
"installed_by": ["modules"]
"git_sha": "c275c3baac6df8f0c7c500760a0cf014ce7b525d",
"installed_by": ["modules", "quantify_pseudo_alignment"]
},
"ucsc/bedclip": {
"branch": "master",
Expand Down Expand Up @@ -280,7 +280,7 @@
},
"bam_markduplicates_picard": {
"branch": "master",
"git_sha": "f4596fe0bdc096cf53ec4497e83defdb3a94ff62",
"git_sha": "1943aa60f7490c3d6740e8872e6e69122ccc8087",
"installed_by": ["subworkflows"]
},
"bam_rseqc": {
Expand Down Expand Up @@ -327,6 +327,11 @@
"git_sha": "003920c7f9a8ae19b69a97171922880220bedf56",
"installed_by": ["subworkflows"]
},
"quantify_pseudo_alignment": {
"branch": "master",
"git_sha": "bca4985339b3ba879f457565806deb2377873b83",
"installed_by": ["subworkflows"]
},
"utils_nextflow_pipeline": {
"branch": "master",
"git_sha": "5caf7640a9ef1d18d765d55339be751bb0969dfa",
Expand Down
2 changes: 0 additions & 2 deletions modules/nf-core/fastp/tests/tags.yml

This file was deleted.

23 changes: 13 additions & 10 deletions modules/nf-core/picard/markduplicates/main.nf

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

10 changes: 7 additions & 3 deletions modules/nf-core/picard/markduplicates/meta.yml

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

26 changes: 9 additions & 17 deletions modules/nf-core/picard/markduplicates/tests/main.nf.test

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

Loading

0 comments on commit bcc1a00

Please sign in to comment.