Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Replacing local module BUILD_INTERVALS with nf-core mdule GAWK #1439

Merged
merged 4 commits into from
Apr 3, 2024
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 @@ -29,6 +29,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
- [#1426](https://github.com/nf-core/sarek/pull/1426) - Updating certain modules in order to fix the testdata-path in the nf-tests of those modules. Setting Docker runOptions for params.use_gatk_spark.
- [#1428](https://github.com/nf-core/sarek/pull/1428) - Sync `TEMPLATE` with `tools` `2.13.1`
- [#1431](https://github.com/nf-core/sarek/pull/1431) - Using docker.containerOptions instead of docker.runOptions. Clearing containerOptions for SPARK modules for any kind of supported container engine.
- [#1439](https://github.com/nf-core/sarek/pull/1439) - Replacing the local module `BUILD_INTERVALS` with the nf-core module `GAWK`

### Fixed

Expand Down
5 changes: 5 additions & 0 deletions conf/modules/prepare_intervals.config
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,11 @@

process {

withName: 'BUILD_INTERVALS' {
ext.args = { "-v FS='\t' -v OFS='\t' '{ print \$1, \"0\", \$2 }'" }
ext.suffix = { "bed" }
}

withName: 'CREATE_INTERVALS_BED' {
publishDir = [
mode: params.publish_dir_mode,
Expand Down
5 changes: 5 additions & 0 deletions modules.json
Original file line number Diff line number Diff line change
Expand Up @@ -294,6 +294,11 @@
"git_sha": "3f5420aa22e00bd030a2556dfdffc9e164ec0ec5",
"installed_by": ["modules"]
},
"gawk": {
"branch": "master",
"git_sha": "dc3527855e7358c6d8400828754c0caa5f11698f",
"installed_by": ["modules"]
},
"manta/germline": {
"branch": "master",
"git_sha": "3f5420aa22e00bd030a2556dfdffc9e164ec0ec5",
Expand Down
29 changes: 0 additions & 29 deletions modules/local/build_intervals/main.nf

This file was deleted.

54 changes: 54 additions & 0 deletions modules/nf-core/gawk/main.nf

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

50 changes: 50 additions & 0 deletions modules/nf-core/gawk/meta.yml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions subworkflows/local/prepare_intervals/main.nf
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@
// For all modules here:
// A when clause condition is defined in the conf/modules.config to determine if the module should be run

include { BUILD_INTERVALS } from '../../../modules/local/build_intervals/main'
include { CREATE_INTERVALS_BED } from '../../../modules/local/create_intervals_bed/main'
include { GATK4_INTERVALLISTTOBED } from '../../../modules/nf-core/gatk4/intervallisttobed/main'
include { GAWK as BUILD_INTERVALS } from '../../../modules/nf-core/gawk/main'
include { TABIX_BGZIPTABIX as TABIX_BGZIPTABIX_INTERVAL_SPLIT } from '../../../modules/nf-core/tabix/bgziptabix/main'
include { TABIX_BGZIPTABIX as TABIX_BGZIPTABIX_INTERVAL_COMBINED } from '../../../modules/nf-core/tabix/bgziptabix/main'

Expand Down Expand Up @@ -39,9 +39,9 @@ workflow PREPARE_INTERVALS {
} else if (step != 'annotate' && step != 'controlfreec') {
// If no interval/target file is provided, then generated intervals from FASTA file
if (!intervals) {
BUILD_INTERVALS(fasta_fai.map{it -> [ [ id:it.baseName ], it ] })
BUILD_INTERVALS(fasta_fai.map{it -> [ [ id:it.baseName ], it ] }, [])

intervals_combined = BUILD_INTERVALS.out.bed
intervals_combined = BUILD_INTERVALS.out.output

CREATE_INTERVALS_BED(intervals_combined.map{ meta, path -> path }, nucleotides_per_second)

Expand Down
Loading