--- a/virtualenv/res/lib/lib_create_env.py Wed Apr 02 11:27:18 2014 +0200
+++ b/virtualenv/res/lib/lib_create_env.py Mon May 11 13:16:04 2015 +0200
@@ -33,12 +33,12 @@
'PYTZ' : {'setup': 'pytz', 'url':'https://pypi.python.org/packages/source/p/pytz/pytz-2014.2.tar.gz', 'local' : 'pytz-2014.2.tar.gz', 'install': {'method': 'pip', 'option_str': None, 'dict_extra_env': None}},
# dependencies for Tastypie : mimeparse>=0.1.3, python-dateutil>=2.1, lxml, PyYAML (not necessary but we never know), python-digest
'MIMEPARSE' : {'setup':'mimeparse', 'url':'https://pypi.python.org/packages/source/p/python-mimeparse/python-mimeparse-0.1.4.tar.gz', 'local': 'python-mimeparse-0.1.4.tar.gz', 'install' : {'method':'pip', 'option_str': None, 'dict_extra_env': None}},
- 'SIX' : {'setup':'six', 'url':'https://pypi.python.org/packages/source/s/six/six-1.6.1.tar.gz', 'local': 'six-1.6.1.tar.gz', 'install' : {'method':'pip', 'option_str': None, 'dict_extra_env': None}},
+ 'SIX' : {'setup':'six', 'url':'https://pypi.python.org/packages/source/s/six/six-1.6.1.tar.gz', 'local': 'six-1.6.1.tar.gz', 'install' : {'method':'pip', 'option_str': None, 'dict_extra_env': None}},
'PYTHON-DATEUTIL' : {'setup':'python-dateutil', 'url':'https://pypi.python.org/packages/source/p/python-dateutil/python-dateutil-2.2.tar.gz', 'local': 'python-dateutil-2.2.tar.gz', 'install' : {'method':'pip', 'option_str': None, 'dict_extra_env': None}},
'PYYAML' : {'setup':'pyyaml', 'url':'http://pyyaml.org/download/pyyaml/PyYAML-3.11.tar.gz', 'local': 'PyYAML-3.11.tar.gz', 'install' : {'method':'pip', 'option_str': None, 'dict_extra_env': None}},
'PYTHON-DIGEST' : {'setup':'python-digest', 'url':'http://pypi.python.org/packages/source/p/python-digest/python-digest-1.7.tar.gz', 'local': 'python-digest-1.7.tar.gz', 'install' : {'method':'pip', 'option_str': None, 'dict_extra_env': None}},
'DJANGO-TASTYPIE' : {'setup':'django-tastypie', 'url':'https://github.com/toastdriven/django-tastypie/archive/v0.11.0.tar.gz', 'local': 'django-tastypie-0.11.0.tar.gz', 'install' : {'method':'pip', 'option_str': None, 'dict_extra_env': None}},
- 'ISODATE' : {'setup': 'isodate', 'url': 'https://github.com/gweis/isodate/archive/0.5.0.tar.gz', 'local': 'isodate-0.5.0.tar.gz', 'install': {'method':'pip', 'option_str': None, 'dict_extra_env': None}},
+ 'ISODATE' : {'setup': 'isodate', 'url': 'https://github.com/gweis/isodate/archive/0.5.0.tar.gz', 'local': 'isodate-0.5.0.tar.gz', 'install': {'method':'pip', 'option_str': None, 'dict_extra_env': None}},
'HTML5LIB' : {'setup': 'html5lib', 'url': 'https://github.com/html5lib/html5lib-python/archive/0.999.tar.gz', 'local': 'html5lib-0.999.tar.gz', 'install': {'method':'pip', 'option_str': None, 'dict_extra_env': None}},
'PYPARSING' : {'setup': 'pyparsing', 'url': 'https://pypi.python.org/packages/source/p/pyparsing/pyparsing-2.0.1.tar.gz', 'local': 'pyparsing-2.0.1.tar.gz', 'install': {'method':'pip', 'option_str': None, 'dict_extra_env': None}},
#SPARQLWRAPPER : the file SPARQLWrapper-1.5.2.tar.gz is needed in the folder to soleve RDFLIB dependencies. It will be installed when resolving the dependencies.graph.
@@ -54,9 +54,9 @@
else:
URLS.update({
'PSYCOPG2': {'setup': 'psycopg2','url': 'http://initd.org/psycopg/tarballs/PSYCOPG-2-5/psycopg2-2.5.2.tar.gz', 'local':"psycopg2-2.5.2.tar.gz", 'install': {'method': 'pip', 'option_str': None, 'dict_extra_env': None}},
- 'PIL': {'setup': 'pil', 'url': 'https://github.com/python-imaging/Pillow/archive/2.3.1.tar.gz', 'local':"Pillow-2.3.1.tar.gz", 'install': {'method': 'pip', 'option_str': None, 'dict_extra_env': None}},
+ 'PIL': {'setup': 'pil', 'url': 'https://github.com/python-imaging/Pillow/archive/2.8.1.tar.gz', 'local':"Pillow-2.8.1.tar.gz", 'install': {'method': 'pip', 'option_str': None, 'dict_extra_env': None}},
})
-
+
class ResourcesEnv(object):
@@ -71,11 +71,11 @@
return os.path.abspath(os.path.join(self.src_base, fpath)).replace("\\","/")
def get_run_res_base_path(self, fpath):
- return os.path.abspath(os.path.join(self.run_base, 'res', fpath)).replace("\\","/")
-
+ return os.path.abspath(os.path.join(self.run_base, 'res', fpath)).replace("\\","/")
+
def __add_package_def(self, key, dict):
self.URLS[key] = dict
-
+
def __init_url(self, urls):
for key, url_dict in urls.items():
url_dict_copy = url_dict.copy()
@@ -95,7 +95,7 @@
logger.notify('Creating directory %s' % dir)
os.makedirs(dir)
-def extend_parser(parser):
+def extend_parser(parser):
parser.add_option(
'--index-url',
metavar='INDEX_URL',
@@ -112,7 +112,7 @@
metavar='ignore_packages',
dest='ignore_packages',
default=None,
- help='list of comma separated keys for package to ignore')
+ help='list of comma separated keys for package to ignore')
def install_psycopg2(option_str, extra_env, res_source_key, home_dir, lib_dir, tmp_dir, src_dir, res_env, logger, call_subprocess, filter_python_develop):
psycopg2_src = os.path.join(src_dir,"psycopg2.zip")
@@ -122,15 +122,15 @@
psycopg2_base_path = os.path.join(src_dir,"psycopg2")
zf.extractall(psycopg2_base_path)
zf.close()
-
+
psycopg2_src_path = os.path.join(psycopg2_base_path, os.listdir(psycopg2_base_path)[0])
shutil.copytree(os.path.join(psycopg2_src_path, 'psycopg2'), os.path.abspath(os.path.join(home_dir, 'Lib/site-packages', 'psycopg2')))
shutil.copy(os.path.join(psycopg2_src_path, 'psycopg2-2.4.5-py2.7.egg-info'), os.path.abspath(os.path.join(home_dir, 'Lib/site-packages', 'site-packages')))
-
+
def install_mysql(option_str, extra_env, res_source_key, home_dir, lib_dir, tmp_dir, src_dir, res_env, logger, call_subprocess, filter_python_develop):
-
- args = [os.path.abspath(os.path.join(home_dir, 'bin', 'pip')), 'install', res_env.URLS['MYSQL'][res_source_key]]
+
+ args = [os.path.abspath(os.path.join(home_dir, 'bin', 'pip')), 'install', res_env.URLS['MYSQL'][res_source_key]]
if option_str :
args.insert(4,option_str)
call_subprocess(args,
@@ -140,19 +140,19 @@
extra_env=extra_env)
mysqlconfig_output = []
-
+
call_subprocess(['mysql_config', '--libmysqld-libs'],
cwd=os.path.abspath(tmp_dir),
filter_stdout=lambda line: mysqlconfig_output.append(line),
show_stdout=True)
-
+
mysqlconfig_output = "".join(mysqlconfig_output)
m = re.search("\-L[\'\"]?([\w\/]+)[\'\"]?", mysqlconfig_output)
if m:
repdylibpath = m.group(1)
else:
repdylibpath = '/usr/local/mysql/lib'
-
+
dyliblist = glob.glob(repdylibpath+"/libmysqlclient.*.dylib")
def key_func(s):
m = re.match(repdylibpath+"/libmysqlclient\.([\d]+)\.dylib", s)
@@ -161,15 +161,15 @@
else:
return sys.maxint
dyliblist.sort(key=key_func)
-
+
if dyliblist:
dylibpath = dyliblist[0]
else:
dylibpath = '/usr/local/mysql/lib/libmysqlclient.18.dylib'
-
- dylibname = os.path.basename(dylibpath)
+
+ dylibname = os.path.basename(dylibpath)
sopath = os.path.join(os.path.abspath(lib_dir), 'site-packages', '_mysql.so')
-
+
call_subprocess(['install_name_tool', '-change', dylibname, dylibpath, sopath],
cwd=os.path.abspath(tmp_dir),
filter_stdout=filter_python_develop,
@@ -177,31 +177,31 @@
def gen_install_comp_lib(lib_name, lib_key, configure_options=[]):
-
+
def install_lib(option_str, extra_env, res_source_key, home_dir, lib_dir, tmp_dir, src_dir, res_env, logger, call_subprocess, filter_python_develop):
lib_src = os.path.join(src_dir,lib_name+".tar.gz")
logger.notify("Copy %s to %s " % (res_env.URLS[lib_key][res_source_key],lib_src))
shutil.copy(res_env.URLS[lib_key][res_source_key], lib_src)
tf = tarfile.open(lib_src,'r:gz')
- lib_base_path = os.path.join(src_dir, lib_name)
+ lib_base_path = os.path.join(src_dir, lib_name)
logger.notify("Extract %s to %s " % (lib_name,lib_base_path))
tf.extractall(lib_base_path)
tf.close()
-
+
lib_src_path = os.path.join(lib_base_path, os.listdir(lib_base_path)[0])
-
+
logger.notify(lib_name + " configure in " + lib_src_path)
call_subprocess(['./configure', '--prefix='+os.path.abspath(home_dir)] + configure_options,
cwd=os.path.abspath(lib_src_path),
filter_stdout=filter_python_develop,
show_stdout=True)
-
+
logger.notify(lib_name + " make in " + lib_src_path)
call_subprocess(['make'],
cwd=os.path.abspath(lib_src_path),
filter_stdout=filter_python_develop,
show_stdout=True)
-
+
logger.notify(lib_name + "make install in " + lib_src_path)
call_subprocess(['make', 'install'],
cwd=os.path.abspath(lib_src_path),
@@ -216,11 +216,11 @@
def lib_generate_install_methods(path_locations, src_base, run_base, Logger, call_subprocess, normal_installs, options_to_add=None, urls= None):
-
+
all_urls = URLS.copy()
if urls is not None:
all_urls.update(urls)
-
+
res_env = ResourcesEnv(src_base, run_base, all_urls, normal_installs)
def filter_python_develop(line):
@@ -232,8 +232,8 @@
if line.startswith(prefix):
return Logger.DEBUG
return Logger.NOTIFY
-
-
+
+
def normal_install(key, res_path, method, option_str, extra_env, res_source_key, home_dir, tmp_dir, res_env, logger, call_subprocess):
logger.notify("Install %s from %s with %s" % (key,res_path,method))
if method == 'pip':
@@ -287,17 +287,17 @@
cwd=os.path.abspath(tmp_dir),
filter_stdout=filter_python_develop,
show_stdout=True,
- extra_env=extra_env)
-
-
+ extra_env=extra_env)
+
+
def after_install(options, home_dir):
-
+
global logger
-
+
verbosity = options.verbose - options.quiet
logger = Logger([(Logger.level_for_integer(2-verbosity), sys.stdout)])
-
+
home_dir, lib_dir, inc_dir, bin_dir = path_locations(home_dir)
base_dir = os.path.dirname(home_dir)
src_dir = os.path.join(home_dir, 'src')
@@ -305,23 +305,23 @@
ensure_dir(src_dir, logger)
ensure_dir(tmp_dir, logger)
system_str = platform.system()
-
+
res_source_key = getattr(options, 'type_install') if hasattr(options, 'type_install') else 'local' #.get('type_install', 'local')
if res_source_key is None:
res_source_key = 'local'
-
+
ignore_packages = []
-
+
if system_str == 'Windows':
default_install_options = {'method': 'easy_install', 'option_str': None, 'dict_extra_env': {}}
else:
default_install_options = {'method': 'pip', 'option_str': None, 'dict_extra_env': {}}
-
+
if options.ignore_packages :
ignore_packages = options.ignore_packages.split(",")
-
+
logger.indent += 2
- try:
+ try:
for key in res_env.NORMAL_INSTALL:
install_options = None
if isinstance(key, dict):
@@ -340,7 +340,7 @@
extra_env = install_options.get('dict_extra_env', default_install_options['dict_extra_env'])
if not extra_env:
extra_env = {}
-
+
if 'TMPDIR' not in extra_env:
extra_env['TMPDIR'] = os.path.abspath(tmp_dir)
if system_str == 'Darwin':
@@ -349,26 +349,26 @@
if flag_value not in flags:
flags += " -Wno-error=unused-command-line-argument-hard-error-in-future"
extra_env[flag_key] = flags.strip()
-
+
#isinstance(lst, (list, tuple))
if key not in ignore_packages:
logger.notify("install %s with method %s" % (key, repr(method)))
if callable(method):
method(option_str, extra_env, res_source_key, home_dir, lib_dir, tmp_dir, src_dir, res_env, logger, call_subprocess, filter_python_develop)
- elif method in globals() and callable(globals()[method]) and method not in ['pip', 'easy_install']:
+ elif method in globals() and callable(globals()[method]) and method not in ['pip', 'easy_install']:
globals()[method](option_str, extra_env, res_source_key, home_dir, lib_dir, tmp_dir, src_dir, res_env, logger, call_subprocess, filter_python_develop)
else:
normal_install(key, res_path, method, option_str, extra_env, res_source_key, home_dir, tmp_dir, res_env, logger, call_subprocess)
-
+
logger.notify("Clear source dir")
shutil.rmtree(src_dir)
-
+
finally:
logger.indent -= 2
script_dir = join(base_dir, bin_dir)
logger.notify('Run "%s Package" to install new packages that provide builds'
% join(script_dir, 'easy_install'))
-
+
def adjust_options(options, args):
if not options_to_add:
return
@@ -378,4 +378,3 @@
setattr(options, test_opt,opt.split('=',1)[1] if "=" in opt else True)
return adjust_options, extend_parser, after_install
-