Skip to content

Commit 9b10d86

Browse files
authored
Merge pull request #51 from LouisLeNezet/update
Update modules and fix linting
2 parents ae730cf + ecd8dd2 commit 9b10d86

File tree

19 files changed

+699
-240
lines changed

19 files changed

+699
-240
lines changed

.nf-core.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,4 @@
11
repository_type: pipeline
2+
lint:
3+
subworkflow_changes: false
24
nf_core_version: "2.14.1"

CHANGELOG.md

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,10 @@ Initial release of nf-core/phaseimpute, created with the [nf-core](https://nf-co
99

1010
### `Added`
1111

12+
- [#20](https://github.com/nf-core/phaseimpute/pull/20) - Added automatic detection of vcf contigs for the reference panel and automatic renaming available
13+
- [#22](https://github.com/nf-core/phaseimpute/pull/20) - Add validation step for concordance analysis. Input channels changed to match inputs steps. Outdir folder organised by steps. Modules config by subworkflows.
14+
- [#26](https://github.com/nf-core/phaseimpute/pull/26) - Added QUILT method
15+
1216
### `Changed`
1317

1418
- [#18](https://github.com/nf-core/phaseimpute/pull/18)
@@ -17,9 +21,7 @@ Initial release of nf-core/phaseimpute, created with the [nf-core](https://nf-co
1721
- correct meta map propagation
1822
- Test impute and test sim works
1923
- [#19](https://github.com/nf-core/phaseimpute/pull/19) - Changed reference panel to accept a csv, update modules and subworkflows (glimpse1/2 and shapeit5)
20-
- [#20](https://github.com/nf-core/phaseimpute/pull/20) - Added automatic detection of vcf contigs for the reference panel and automatic renaming available
21-
- [#22](https://github.com/nf-core/phaseimpute/pull/20) - Add validation step for concordance analysis. Input channels changed to match inputs steps. Outdir folder organised by steps. Modules config by subworkflows.
22-
- [#26](https://github.com/nf-core/phaseimpute/pull/26) - Added QUILT method
24+
- [#51](https://github.com/nf-core/phaseimpute/pull/51) - Update all process and fix linting errors. Remove fastqc added by the template.
2325

2426
### `Fixed`
2527

modules.json

Lines changed: 11 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,13 @@
77
"nf-core": {
88
"bcftools/annotate": {
99
"branch": "master",
10-
"git_sha": "44096c08ffdbc694f5f92ae174ea0f7ba0f37e09",
10+
"git_sha": "2ad29c2aed06d815d9f68ad7ba20b3b1c574ce9c",
1111
"installed_by": ["modules"],
1212
"patch": "modules/nf-core/bcftools/annotate/bcftools-annotate.diff"
1313
},
1414
"bcftools/concat": {
1515
"branch": "master",
16-
"git_sha": "44096c08ffdbc694f5f92ae174ea0f7ba0f37e09",
16+
"git_sha": "b42fec6f7c6e5d0716685cabb825ef6bf6e386b5",
1717
"installed_by": ["modules"],
1818
"patch": "modules/nf-core/bcftools/concat/bcftools-concat.diff"
1919
},
@@ -25,16 +25,11 @@
2525
"bcftools/index": {
2626
"branch": "master",
2727
"git_sha": "44096c08ffdbc694f5f92ae174ea0f7ba0f37e09",
28-
"installed_by": [
29-
"modules",
30-
"multiple_impute_glimpse2",
31-
"vcf_impute_glimpse",
32-
"vcf_phase_shapeit5"
33-
]
28+
"installed_by": ["multiple_impute_glimpse2", "vcf_impute_glimpse", "vcf_phase_shapeit5"]
3429
},
3530
"bcftools/mpileup": {
3631
"branch": "master",
37-
"git_sha": "44096c08ffdbc694f5f92ae174ea0f7ba0f37e09",
32+
"git_sha": "e7df38a545d7d72083eededabd8849f731a01502",
3833
"installed_by": ["modules"],
3934
"patch": "modules/nf-core/bcftools/mpileup/bcftools-mpileup.diff"
4035
},
@@ -64,14 +59,9 @@
6459
"git_sha": "de45447d060b8c8b98575bc637a4a575fd0638e1",
6560
"installed_by": ["modules"]
6661
},
67-
"fastqc": {
68-
"branch": "master",
69-
"git_sha": "285a50500f9e02578d90b3ce6382ea3c30216acd",
70-
"installed_by": ["modules"]
71-
},
7262
"gawk": {
7363
"branch": "master",
74-
"git_sha": "da4d05d04e65227d4307e87940842f1a14de62c7",
64+
"git_sha": "b42fec6f7c6e5d0716685cabb825ef6bf6e386b5",
7565
"installed_by": ["modules"]
7666
},
7767
"glimpse/chunk": {
@@ -101,7 +91,7 @@
10191
},
10292
"glimpse2/ligate": {
10393
"branch": "master",
104-
"git_sha": "ee7fee68281944b002bd27a8ff3f19200b4d3fad",
94+
"git_sha": "09d793219114004f268b98663b12f8062097a8c5",
10595
"installed_by": ["multiple_impute_glimpse2"]
10696
},
10797
"glimpse2/phase": {
@@ -205,6 +195,11 @@
205195
"branch": "master",
206196
"git_sha": "7e56daae390ff896b292ddc70823447683a79936",
207197
"installed_by": ["subworkflows"]
198+
},
199+
"vcf_phase_shapeit5": {
200+
"branch": "master",
201+
"git_sha": "dcf17cc0ed8fd5ea57e61a13e0147cddb5c1ee30",
202+
"installed_by": ["subworkflows"]
208203
}
209204
}
210205
}

modules/nf-core/bcftools/annotate/main.nf

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

modules/nf-core/bcftools/annotate/tests/bcf.config

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

modules/nf-core/bcftools/annotate/tests/main.nf.test

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

modules/nf-core/bcftools/annotate/tests/main.nf.test.snap

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

modules/nf-core/bcftools/annotate/tests/tags.yml

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

modules/nf-core/bcftools/annotate/tests/vcf.config

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

modules/nf-core/bcftools/concat/main.nf

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

modules/nf-core/bcftools/concat/tests/main.nf.test

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

0 commit comments

Comments
 (0)