Merge pull request #14 from karel-brinda/var_opt

SAMsift 0.2.2
karel-brinda · Oct 11, 2017 · c5a355b · c5a355b
2 parents 875fd74 + ba5e3f3
commit c5a355b
Show file tree

Hide file tree

Showing 14 changed files with 345 additions and 182 deletions.
diff --git a/.gitignore b/.gitignore
@@ -2,6 +2,8 @@ README.html
 README.sh
 *.sam
 *.bam
+!test.sam
+!test.bam
 
 # Byte-compiled / optimized / DLL files
 __pycache__/

diff --git a/Makefile b/Makefile
@@ -5,7 +5,7 @@ SAMS=./samsift/samsift.py
 
 .SECONDARY:
 
-all: readme tests/test.bam
+all: readme tests/tests/test.bam
 
 clean:
 	rm -fr build/ dist/ samsift/__pycache__ samsift.egg-info
@@ -16,7 +16,7 @@ clean:
 pypi:
 	/usr/bin/env python3 setup.py sdist bdist_wheel upload
 
-tests/test.bam: tests/test.sam
+tests/tests/test.bam: tests/tests/test.sam
 	samtools view -b "$<" > "$@"
 
 readme: rst html

diff --git a/README.rst b/README.rst
@@ -84,7 +84,7 @@ Command-line parameters
 .. code-block::
 
 	Program: samsift (advanced filtering and tagging of SAM/BAM alignments using Python expressions)
-	Version: 0.2.1
+	Version: 0.2.2
 	Author:  Karel Brinda <kbrinda@hsph.harvard.edu>
 
 	Usage:   samsift.py [-i FILE] [-o FILE] [-f PY_EXPR] [-c PY_CODE] [-m STR]