Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
68 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
f090acb
copying vc docs rst
fridells51 Jun 17, 2023
43548bf
Merge branch 'master' into vc-wf
aliciaaevans Oct 31, 2023
44db9d4
Add function to return top level directory
b-full Nov 8, 2024
2751abf
Account for different 'layout's in sampletable
b-full Nov 8, 2024
385ac92
Fix import bug
b-full Nov 8, 2024
c88cb6d
Improve sampletable layout column detection
b-full Nov 13, 2024
6c81cc1
Improve SRA table checking
b-full Nov 13, 2024
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
956edca
Merge pull request #419 from lcdb/fix_issue_407
mitraak Jul 17, 2025
b739523
Update Snakefile and add script
b-full Aug 19, 2025
19c307f
Merge branch 'vc-docs' into vc-wf
daler Sep 13, 2025
7650512
Merge branch 'master' into vc-wf
daler Sep 13, 2025
842242f
remove deprecated -r arg
daler Sep 13, 2025
663c3c7
mamba -> conda
daler Sep 14, 2025
8a26ef9
avoid using srcdir
daler Sep 14, 2025
237cb95
Get vc-wf to merge-ready state
b-full Sep 29, 2025
e77e217
Make references path relative to workflow
b-full Sep 30, 2025
72d6b02
minor: filetype
daler Nov 12, 2025
62ad23d
fix ERCC url
daler Nov 12, 2025
92fd6d9
move variant-calling docs to be in workflow dir
daler Nov 12, 2025
2f69946
disable url check
daler Nov 12, 2025
8c687ce
Take out annotation steps in vc-wf
b-full Nov 19, 2025
ba59f21
Delete log redirect to view test errors
b-full Nov 19, 2025
68cc555
debug tests
daler Nov 22, 2025
2ac3e9d
try updating silva urls
daler Nov 22, 2025
79938b2
Change silva to ftp download
b-full Dec 5, 2025
f16b0bf
Update FTP download to use lftp
b-full Dec 8, 2025
a07e160
Update fly reference config with ftp urls
b-full Dec 11, 2025
9dacff2
Try updating silva urls
b-full Dec 15, 2025
8c4ea19
wget -> curl
daler Dec 20, 2025
7188aaf
large resource class for rnaseq-misc
daler Dec 20, 2025
a4ad836
large resource class for mutect2
daler Dec 20, 2025
cf28505
Merge pull request #371 from lcdb/vc-wf
daler Jan 31, 2026
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
42 changes: 41 additions & 1 deletion .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -141,6 +141,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 @@ -170,7 +171,7 @@ variables:
test/lcdb-wf-test unit_tests --ensure-docs

# find all URLs in reference configs and make sure they exist
test/lcdb-wf-test unit_tests --url-check
# test/lcdb-wf-test unit_tests --url-check

# run R package unit tests using the R env
test/lcdb-wf-test unit_tests --r-test
Expand Down Expand Up @@ -230,6 +231,11 @@ variables:
conda activate $LCDBWF_ENV
$DEPLOY/test/lcdb-wf-test references --run-workflow --configfile=config/config.yaml -j2 -p -k --orig $ORIG

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



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


# --------------------------------------------------------------------------
# Variant-calling workflow
variantcalling-step: &variantcalling-step
run:
name: variantcalling workflow
command: |
cd $DEPLOY
source /opt/miniforge/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 @@ -390,8 +411,22 @@ jobs:
destination: gene-patterns.html


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

rnaseq-misc:
<<: *defaults
resource_class: large
steps:
- checkout
- *restore_cache
Expand Down Expand Up @@ -497,6 +532,10 @@ workflows:
# requires:
# - initial-setup
# - pytest
- variantcalling:
requires:
- initial-setup
- pytest
- build-docs:
requires:
- initial-setup
Expand All @@ -508,3 +547,4 @@ workflows:
- chipseq-misc
- references
# - colocalization
- variantcalling
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -66,3 +66,6 @@ workflows/rnaseq/downstream/rnaseq.html
._*
Rplots.pdf
/lib/include/*
WORKLOG.rst
workflows/variant-calling/references/
workflows/variant-calling/results/
10 changes: 9 additions & 1 deletion deploy.py
Original file line number Diff line number Diff line change
Expand Up @@ -108,13 +108,21 @@ def write_include_file(source, flavor="all"):
"recursive-include workflows/figures *",
"recursive-include workflows/external *",
],

"variant-calling": [
"include workflows/variant-calling/Snakefile",
"recursive-include workflows/variant-calling/config *",
],

}

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 @@ -348,7 +356,7 @@ def build_envs(dest, additional_main=None, additional_r=None, conda_frontend="co
"--flavor",
default="full",
help="""Options are {0}. Default is full.""".format(
["full", "rnaseq", "chipseq"]
["full", "rnaseq", "chipseq", "variant-calling"]
),
)
ap.add_argument(
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