Commit 683f3b5b by Celine Mercier

Merge branch 'master' of git@git.metabarcoding.org:obitools/obitools.git

parents 54901447 c395d762
--extra-index-url https://pypi.python.org/simple/
Cython>=0.21
Cython==0.23
Sphinx>=1.2.0
wheel>=0.24.0
virtualenv>=1.11.0
......
......@@ -19,7 +19,7 @@ from os import path
PACKAGE = "OBITools"
VERSION = "1.2.2"
VERSION = "1.2.4"
AUTHOR = 'Eric Coissac'
EMAIL = 'eric@coissac.eu'
URL = 'metabarcoding.org/obitools'
......
......@@ -231,8 +231,11 @@ if __name__ == '__main__':
for seq in seqs[1:]:
s['count']+=seq['count']
if 'count' in seq:
s['count']+=seq['count']
else:
s['count']+=1
for key in mergedKey:
if key=='taxid' and mergeIds:
if 'taxid_dist' in seq:
......
major = 1
minor = 2
serial= '2'
serial= '4'
version = "%2d.%02d %s" % (major,minor,serial)
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment