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

variant calling workflow + testing #371

Open
wants to merge 37 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
37 commits
Select commit Hold shift + click to select a range
4d1222c
Initial variant calling workflow
Jun 1, 2023
a34c9d3
initial testing infrastructure for VC
Jun 1, 2023
3fa096c
'typo'
Jun 1, 2023
3f23aa0
'typo in test setting'
Jun 1, 2023
880a8a0
removed bed from config
Jun 2, 2023
e0793b5
fixed typo in helpers checking chr nomenclature
Jun 2, 2023
5bb3726
commenting out dbnsfp rule
Jun 2, 2023
a1f69ed
disable references test for now
daler Jun 2, 2023
ac1d3dd
temporarily disable all but initial setup & variant calling tests
daler Jun 2, 2023
9a8d8ef
fix circleci yaml config syntax
daler Jun 2, 2023
4d4a261
more syntax fixes
daler Jun 2, 2023
26aaf19
ensure run_test.sh is copied over to deploy location for variant-calling
daler Jun 2, 2023
ff9db56
Merge remote-tracking branch 'origin/master' into vc-wf
daler Jun 2, 2023
25e6a61
fix comments in ci config
daler Jun 2, 2023
29c3c82
try resolving path
daler Jun 2, 2023
6a1da2b
support deploying variant-calling workflow
daler Jun 2, 2023
79ee0f5
remove windows line-endings and unused unit
daler Jun 2, 2023
8ad4d36
'resource formatting, threads test settings, snpeff adjustments'
Jun 2, 2023
b433be3
Merge branch 'vc-wf' of github.com:lcdb/lcdb-wf into vc-wf
Jun 2, 2023
c151dde
add option to provide path for variation dbs when using ref wf
Jun 2, 2023
cd4a49b
create tarball artifact in the right place
daler Jun 2, 2023
da84591
re-enable all tests (except for references)
daler Jun 2, 2023
0192e02
hide government addresses and minor fixes
Jun 2, 2023
305d96e
Merge branch 'vc-wf' of github.com:lcdb/lcdb-wf into vc-wf
Jun 2, 2023
7a9fb72
Adding docs and tweaking pcr-indel-model arg in workflow
Jun 5, 2023
34f3486
fixed syntax err
Jun 5, 2023
3574c69
fix known_variation
daler Jun 14, 2023
d02110e
re-enable references test
daler Jun 14, 2023
51b4586
reorganize test config for variant calling
daler Jun 15, 2023
0ffe62d
treat fai just like chromsizes
daler Jun 15, 2023
b9e7a6f
clean up known variation rule
daler Jun 15, 2023
0b5a9b5
add back in the original references config
daler Jun 15, 2023
fd3c58e
split variant-calling and non-variant-calling configs
daler Jun 15, 2023
43548bf
Merge branch 'master' into vc-wf
aliciaaevans Oct 31, 2023
c519f40
match string format across rules
Jan 22, 2025
7e952ec
make snpeff rules require dictionary of input file
Jan 22, 2025
f7f5a0d
Merge pull request #429 from lcdb/vc-wf-fixup
daler Jan 22, 2025
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
46 changes: 42 additions & 4 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -152,6 +152,7 @@ variables:
cp $ORIG/workflows/rnaseq/run_downstream_test.sh $DEPLOY/workflows/rnaseq/run_downstream_test.sh
cp $ORIG/workflows/references/run_test.sh $DEPLOY/workflows/references/run_test.sh
cp $ORIG/workflows/colocalization/run_test.sh $DEPLOY/workflows/colocalization/run_test.sh
cp $ORIG/workflows/variant-calling/run_test.sh $DEPLOY/workflows/variant-calling/run_test.sh

mkdir $DEPLOY/ci
mkdir $DEPLOY/test
Expand Down Expand Up @@ -239,8 +240,14 @@ variables:
command: |
source /opt/mambaforge/etc/profile.d/conda.sh
conda activate $LCDBWF_ENV
# RNA-seq/ChIP-seq references
$DEPLOY/test/lcdb-wf-test references --run-workflow --configfile=config/config.yaml -j2 -p -r -k --orig $ORIG

