This commit is contained in:
2014-09-24 07:53:46 +00:00
parent 2f66a77582
commit 2491a5622a
3 changed files with 9 additions and 9 deletions

View File

@ -193,7 +193,8 @@ def findCython(root,base=None,pyrexs=None):
pyrexs.append(Extension('.'.join(base+[module,path.splitext(path.basename(pyrex))[0]]),[pyrex])) pyrexs.append(Extension('.'.join(base+[module,path.splitext(path.basename(pyrex))[0]]),[pyrex]))
pyrexs[-1].sources.extend(glob.glob(os.path.splitext(pyrex)[0]+'.ext.*.c')) pyrexs[-1].sources.extend(glob.glob(os.path.splitext(pyrex)[0]+'.ext.*.c'))
print pyrexs[-1].sources print pyrexs[-1].sources
Main.compile([pyrex],timestamps=True,recursion=True) Main.compile([pyrex],timestamps=True)
# Main.compile([pyrex],timestamps=True,recursion=True)
pyrexs.extend(findCython(path.join(root,module),base+[module])) pyrexs.extend(findCython(path.join(root,module),base+[module]))
return pyrexs return pyrexs
@ -220,7 +221,7 @@ def findC(root,base=None,pyrexs=None):
#from obitools.version import version as obiversion #from obitools.version import version as obiversion
#sys.path.pop(0) #sys.path.pop(0)
VERSION = "1.0.000" VERSION = "1.0.002"
AUTHOR = 'Eric Coissac' AUTHOR = 'Eric Coissac'
EMAIL = 'eric@coissac.eu' EMAIL = 'eric@coissac.eu'
URL = 'metabarcoding.org/obitools' URL = 'metabarcoding.org/obitools'
@ -256,13 +257,12 @@ setup(name="OBITools",
classifiers=[ classifiers=[
'Development Status :: 5 - Production/Stable', 'Development Status :: 5 - Production/Stable',
'Environment :: Console', 'Environment :: Console',
'Intended Audience :: Research', 'Intended Audience :: Science/Research',
'License :: CeCILL-V2', 'License :: Other/Proprietary License',
'Operating System :: Unix like', 'Operating System :: Unix',
'Programming Language :: Python', 'Programming Language :: Python',
'Programming Language :: Python :: 2', 'Programming Language :: Python :: 2',
'Topic :: NGS Data processing', 'Topic :: Scientific/Engineering :: Bio-Informatics',
'Topic :: DNA metabarcoding',
'Topic :: Utilities', 'Topic :: Utilities',
], ],
version=VERSION, version=VERSION,

View File

@ -8,7 +8,7 @@ import sys
class EcoPCRFile(utils.ColumnFile): class EcoPCRFile(utils.ColumnFile):
def __init__(self,stream): def __init__(self,stream):
utils.ColumnFile.__init__(self, utils.ColumnFile.__init__(self,
stream, '|', True, stream, ' | ', True,
(str,int,int, (str,int,int,
str,int,str, str,int,str,
int,str,int, int,str,int,

View File

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