Skip to content

Commit c5dbbf7

Browse files
authored
Merge branch 'dev' into remove_tags.yml
2 parents 17e059b + e6d6efe commit c5dbbf7

File tree

8 files changed

+12
-53
lines changed

8 files changed

+12
-53
lines changed

.github/workflows/ci.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -256,7 +256,7 @@ jobs:
256256
if: always()
257257
steps:
258258
- name: All tests ok
259-
if: ${{ !contains(needs.*.result, 'failure') }}
259+
if: ${{ success() }}
260260
run: exit 0
261261
- name: One or more tests failed
262262
if: ${{ contains(needs.*.result, 'failure') }}

CHANGELOG.md

+4-3
Original file line numberDiff line numberDiff line change
@@ -12,15 +12,16 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
1212
- [PR #1186](https://github.com/nf-core/rnaseq/pull/1186) - Properly update qualimap/rnaseq module (ie not patch)
1313
- [PR #1201](https://github.com/nf-core/rnaseq/pull/1201) - Template update for nf-core/tools v2.12
1414
- [PR #1206](https://github.com/nf-core/rnaseq/pull/1206) - Remove `lib/` directory and `modules.config`
15-
- [PR #1212](https://github.com/nf-core/rnaseq/pull/1212) - Update all modules and subworkflows to latest versions
1615
- [PR #1210](https://github.com/nf-core/rnaseq/pull/1210) - Use pseudoalignment subworkflow components from nf-core/modules
17-
- [PR #1214](https://github.com/nf-core/rnaseq/pull/1214) - Bump umitools + delocalise prepareforrsem ([#831](https://github.com/nf-core/rnaseq/issues/831))
16+
- [PR #1212](https://github.com/nf-core/rnaseq/pull/1212) - Update all modules and subworkflows to latest versions
1817
- [PR #1213](https://github.com/nf-core/rnaseq/pull/1213) - Pass transcriptome fasta through to samtools stats
18+
- [PR #1214](https://github.com/nf-core/rnaseq/pull/1214) - Bump umitools + delocalise prepareforrsem ([#831](https://github.com/nf-core/rnaseq/issues/831))
1919
- [PR #1216](https://github.com/nf-core/rnaseq/pull/1216) - Delocalise catadditionalfasta ([#1162](https://github.com/nf-core/rnaseq/issues/1162))
2020
- [PR #1218](https://github.com/nf-core/rnaseq/pull/1218) - Template update for nf-core/tools v2.13
2121
- [PR #1220](https://github.com/nf-core/rnaseq/pull/1220) - Initialise nf-test and add pipeline level test
2222
- [PR #1221](https://github.com/nf-core/rnaseq/pull/1221) - Use nf-test test for all nf-core components
2323
- [PR #1226](https://github.com/nf-core/rnaseq/pull/1226) - Reuse bbsplit index and don't keep overwriting ([#1225](https://github.com/nf-core/rnaseq/issues/1225))
24+
- [PR #1228](https://github.com/nf-core/rnaseq/pull/1228) - Make README usage consistent with docs/usage.md
2425
- [PR #1229](https://github.com/nf-core/rnaseq/pull/1229) - Template update for nf-core/tools v2.13.1
2526
- [PR #1231](https://github.com/nf-core/rnaseq/pull/1231) - Add sortmerna index possibilities
2627
- [PR #1232](https://github.com/nf-core/rnaseq/pull/1232) - Add nf-test tests to star_genomegenerate_igenomes
@@ -35,7 +36,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
3536
- [PR #1241](https://github.com/nf-core/rnaseq/pull/1241) - Add nf-test tests to deseq2_qc
3637
- [PR #1242](https://github.com/nf-core/rnaseq/pull/1242) - Use dupradar from nf-core/modules
3738
- [PR #1244](https://github.com/nf-core/rnaseq/pull/1244) - Add gtf2bed tests
38-
- [PR #1250](https://github.com/nf-core/rnaseq/pull/1244) - Remove all tags.yml files because the testing system has changed
39+
- [PR #1250](https://github.com/nf-core/rnaseq/pull/1250) - Remove all tags.yml files because the testing system has changed
3940

4041
### Parameters
4142

README.md

+3-2
Original file line numberDiff line numberDiff line change
@@ -80,9 +80,10 @@ Now, you can run the pipeline using:
8080

8181
```bash
8282
nextflow run nf-core/rnaseq \
83-
--input samplesheet.csv \
83+
--input <SAMPLESHEET> \
8484
--outdir <OUTDIR> \
85-
--genome GRCh37 \
85+
--gtf <GTF> \
86+
--fasta <GENOME FASTA> \
8687
-profile <docker/singularity/.../institute>
8788
```
8889

docs/usage.md

-2
Original file line numberDiff line numberDiff line change
@@ -213,8 +213,6 @@ nextflow run \
213213
--outdir <OUTDIR> \
214214
--gtf <GTF> \
215215
--fasta <GENOME FASTA> \
216-
--igenomes_ignore \
217-
--genome null \
218216
-profile docker
219217
```
220218

modules/local/deseq2_qc/tests/data/countFile.tsv

-18
This file was deleted.

modules/local/deseq2_qc/tests/data/deseq2_clustering_header.txt

-12
This file was deleted.

modules/local/deseq2_qc/tests/data/deseq2_pca_header.txt

-11
This file was deleted.

modules/local/deseq2_qc/tests/main.nf.test

+4-4
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,10 @@ nextflow_process {
99
when {
1010
process {
1111
"""
12-
input[0] = file("${moduleTestDir}/data/countFile.tsv")
13-
input[1] = file("${moduleTestDir}/data/deseq2_pca_header.txt")
14-
input[2] = file("${moduleTestDir}/data/deseq2_clustering_header.txt")
15-
""".stripIndent().trim()
12+
input[0] = file(params.pipelines_testdata_base_path + "deseq2qc/countFile.tsv", checkIfExists: true)
13+
input[1] = file(params.pipelines_testdata_base_path + "deseq2qc/deseq2_pca_header.txt", checkIfExists: true)
14+
input[2] = file(params.pipelines_testdata_base_path + "deseq2qc/deseq2_clustering_header.txt", checkIfExists: true)
15+
"""
1616
}
1717
}
1818

0 commit comments

Comments
 (0)