Compare commits
7 Commits
v3.0.1b25
...
v3.0.1b256
Author | SHA1 | Date | |
---|---|---|---|
3db93ee9c4 | |||
4844b20770 | |||
0d98a4f717 | |||
837ff1a1ba | |||
aeed42456a | |||
fb6e27bb5d | |||
6d94cdcc0d |
@ -325,8 +325,9 @@ cdef class Taxonomy(OBIWrapper) :
|
||||
cdef Taxon taxon
|
||||
try:
|
||||
taxon = self.get_taxon_by_taxid(taxid)
|
||||
except:
|
||||
raise StopIteration
|
||||
except Exception as e:
|
||||
print('\n'+e, file=sys.stderr)
|
||||
return
|
||||
if taxon is not None:
|
||||
while taxon.taxid != 1:
|
||||
yield taxon
|
||||
@ -334,7 +335,7 @@ cdef class Taxonomy(OBIWrapper) :
|
||||
taxon = taxon.parent
|
||||
yield taxon
|
||||
else:
|
||||
raise StopIteration
|
||||
return
|
||||
|
||||
|
||||
def is_ancestor(self, int ancestor_taxid, int taxid):
|
||||
|
@ -23,16 +23,17 @@ cdef class TabFormat:
|
||||
@cython.boundscheck(False)
|
||||
def __call__(self, object data):
|
||||
|
||||
cdef set ktags
|
||||
cdef object ktags
|
||||
cdef list tags = [key for key in data]
|
||||
|
||||
line = []
|
||||
|
||||
if self.tags is not None and self.tags:
|
||||
ktags = self.tags
|
||||
if self.tags != None and self.tags:
|
||||
ktags = list(self.tags)
|
||||
else:
|
||||
ktags = set(tags)
|
||||
|
||||
ktags = list(set(tags))
|
||||
|
||||
ktags.sort()
|
||||
|
||||
if self.header and self.first_line:
|
||||
for k in ktags:
|
||||
if k in tags:
|
||||
|
@ -280,7 +280,7 @@ def open_uri(uri,
|
||||
iseq = urib
|
||||
objclass = bytes
|
||||
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']:
|
||||
raise Exception("Prefix needed when exporting for metabaR (--metabaR-prefix option)")
|
||||
else:
|
||||
|
@ -1,5 +1,5 @@
|
||||
major = 3
|
||||
minor = 0
|
||||
serial= '1b25'
|
||||
serial= '1b26'
|
||||
|
||||
version ="%d.%d.%s" % (major,minor,serial)
|
||||
|
Reference in New Issue
Block a user