summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCalvin <calvin@EESI>2013-03-15 13:57:24 -0400
committerCalvin <calvin@EESI>2013-03-15 13:57:24 -0400
commit852ee6695ed68f7a62a33f8c6fc340f1d2e2a35b (patch)
tree8cebe039bea8b41bb620752b98121c0ea290ab27
parentd39b5f8f11e25580a158893ca09a3ba2a5a2b5ab (diff)
updated multifasta_to_otu to is_compressed
-rwxr-xr-xsrc/python/multifasta_to_otu5
-rwxr-xr-xsrc/python/quikr2
2 files changed, 3 insertions, 4 deletions
diff --git a/src/python/multifasta_to_otu b/src/python/multifasta_to_otu
index dc82213..a2c9e1e 100755
--- a/src/python/multifasta_to_otu
+++ b/src/python/multifasta_to_otu
@@ -41,7 +41,7 @@ def main():
args = parser.parse_args()
# our defaults
- jobs=multiprocessing.cpu_count()
+ jobs = multiprocessing.cpu_count()
trained_matrix = args.trained_matrix
input_directory = args.input_directory
output_directory = args.output_directory
@@ -71,7 +71,7 @@ def main():
kmer = args.kmer
# Load trained matrix
- if q.isCompressed(args.trained_matrix):
+ if q.is_compressed(args.trained_matrix):
trained_matrix_file = gzip.open(args.trained_matrix, "rb")
else:
trained_matrix_file = open(args.trained_matrix, "rb")
@@ -140,7 +140,6 @@ def main():
return 0
-
def quikr_call(fasta_file):
input_location = input_directory + fasta_file
output_location = output_directory + os.path.basename(fasta_file)
diff --git a/src/python/quikr b/src/python/quikr
index bac01ca..bc951c9 100755
--- a/src/python/quikr
+++ b/src/python/quikr
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python2.7
import sys
import os
import argparse