Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
- [#276](https://github.com/nf-core/phaseimpute/pull/276) - Migrate all `params.value` usage to entry workflow. Use groovy map to store parameters for each step. Use nextflow 25.10 for `getGenomeAttribute()`.
- [#286](https://github.com/nf-core/phaseimpute/pull/286) - Remove unecessary `saveAs` from config thanks to topic migration.
- [#291](https://github.com/nf-core/phaseimpute/pull/291) - Update TEMPLATE to nf-core tools version 4.0.2.
- [#292](https://github.com/nf-core/phaseimpute/pull/292) - Reorganise and rename pipeline level tests.

### `Fixed`

Expand Down
4 changes: 2 additions & 2 deletions workflows/phaseimpute/main.nf
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,7 @@ workflow PHASEIMPUTE {
.count()

ch_map_branched = ch_map
.branch { meta, map_file ->
.branch { _meta, map_file ->
non_empty: map_file
empty: true
}
Expand Down Expand Up @@ -308,7 +308,7 @@ workflow PHASEIMPUTE {
//
if (steps.contains("impute") || steps.contains("all")) {

if (params.tools.split(',').any{ it in ["stitch", "quilt"] }) {
if (tools.any{ tool -> tool in ["stitch", "quilt"] }) {
// Transform posfile to tabulated format shared by QUILT and STITCH
GAWK_POSFILE_IMPUTE(
ch_posfile.map{
Expand Down
6 changes: 3 additions & 3 deletions workflows/phaseimpute/tests/test_all.nf.test
Original file line number Diff line number Diff line change
Expand Up @@ -8,14 +8,15 @@ nextflow_pipeline {

config "./nextflow.config"

test("Check test_all - with map") {
test("Check test_all - no map - no chunks") {
config "../../../conf/test_all.config"
when {
params {
publish_dir_mode = "copy"
pipelines_testdata_base_path = 'https://raw.githubusercontent.com/nf-core/test-datasets/refs/heads/phaseimpute/'
outdir = "$outputDir"
publish_all = true
map = null
}
}

Expand All @@ -35,15 +36,14 @@ nextflow_pipeline {
}
}

test("Check test_all - no map") {
test("Check test_all - with map - no chunks") {
config "../../../conf/test_all.config"
when {
params {
publish_dir_mode = "copy"
pipelines_testdata_base_path = 'https://raw.githubusercontent.com/nf-core/test-datasets/refs/heads/phaseimpute/'
outdir = "$outputDir"
publish_all = true
map = null
}
}

Expand Down
985 changes: 2 additions & 983 deletions workflows/phaseimpute/tests/test_all.nf.test.snap

Large diffs are not rendered by default.

8 changes: 4 additions & 4 deletions workflows/phaseimpute/tests/test_beagle5.nf.test
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,15 @@ nextflow_pipeline {

config "./nextflow.config"

test("Check test_beagle5 - with chunks - with map") {
test("Check test_beagle5 - no map - no chunks") {
config "../../../conf/test_beagle5.config"
when {
params {
publish_dir_mode = "copy"
pipelines_testdata_base_path = 'https://raw.githubusercontent.com/nf-core/test-datasets/refs/heads/phaseimpute/'
outdir = "$outputDir"
chunks = null
map = null
publish_all = true
}
}
Expand All @@ -30,15 +32,13 @@ nextflow_pipeline {
}
}

test("Check test_beagle5 - no chunks - no map") {
test("Check test_beagle5 - with map - with chunks") {
config "../../../conf/test_beagle5.config"
when {
params {
publish_dir_mode = "copy"
pipelines_testdata_base_path = 'https://raw.githubusercontent.com/nf-core/test-datasets/refs/heads/phaseimpute/'
outdir = "$outputDir"
chunks = null
map = null
publish_all = true
}
}
Expand Down
565 changes: 2 additions & 563 deletions workflows/phaseimpute/tests/test_beagle5.nf.test.snap

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion workflows/phaseimpute/tests/test_dog.nf.test
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ nextflow_pipeline {

config "./nextflow.config"

test("Check test_dog - no map") {
test("Check test_dog - no map - no chunks") {
config "../../../conf/test_dog.config"
when {
params {
Expand Down
2 changes: 1 addition & 1 deletion workflows/phaseimpute/tests/test_dog.nf.test.snap
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"Check test_dog - no map": {
"Check test_dog - no map - no chunks": {
"content": [
{
"workflow size": 91,
Expand Down
8 changes: 4 additions & 4 deletions workflows/phaseimpute/tests/test_glimpse1.nf.test
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,15 @@ nextflow_pipeline {

config "./nextflow.config"

test("Check test_glimpse1 - with chunks - with map") {
test("Check test_glimpse1 - no map - no chunks") {
config "../../../conf/test.config"
when {
params {
publish_dir_mode = "copy"
pipelines_testdata_base_path = 'https://raw.githubusercontent.com/nf-core/test-datasets/refs/heads/phaseimpute/'
outdir = "$outputDir"
chunks = null
map = null
publish_all = true
}
}
Expand All @@ -30,15 +32,13 @@ nextflow_pipeline {
}
}

test("Check test_glimpse1 - no chunks - no map") {
test("Check test_glimpse1 - with map - with chunks") {
config "../../../conf/test.config"
when {
params {
publish_dir_mode = "copy"
pipelines_testdata_base_path = 'https://raw.githubusercontent.com/nf-core/test-datasets/refs/heads/phaseimpute/'
outdir = "$outputDir"
chunks = null
map = null
publish_all = true
}
}
Expand Down
Loading
Loading