Commit 3e10b14a by Eric Coissac

Switch version to 1.00.008

Just few bugs on installer
parent 7f53d09f
......@@ -4,7 +4,10 @@ Created on 13 fevr. 2014
@author: coissac
'''
from Cython.Distutils import build_ext as ori_build_ext # @UnresolvedImport
try:
from Cython.Distutils import build_ext as ori_build_ext # @UnresolvedImport
except ImportError:
from distutils.command.build_ext import build_ext as ori_build_ext
from distutils.errors import DistutilsSetupError
import os
......
......@@ -166,8 +166,6 @@ def setup(**attrs):
if 'cmdclass' not in attrs:
attrs['cmdclass'] = COMMANDS
print COMMANDS['build'].subcommands
if 'ctools' not in attrs:
attrs['ctools'] = CTOOLS
......
......@@ -102,7 +102,8 @@ def serenity_mode(package,version):
if args.serenity:
serenity_snake(args.virtual,package,version)
else:
serenity_assert(package,version)
pass
# serenity_assert(package,version)
log.set_threshold(old)
......
......@@ -6,6 +6,7 @@ Created on 2 oct. 2014
import re
import sys
import os
from distutils.version import LooseVersion # @UnusedImport
from distutils.errors import DistutilsError
......@@ -165,6 +166,9 @@ def pip_install_package(package,directory=None,pip=None):
args = ['install']
if 'http_proxy' in os.environ:
args.append('--proxy=%s' % os.environ['http_proxy'])
if directory is not None:
args.append('--target=%s' % directory)
......
......@@ -17739,6 +17739,9 @@ def pip_download_package(package,pip=None):
args = ['install']
if 'http_proxy' in os.environ:
args.append('--proxy=%s' % os.environ['http_proxy'])
args.append('--download=%s' % tmpdir)
args.append('--index-url=https://pypi.python.org/simple/')
args.append('--no-deps')
......@@ -17783,7 +17786,7 @@ def main():
os.system(command)
activate = os.path.join(current,'obitools>=1.00.000')
activate = os.path.join(current,'obitools')
binpath = os.path.join(virtualenvname,'bin')
python = os.path.join(binpath,'python')
......@@ -19,7 +19,7 @@ from os import path
PACKAGE = "OBITools"
VERSION = "1.0.007"
VERSION = "1.0.008"
AUTHOR = 'Eric Coissac'
EMAIL = 'eric@coissac.eu'
URL = 'metabarcoding.org/obitools'
......
major = 1
minor = 0
serial= '007'
serial= '008'
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