# Variant-calling references
$DEPLOY/test/lcdb-wf-test references --run-workflow --configfile=$ORIG/test/test_configs/variant-calling.yaml -j2 -p -r -k --orig $ORIG



# --------------------------------------------------------------------------
# Standard RNA-seq workflow
rnaseq-step: &rnaseq-step
Expand Down Expand Up @@ -303,6 +310,21 @@ variables:
conda activate $LCDBWF_ENV
$DEPLOY/test/lcdb-wf-test colocalization --run-workflow -k -r -p -j2 --use-conda --orig $ORIG


# --------------------------------------------------------------------------
# Variant-calling workflow
variantcalling-step: &variantcalling-step
run:
name: variantcalling workflow
command: |
cd $DEPLOY
source /opt/mambaforge/etc/profile.d/conda.sh
conda activate $LCDBWF_ENV
$DEPLOY/test/lcdb-wf-test variantcalling --run-workflow -n
$DEPLOY/test/lcdb-wf-test variantcalling --run-workflow --use-conda -j2

tar -zcf /tmp/variantcalling.tar.gz workflows/variant-calling/results

# --------------------------------------------------------------------------
# Syntax note: All of the steps above, with their "&step-name" labels, can be
# referred to by a corresponding "*step-name" below. The "<<: *defaults"
Expand Down Expand Up @@ -401,6 +423,18 @@ jobs:
destination: gene-patterns.html


variantcalling:
<<: *defaults
steps:
- checkout
- *restore_cache
- *set-path
- *get-data
- *variantcalling-step
- store_artifacts:
path: /tmp/variantcalling.tar.gz
destination: variantcalling.tar.gz

rnaseq-misc:
<<: *defaults
steps:
Expand Down Expand Up @@ -501,13 +535,16 @@ workflows:
- initial-setup
- pytest
- references:
requires:
- initial-setup
- pytest
requires:
- initial-setup
- pytest
- colocalization:
requires:
- initial-setup
- pytest
- variantcalling:
requires:
- initial-setup
- build-docs:
requires:
- initial-setup
Expand All @@ -517,5 +554,6 @@ workflows:
- rnaseq-misc
- chipseq
- chipseq-misc
- references
# - references
- colocalization
- variantcalling
9 changes: 8 additions & 1 deletion deploy.py
Original file line number Diff line number Diff line change
Expand Up @@ -93,6 +93,10 @@ def write_include_file(source, flavor='all'):
'recursive-include workflows/chipseq/config *',
'include workflows/chipseq/chipseq_trackhub.py',
],
'variant-calling': [
'include workflows/variant-calling/Snakefile',
'recursive-include workflows/variant-calling/config *',
],
'all': [
'recursive-include wrappers *',
'recursive-include include *',
Expand All @@ -110,13 +114,16 @@ def write_include_file(source, flavor='all'):
'recursive-include workflows/external *',
]


}

patterns = []
if flavor in ('full', 'rnaseq'):
patterns.extend(PATTERN_DICT['rnaseq'])
if flavor in ('full', 'chipseq'):
patterns.extend(PATTERN_DICT['chipseq'])
if flavor in ('full', 'variant-calling'):
patterns.extend(PATTERN_DICT['variant-calling'])
if flavor == 'full':
patterns.extend(PATTERN_DICT['full'])
patterns.extend(PATTERN_DICT['all'])
Expand Down Expand Up @@ -328,7 +335,7 @@ def build_envs(dest, conda_frontend="mamba"):
ap.add_argument(
"--flavor",
default="full",
help="""Options are {0}. Default is full.""".format(['full', 'rnaseq', 'chipseq']),
help="""Options are {0}. Default is full.""".format(['full', 'rnaseq', 'chipseq', 'variant-calling']),
)
ap.add_argument(
"--dest", help="""Destination directory in which to copy files""", required=True
Expand Down
1 change: 1 addition & 0 deletions docs/toc.rst
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ Table of Contents
rnaseq
downstream-rnaseq
chipseq
variant-calling
integrative
conda
tests
Expand Down
Loading