Commit 0cd2814f by Celine Mercier

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

parents 97268211 abf8fde9
...@@ -3,4 +3,4 @@ Cython>=0.24 ...@@ -3,4 +3,4 @@ Cython>=0.24
Sphinx>=1.2.0 Sphinx>=1.2.0
wheel>=0.24.0 wheel>=0.24.0
virtualenv>=1.11.0 virtualenv>=1.11.0
ipython>=3.0.0 ipython>=3.0.0 and <6
...@@ -19,7 +19,7 @@ from os import path ...@@ -19,7 +19,7 @@ from os import path
PACKAGE = "OBITools" PACKAGE = "OBITools"
VERSION = "1.2.9" VERSION = "1.2.11"
AUTHOR = 'Eric Coissac' AUTHOR = 'Eric Coissac'
EMAIL = 'eric@coissac.eu' EMAIL = 'eric@coissac.eu'
URL = 'http://metabarcoding.org/obitools' URL = 'http://metabarcoding.org/obitools'
......
...@@ -117,7 +117,7 @@ seqfilepattern={('lsu','parc',False,False) : "SILVA_%s_LSUParc_tax_silva.fasta.g ...@@ -117,7 +117,7 @@ seqfilepattern={('lsu','parc',False,False) : "SILVA_%s_LSUParc_tax_silva.fasta.g
} }
# (options.rrna,options.nr) # (options.rrna,options.nr)
taxfilepattern={'lsu' : "tax_slv_lsu_%s.txt", taxfilepattern={'lsu' : "tax_slv_lsu_%s.txt",
'ssu' : "tax_slv_ssu_nr_%s.txt" 'ssu' : "tax_slv_ssu_%s.txt"
} }
def getHyperlink(url): def getHyperlink(url):
......
major = 1 major = 1
minor = 2 minor = 2
serial= '9' serial= '11'
version = "%2d.%02d %s" % (major,minor,serial) 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