Skip to content

Commit c261e9c

Browse files
drpatelhdrpatelh
authored
Merge pull request #1148 from nf-core/revert-1138-dev
Revert "Update FastQC and UMItools modules"
2 parents 878a3e6 + c781080 commit c261e9c

File tree

144 files changed

+205
-3601
lines changed

Some content is hidden

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

144 files changed

+205
-3601
lines changed

‎CHANGELOG.md‎

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -10,26 +10,11 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
1010
### Enhancements & fixes
1111

1212
- [PR #1135](https://github.com/nf-core/rnaseq/pull/1135) - Update [action-tower-launch](https://github.com/marketplace/actions/action-tower-launch) to v2 which supports more variable handling.
13-
- [PR #1138](https://github.com/nf-core/rnaseq/pull/1138) - Updates FASTQC and UMITOOLS modules and their dependencies which have had their version string extraction commands updated ([#1103](https://github.com/nf-core/rnaseq/issues/1103))
14-
- Update Rseqc and Fastp modules to print STDERR to screen and file.
1513

1614
### Software dependencies
1715

18-
| Dependency | Old version | New version |
19-
| ---------- | ----------- | ----------- |
20-
| `picard` | 3.0.0 | 3.1.1 |
21-
| `samtools` | 1.17 | 1.18 |
22-
23-
> **NB:** Dependency has been **updated** if both old and new version information is present.
24-
>
25-
> **NB:** Dependency has been **added** if just the new version information is present.
26-
>
27-
> **NB:** Dependency has been **removed** if new version information isn't present.
28-
2916
### Modules / Subworkflows
3017

31-
- BAM_RSEQC subworkflow updated with new channel names.
32-
3318
## [[3.13.2](https://github.com/nf-core/rnaseq/releases/tag/3.13.2)] - 2023-11-21
3419

3520
### Credits

‎modules.json‎

Lines changed: 32 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -27,12 +27,12 @@
2727
},
2828
"fastp": {
2929
"branch": "master",
30-
"git_sha": "3c77ca9aac783e76c3614a06db3bfe4fef619bde",
31-
"installed_by": ["modules", "fastq_fastqc_umitools_fastp"]
30+
"git_sha": "d497a4868ace3302016ea8ed4b395072d5e833cd",
31+
"installed_by": ["fastq_fastqc_umitools_fastp", "modules"]
3232
},
3333
"fastqc": {
3434
"branch": "master",
35-
"git_sha": "65ad3e0b9a4099592e1102e92e10455dc661cf53",
35+
"git_sha": "102cc9b709a6da9f7cee2373563ab1464fca9c0a",
3636
"installed_by": ["fastq_fastqc_umitools_trimgalore", "fastq_fastqc_umitools_fastp"]
3737
},
3838
"fq/subsample": {
@@ -77,7 +77,7 @@
7777
},
7878
"picard/markduplicates": {
7979
"branch": "master",
80-
"git_sha": "20b0918591d4ba20047d7e13e5094bcceba81447",
80+
"git_sha": "2ee934606f1fdf7fc1cb05d6e8abc13bec8ab448",
8181
"installed_by": ["bam_markduplicates_picard"]
8282
},
8383
"preseq/lcextrap": {
@@ -102,42 +102,42 @@
102102
},
103103
"rseqc/bamstat": {
104104
"branch": "master",
105-
"git_sha": "65acf692457e8c466e104c6a3e5ac392e98fe688",
105+
"git_sha": "911696ea0b62df80e900ef244d7867d177971f73",
106106
"installed_by": ["bam_rseqc"]
107107
},
108108
"rseqc/inferexperiment": {
109109
"branch": "master",
110-
"git_sha": "f2a3328fde9a2b4185285057f8d3727f39dd2aef",
110+
"git_sha": "911696ea0b62df80e900ef244d7867d177971f73",
111111
"installed_by": ["bam_rseqc"]
112112
},
113113
"rseqc/innerdistance": {
114114
"branch": "master",
115-
"git_sha": "3e839096a1be5da4f68d1de1066e4d0bc13f5d6d",
115+
"git_sha": "911696ea0b62df80e900ef244d7867d177971f73",
116116
"installed_by": ["bam_rseqc"]
117117
},
118118
"rseqc/junctionannotation": {
119119
"branch": "master",
120-
"git_sha": "3c77ca9aac783e76c3614a06db3bfe4fef619bde",
120+
"git_sha": "911696ea0b62df80e900ef244d7867d177971f73",
121121
"installed_by": ["bam_rseqc"]
122122
},
123123
"rseqc/junctionsaturation": {
124124
"branch": "master",
125-
"git_sha": "9dfed3180f80f599c91daf5112d73a5e59367c24",
125+
"git_sha": "911696ea0b62df80e900ef244d7867d177971f73",
126126
"installed_by": ["bam_rseqc"]
127127
},
128128
"rseqc/readdistribution": {
129129
"branch": "master",
130-
"git_sha": "7bb1b295a359bcbf0a0ea03d19d40a00916805ee",
130+
"git_sha": "911696ea0b62df80e900ef244d7867d177971f73",
131131
"installed_by": ["bam_rseqc"]
132132
},
133133
"rseqc/readduplication": {
134134
"branch": "master",
135-
"git_sha": "db02573fdd89210d09ce9e2ac06857902a7fffec",
135+
"git_sha": "911696ea0b62df80e900ef244d7867d177971f73",
136136
"installed_by": ["bam_rseqc"]
137137
},
138138
"rseqc/tin": {
139139
"branch": "master",
140-
"git_sha": "4acfdd20843d5b6d63f9181721a6856447cb7bec",
140+
"git_sha": "911696ea0b62df80e900ef244d7867d177971f73",
141141
"installed_by": ["bam_rseqc"]
142142
},
143143
"salmon/index": {
@@ -152,31 +152,31 @@
152152
},
153153
"samtools/flagstat": {
154154
"branch": "master",
155-
"git_sha": "a64788f5ad388f1d2ac5bd5f1f3f8fc81476148c",
155+
"git_sha": "570ec5bcfe19c49e16c9ca35a7a116563af6cc1c",
156156
"installed_by": ["bam_stats_samtools"]
157157
},
158158
"samtools/idxstats": {
159159
"branch": "master",
160-
"git_sha": "a64788f5ad388f1d2ac5bd5f1f3f8fc81476148c",
160+
"git_sha": "e662ab16e0c11f1e62983e21de9871f59371a639",
161161
"installed_by": ["bam_stats_samtools"]
162162
},
163163
"samtools/index": {
164164
"branch": "master",
165-
"git_sha": "a64788f5ad388f1d2ac5bd5f1f3f8fc81476148c",
165+
"git_sha": "911696ea0b62df80e900ef244d7867d177971f73",
166166
"installed_by": [
167-
"bam_dedup_stats_samtools_umitools",
168167
"bam_markduplicates_picard",
169-
"bam_sort_stats_samtools"
168+
"bam_sort_stats_samtools",
169+
"bam_dedup_stats_samtools_umitools"
170170
]
171171
},
172172
"samtools/sort": {
173173
"branch": "master",
174-
"git_sha": "a64788f5ad388f1d2ac5bd5f1f3f8fc81476148c",
174+
"git_sha": "a0f7be95788366c1923171e358da7d049eb440f9",
175175
"installed_by": ["bam_sort_stats_samtools"]
176176
},
177177
"samtools/stats": {
178178
"branch": "master",
179-
"git_sha": "a64788f5ad388f1d2ac5bd5f1f3f8fc81476148c",
179+
"git_sha": "735e1e04e7e01751d2d6e97055bbdb6f70683cc1",
180180
"installed_by": ["bam_stats_samtools"]
181181
},
182182
"sortmerna": {
@@ -206,7 +206,7 @@
206206
},
207207
"trimgalore": {
208208
"branch": "master",
209-
"git_sha": "3f5420aa22e00bd030a2556dfdffc9e164ec0ec5",
209+
"git_sha": "911696ea0b62df80e900ef244d7867d177971f73",
210210
"installed_by": ["fastq_fastqc_umitools_trimgalore"]
211211
},
212212
"ucsc/bedclip": {
@@ -221,13 +221,13 @@
221221
},
222222
"umitools/dedup": {
223223
"branch": "master",
224-
"git_sha": "65ad3e0b9a4099592e1102e92e10455dc661cf53",
224+
"git_sha": "7297204bf49273300a3dbfa4b7a4027c8683f1bd",
225225
"installed_by": ["bam_dedup_stats_samtools_umitools"]
226226
},
227227
"umitools/extract": {
228228
"branch": "master",
229-
"git_sha": "65ad3e0b9a4099592e1102e92e10455dc661cf53",
230-
"installed_by": ["fastq_fastqc_umitools_trimgalore", "fastq_fastqc_umitools_fastp"]
229+
"git_sha": "911696ea0b62df80e900ef244d7867d177971f73",
230+
"installed_by": ["fastq_fastqc_umitools_fastp", "fastq_fastqc_umitools_trimgalore"]
231231
},
232232
"untar": {
233233
"branch": "master",
@@ -240,31 +240,31 @@
240240
"nf-core": {
241241
"bam_dedup_stats_samtools_umitools": {
242242
"branch": "master",
243-
"git_sha": "a64788f5ad388f1d2ac5bd5f1f3f8fc81476148c",
243+
"git_sha": "dedc0e31087f3306101c38835d051bf49789445a",
244244
"installed_by": ["subworkflows"]
245245
},
246246
"bam_markduplicates_picard": {
247247
"branch": "master",
248-
"git_sha": "cfd937a668919d948f6fcbf4218e79de50c2f36f",
248+
"git_sha": "dedc0e31087f3306101c38835d051bf49789445a",
249249
"installed_by": ["subworkflows"]
250250
},
251251
"bam_rseqc": {
252252
"branch": "master",
253-
"git_sha": "92793c143c93acd9129f15f35f25d3aab2b23c0e",
253+
"git_sha": "a9784afdd5dcda23b84e64db75dc591065d64653",
254254
"installed_by": ["subworkflows"]
255255
},
256256
"bam_sort_stats_samtools": {
257257
"branch": "master",
258-
"git_sha": "a64788f5ad388f1d2ac5bd5f1f3f8fc81476148c",
258+
"git_sha": "dedc0e31087f3306101c38835d051bf49789445a",
259259
"installed_by": ["fastq_align_hisat2"]
260260
},
261261
"bam_stats_samtools": {
262262
"branch": "master",
263-
"git_sha": "a64788f5ad388f1d2ac5bd5f1f3f8fc81476148c",
263+
"git_sha": "dedc0e31087f3306101c38835d051bf49789445a",
264264
"installed_by": [
265-
"bam_dedup_stats_samtools_umitools",
265+
"bam_sort_stats_samtools",
266266
"bam_markduplicates_picard",
267-
"bam_sort_stats_samtools"
267+
"bam_dedup_stats_samtools_umitools"
268268
]
269269
},
270270
"bedgraph_bedclip_bedgraphtobigwig": {
@@ -279,12 +279,12 @@
279279
},
280280
"fastq_fastqc_umitools_fastp": {
281281
"branch": "master",
282-
"git_sha": "3e8b0c1144ccf60b7848efbdc2be285ff20b49ee",
282+
"git_sha": "dedc0e31087f3306101c38835d051bf49789445a",
283283
"installed_by": ["subworkflows"]
284284
},
285285
"fastq_fastqc_umitools_trimgalore": {
286286
"branch": "master",
287-
"git_sha": "cfd937a668919d948f6fcbf4218e79de50c2f36f",
287+
"git_sha": "dedc0e31087f3306101c38835d051bf49789445a",
288288
"installed_by": ["subworkflows"]
289289
},
290290
"fastq_subsample_fq_salmon": {

‎modules/nf-core/fastp/environment.yml‎

Lines changed: 0 additions & 7 deletions
This file was deleted.

‎modules/nf-core/fastp/main.nf‎

Lines changed: 4 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎modules/nf-core/fastp/meta.yml‎

Lines changed: 1 addition & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)