Compare commits
8 Commits
Author | SHA1 | Date | |
---|---|---|---|
3db93ee9c4 | |||
4844b20770 | |||
0d98a4f717 | |||
837ff1a1ba | |||
aeed42456a | |||
fb6e27bb5d | |||
6d94cdcc0d | |||
8a1f844645 |
@ -325,8 +325,9 @@ cdef class Taxonomy(OBIWrapper) :
|
|||||||
cdef Taxon taxon
|
cdef Taxon taxon
|
||||||
try:
|
try:
|
||||||
taxon = self.get_taxon_by_taxid(taxid)
|
taxon = self.get_taxon_by_taxid(taxid)
|
||||||
except:
|
except Exception as e:
|
||||||
raise StopIteration
|
print('\n'+e, file=sys.stderr)
|
||||||
|
return
|
||||||
if taxon is not None:
|
if taxon is not None:
|
||||||
while taxon.taxid != 1:
|
while taxon.taxid != 1:
|
||||||
yield taxon
|
yield taxon
|
||||||
@ -334,7 +335,7 @@ cdef class Taxonomy(OBIWrapper) :
|
|||||||
taxon = taxon.parent
|
taxon = taxon.parent
|
||||||
yield taxon
|
yield taxon
|
||||||
else:
|
else:
|
||||||
raise StopIteration
|
return
|
||||||
|
|
||||||
|
|
||||||
def is_ancestor(self, int ancestor_taxid, int taxid):
|
def is_ancestor(self, int ancestor_taxid, int taxid):
|
||||||
|
@ -23,16 +23,17 @@ cdef class TabFormat:
|
|||||||
@cython.boundscheck(False)
|
@cython.boundscheck(False)
|
||||||
def __call__(self, object data):
|
def __call__(self, object data):
|
||||||
|
|
||||||
cdef set ktags
|
cdef object ktags
|
||||||
cdef list tags = [key for key in data]
|
cdef list tags = [key for key in data]
|
||||||
|
|
||||||
line = []
|
line = []
|
||||||
|
if self.tags != None and self.tags:
|
||||||
if self.tags is not None and self.tags:
|
ktags = list(self.tags)
|
||||||
ktags = self.tags
|
|
||||||
else:
|
else:
|
||||||
ktags = set(tags)
|
ktags = list(set(tags))
|
||||||
|
|
||||||
|
ktags.sort()
|
||||||
|
|
||||||
if self.header and self.first_line:
|
if self.header and self.first_line:
|
||||||
for k in ktags:
|
for k in ktags:
|
||||||
if k in tags:
|
if k in tags:
|
||||||
|
@ -103,7 +103,11 @@ def fastqWithQualityIterator(lineiterator,
|
|||||||
yield seq
|
yield seq
|
||||||
|
|
||||||
read+=1
|
read+=1
|
||||||
hline = next(i)
|
try:
|
||||||
|
hline = next(i)
|
||||||
|
except StopIteration:
|
||||||
|
return
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
def fastqWithoutQualityIterator(lineiterator,
|
def fastqWithoutQualityIterator(lineiterator,
|
||||||
@ -174,5 +178,7 @@ def fastqWithoutQualityIterator(lineiterator,
|
|||||||
yield seq
|
yield seq
|
||||||
|
|
||||||
read+=1
|
read+=1
|
||||||
hline = next(i)
|
try:
|
||||||
|
hline = next(i)
|
||||||
|
except StopIteration:
|
||||||
|
return
|
||||||
|
@ -99,7 +99,10 @@ def tabIterator(lineiterator,
|
|||||||
|
|
||||||
read+=1
|
read+=1
|
||||||
|
|
||||||
line = next(iterator)
|
try:
|
||||||
|
line = next(iterator)
|
||||||
|
except StopIteration:
|
||||||
|
return
|
||||||
|
|
||||||
|
|
||||||
|
|
@ -280,7 +280,7 @@ def open_uri(uri,
|
|||||||
iseq = urib
|
iseq = urib
|
||||||
objclass = bytes
|
objclass = bytes
|
||||||
else: # TODO update uopen to be able to write?
|
else: # TODO update uopen to be able to write?
|
||||||
if config['obi']['outputformat'] == b'metabaR':
|
if 'outputformat' in config['obi'] and config['obi']['outputformat'] == b'metabaR':
|
||||||
if 'metabarprefix' not in config['obi']:
|
if 'metabarprefix' not in config['obi']:
|
||||||
raise Exception("Prefix needed when exporting for metabaR (--metabaR-prefix option)")
|
raise Exception("Prefix needed when exporting for metabaR (--metabaR-prefix option)")
|
||||||
else:
|
else:
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
major = 3
|
major = 3
|
||||||
minor = 0
|
minor = 0
|
||||||
serial= '1b24'
|
serial= '1b26'
|
||||||
|
|
||||||
version ="%d.%d.%s" % (major,minor,serial)
|
version ="%d.%d.%s" % (major,minor,serial)
|
||||||
|
Reference in New Issue
Block a user