Skip to content

Commit 7dd5ea8

Browse files
authored
Merge pull request #1565 from nf-core/pin_gtf2bed_perl
Improve reproducibility with Conda
2 parents de5c3db + ed0602f commit 7dd5ea8

25 files changed

+144
-147
lines changed

.github/workflows/nf-test.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ jobs:
5959
env:
6060
NFT_VER: ${{ env.NFT_VER }}
6161
with:
62-
max_shards: 7
62+
max_shards: 14
6363

6464
- name: debug
6565
run: |

CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@ Special thanks to the following for their contributions to the release:
3838
- [PR #1558](https://github.com/nf-core/rnaseq/pull/1558) - Remove patches and bump modules for ARM compat
3939
- [PR #1560](https://github.com/nf-core/rnaseq/pull/1560) - General modules update, include updating subworkflows for stats fixes
4040
- [PR #1563](https://github.com/nf-core/rnaseq/pull/1563) - Version bumps ahead of 3.19.0 release
41+
- [PR #1565](https://github.com/nf-core/rnaseq/pull/1565) - Improve reproducibility with Conda
4142

4243
# 3.18.0 - 2024-12-19
4344

modules.json

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -275,17 +275,20 @@
275275
"umitools/dedup": {
276276
"branch": "master",
277277
"git_sha": "05954dab2ff481bcb999f24455da29a5828af08d",
278-
"installed_by": ["bam_dedup_stats_samtools_umitools"]
278+
"installed_by": ["bam_dedup_stats_samtools_umitools", "modules"],
279+
"patch": "modules/nf-core/umitools/dedup/umitools-dedup.diff"
279280
},
280281
"umitools/extract": {
281282
"branch": "master",
282283
"git_sha": "05954dab2ff481bcb999f24455da29a5828af08d",
283-
"installed_by": ["fastq_fastqc_umitools_fastp", "fastq_fastqc_umitools_trimgalore"]
284+
"installed_by": ["fastq_fastqc_umitools_fastp", "fastq_fastqc_umitools_trimgalore", "modules"],
285+
"patch": "modules/nf-core/umitools/extract/umitools-extract.diff"
284286
},
285287
"umitools/prepareforrsem": {
286288
"branch": "master",
287289
"git_sha": "05954dab2ff481bcb999f24455da29a5828af08d",
288-
"installed_by": ["bam_dedup_umi", "modules"]
290+
"installed_by": ["bam_dedup_umi", "modules"],
291+
"patch": "modules/nf-core/umitools/prepareforrsem/umitools-prepareforrsem.diff"
289292
},
290293
"untar": {
291294
"branch": "master",

modules/local/deseq2_qc/environment.yml

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,12 @@ channels:
22
- conda-forge
33
- bioconda
44
dependencies:
5-
- conda-forge::r-base
6-
- conda-forge::r-optparse
7-
- conda-forge::r-ggplot2
8-
- conda-forge::r-rcolorbrewer
9-
- conda-forge::r-pheatmap
10-
- bioconda::bioconductor-deseq2
11-
- bioconda::bioconductor-biocparallel
12-
- bioconda::bioconductor-tximport
13-
- bioconda::bioconductor-complexheatmap
5+
- conda-forge::r-base=4.0.3
6+
- conda-forge::r-optparse=1.6.6
7+
- conda-forge::r-ggplot2=3.3.2
8+
- conda-forge::r-rcolorbrewer=1.1.2
9+
- conda-forge::r-pheatmap=1.0.12
10+
- bioconda::bioconductor-deseq2=1.28.0
11+
- bioconda::bioconductor-biocparallel=1.22.0
12+
- bioconda::bioconductor-tximport=1.16.0
13+
- bioconda::bioconductor-complexheatmap=2.4.2

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

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,11 +22,8 @@ nextflow_process {
2222
{ assert snapshot(
2323
process.out.dists_multiqc,
2424
process.out.dists_txt,
25-
process.out.log,
2625
process.out.pca_multiqc,
2726
process.out.pca_txt,
28-
process.out.rdata,
29-
process.out.size_factors,
3027
process.out.versions
3128
).match() }
3229
)

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

Lines changed: 10 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -12,13 +12,13 @@
1212
"deseq2.pca.vals.txt:md5,d41d8cd98f00b204e9800998ecf8427e"
1313
],
1414
"3": [
15-
15+
1616
],
1717
"4": [
1818
"deseq2.sample.dists.txt:md5,d41d8cd98f00b204e9800998ecf8427e"
1919
],
2020
"5": [
21-
21+
2222
],
2323
"6": [
2424
"R_sessionInfo.log:md5,d41d8cd98f00b204e9800998ecf8427e"
@@ -37,7 +37,7 @@
3737
"versions.yml:md5,60f8e4f473397a4b5d1a3dc490c93ec5"
3838
],
3939
"dists_multiqc": [
40-
40+
4141
],
4242
"dists_txt": [
4343
"deseq2.sample.dists.txt:md5,d41d8cd98f00b204e9800998ecf8427e"
@@ -46,7 +46,7 @@
4646
"R_sessionInfo.log:md5,d41d8cd98f00b204e9800998ecf8427e"
4747
],
4848
"pca_multiqc": [
49-
49+
5050
],
5151
"pca_txt": [
5252
"deseq2.pca.vals.txt:md5,d41d8cd98f00b204e9800998ecf8427e"
@@ -81,41 +81,25 @@
8181
"parse count data correctly": {
8282
"content": [
8383
[
84-
84+
8585
],
8686
[
8787
"deseq2.sample.dists.txt:md5,1616ce40eb58ee75640efed219c6bbec"
8888
],
8989
[
90-
"R_sessionInfo.log:md5,fb0da0d7ad6994ed66a8e68348b19676"
91-
],
92-
[
93-
90+
9491
],
9592
[
9693
"deseq2.pca.vals.txt:md5,4cda8e32ec39326c1350e77b4b607aad"
9794
],
98-
[
99-
"deseq2.dds.RData:md5,c7c1872e7566321d0c3f7ca56c463088"
100-
],
101-
[
102-
[
103-
"RAP1_IAA_30M_REP1.txt:md5,ce4ff0b74aeedc3dc12a764c3504c9df",
104-
"RAP1_UNINDUCED_REP1.txt:md5,51c9b23be5e82670aceb14f7e58dd867",
105-
"RAP1_UNINDUCED_REP2.txt:md5,2c56106abcd9d31980f672b6e2862ee8",
106-
"WT_REP1.txt:md5,5e3fe5f7e9b7f300be43649a8b496352",
107-
"WT_REP2.txt:md5,2ce093f2c2e92c1bde1cd3da91ac884c",
108-
"deseq2.size_factors.RData:md5,51c6643a0f8a9edabbff8df0165451f2"
109-
]
110-
],
11195
[
11296
"versions.yml:md5,60f8e4f473397a4b5d1a3dc490c93ec5"
11397
]
11498
],
11599
"meta": {
116-
"nf-test": "0.8.4",
117-
"nextflow": "24.04.2"
100+
"nf-test": "0.9.2",
101+
"nextflow": "25.04.2"
118102
},
119-
"timestamp": "2024-06-21T11:21:20.349616"
103+
"timestamp": "2025-06-06T11:39:25.276180757"
120104
}
121-
}
105+
}

modules/local/gtf2bed/environment.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,4 @@ channels:
22
- conda-forge
33
- bioconda
44
dependencies:
5-
- conda-forge::perl>=5.26.2
5+
- conda-forge::perl=5.26.2

modules/nf-core/umitools/dedup/environment.yml

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

modules/nf-core/umitools/dedup/umitools-dedup.diff

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

modules/nf-core/umitools/extract/environment.yml

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

0 commit comments

Comments
 (0)