Skip to content

Commit

Permalink
Merge pull request #166 from PGScatalog/dev
Browse files Browse the repository at this point in the history
2.0.0-alpha.2
  • Loading branch information
nebfield committed Sep 12, 2023
2 parents 8a099b2 + b55e937 commit ba8e03c
Show file tree
Hide file tree
Showing 7 changed files with 12 additions and 12 deletions.
4 changes: 2 additions & 2 deletions conf/modules.config
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,8 @@ process {
ext.conda = "$projectDir/environments/pgscatalog_utils/environment.yml"
ext.docker = 'ghcr.io/pgscatalog/pgscatalog_utils'
ext.singularity = 'oras://ghcr.io/pgscatalog/pgscatalog_utils'
ext.docker_version = ':v0.4.0'
ext.singularity_version = ':v0.4.0-singularity'
ext.docker_version = ':v0.4.1'
ext.singularity_version = ':v0.4.1-singularity'
}

withLabel: plink2 {
Expand Down
2 changes: 1 addition & 1 deletion environments/pgscatalog_utils/environment.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@ dependencies:
- python=3.10
- pip
- pip:
- pgscatalog_utils==0.4.0
- pgscatalog_utils==0.4.1
2 changes: 1 addition & 1 deletion nextflow.config
Original file line number Diff line number Diff line change
Expand Up @@ -209,7 +209,7 @@ manifest {
description = 'The Polygenic Score Catalog Calculator is a nextflow pipeline for polygenic score calculation'
mainScript = 'main.nf'
nextflowVersion = '>=22.10.0'
version = '2.0.0-alpha.1'
version = '2.0.0-alpha.2'
}

// Load modules.config for DSL2 module specific options
Expand Down
2 changes: 1 addition & 1 deletion tests/modules/combine/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,6 @@
- "effect_type"
- path: output/combine/versions.yml
contains:
- "pgscatalog_utils: 0.4.0"
- "pgscatalog_utils: 0.4.1"


6 changes: 3 additions & 3 deletions tests/modules/download/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
- path: output/download/PGS000001_hmPOS_GRCh37.txt.gz
- path: output/download/versions.yml
contains:
- "pgscatalog_utils: 0.4.0"
- "pgscatalog_utils: 0.4.1"

- name: pgscatalog test --efo_trait --pgp_id and --pgs_id
command: nextflow run ./tests/modules/download -entry testmultipleaccessions -c ./tests/config/nextflow.config
Expand All @@ -24,7 +24,7 @@
- path: output/download/PGS002054_hmPOS_GRCh37.txt.gz
- path: output/download/versions.yml
contains:
- "pgscatalog_utils: 0.4.0"
- "pgscatalog_utils: 0.4.1"

- name: pgscatalog test bad accession
command: nextflow run ./tests/modules/download -entry testbadaccession -c ./tests/config/nextflow.config
Expand All @@ -44,4 +44,4 @@
- path: output/download/PGS000001_hmPOS_GRCh38.txt.gz
- path: output/download/versions.yml
contains:
- "pgscatalog_utils: 0.4.0"
- "pgscatalog_utils: 0.4.1"
4 changes: 2 additions & 2 deletions tests/modules/match/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
files:
- path: output/test/match/versions.yml
contains:
- "pgscatalog_utils: 0.4.0"
- "pgscatalog_utils: 0.4.1"

- name: test match combine module
command: nextflow run ./tests/modules/match -entry testmatchcombine -c ./tests/config/nextflow.config
Expand All @@ -20,7 +20,7 @@
files:
- path: output/combine/versions.yml
contains:
- "pgscatalog_utils: 0.4.0"
- "pgscatalog_utils: 0.4.1"
- path: output/combine/scorefiles.txt.gz
contains:
- "effect_allele"
Expand Down
4 changes: 2 additions & 2 deletions tests/subworkflows/test_liftover_run.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
- path: output/combine/scorefiles.txt.gz
- path: output/combine/versions.yml
contains:
- "pgscatalog_utils: 0.4.0"
- "pgscatalog_utils: 0.4.1"

- name: test input check subworkflow with liftover 37to38
command: nextflow run main.nf --only_input --pgs_id PGS001229 --liftover --target_build GRCh38 -c ./tests/config/nextflow.config --hg19_chain https://hgdownload.cse.ucsc.edu/goldenpath/hg19/liftOver/hg19ToHg38.over.chain.gz --hg38_chain https://hgdownload.soe.ucsc.edu/goldenPath/hg38/liftOver/hg38ToHg19.over.chain.gz
Expand All @@ -22,4 +22,4 @@
- path: output/combine/scorefiles.txt.gz
- path: output/combine/versions.yml
contains:
- "pgscatalog_utils: 0.4.0"
- "pgscatalog_utils: 0.4.1"

0 comments on commit ba8e03c

Please sign in to comment.