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

requirements.txt

@@ -1,5 +1,5 @@
 --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

setup.py

@@ -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'

src/obiselect.py

@@ -231,7 +231,10 @@ 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:

src/obitools/version.py

@@ -1,5 +1,5 @@
 major = 1
 minor = 2
-serial= '2'
+serial= '4'
 
 version = "%2d.%02d %s" % (major,minor,serial)