Closed daler closed 8 years ago
Tests worked!! Don't know if you want to go ahead and merge or if you want to think about some of my comments first.
Let me address your comments first before merging, lots of things to fix. Thanks for reviewing.
Do you want me to do the tests and go ahead and merge, or do you want me to branch and hack?
Hmm . . . test -> merge -> hack please
will do
This PR makes a bunch of changes (and supersedes #32 which is now closed).
Additions
workflows/mapping
, which has many of the same testing infrastructure astest
, like get-data.sh, config.yaml, Snakefile.workflows/mapping/Snakefile
is a modified version of the one intest
, with changes implemented as described belowTesting
--workflow workflows/mapping
to the now-updatedrun_test.py
. The most complete test would be this (build a new env, clean all data, submit to slurm, test the mapping workflow):--sbatch
will submit to the cluster for you, and you'll get an email upon completionSnakefile and config changes
include:
ed into the mapping workflow. Using subworkflows didn't work because I couldn't figure out how to pass a custom config file to a subworkflow.workflows/references/references_config.yaml
have been moved toworkflows/mapping/config.yaml
in order to have a One True Config File (TM) in which all configuration occursrules
section in the config. This is where you can edit the params for each rule (see the config for examples). Importantly, you can make a change in the config file, and then runsnakemake --list-params-changes
to identify those rules now out-of-date due to differences in params from the cache. You can then force these to re-run by using:fastq_screen
rule has been factored out into a separate rule that creates thefastq_screen_config.txt
file. This in turn will build the bowtie2 indexes if needed. This works because the references snakefile is nowinclude:
d in the mapping workflow.align
rule and therules:align
block in the config file for how this is configured. This requires that an aligner's wrapper acceptfastq
andindex
inputs, and output a BAM file, but I figured that was a reasonable requirement.