diff -r 696f02ba0853 -r 23f5e267cd1e virtualenv/res/lib/lib_create_env.py --- a/virtualenv/res/lib/lib_create_env.py Thu Dec 31 23:41:19 2015 +0100 +++ b/virtualenv/res/lib/lib_create_env.py Tue Mar 15 12:34:52 2016 +0100 @@ -32,10 +32,9 @@ 'SORL_THUMBNAIL' : { 'setup': 'sorl-thumbnail', 'url':'https://github.com/mariocesar/sorl-thumbnail/archive/master.tar.gz', 'local':"sorl-thumbnail-12.3.tar.gz", 'install': {'method': 'pip', 'option_str': None, 'dict_extra_env': None}}, 'LIBJPEG': {'setup': None, 'url':'jpegsrc.v9.tar.gz', 'local':'jpegsrc.v9.tar.gz', 'install': {'method': 'install_libjpeg', 'option_str': None, 'dict_extra_env': None}}, 'ZLIB': {'setup': None, 'url':'zlib-1.2.8.tar.gz', 'local':'zlib-1.2.8.tar.gz', 'install': {'method': 'install_zlib', 'option_str': None, 'dict_extra_env': None}}, - 'HAYSTACK': {'setup': 'django-haystack', 'url': 'https://github.com/django-haystack/django-haystack/archive/v2.4.0.tar.gz', 'local': 'django-haystack-2.4.0.tar.gz', 'install':{'method':'pip', 'option_str': None, 'dict_extra_env': None}}, + 'HAYSTACK': {'setup': 'django-haystack', 'url': 'https://github.com/django-haystack/django-haystack/archive/v2.4.1.tar.gz', 'local': 'django-haystack-2.4.1.tar.gz', 'install':{'method':'pip', 'option_str': None, 'dict_extra_env': None}}, 'REQUESTS': {'setup': 'requests', 'url':'https://github.com/kennethreitz/requests/archive/v2.7.0.tar.gz', 'local':'requests-2.7.0.tar.gz', 'install' : {'method':'pip', 'option_str': None, 'dict_extra_env': None}}, - 'ELASTICSEARCH': {'setup': 'elasticsearch', 'url':'https://github.com/elastic/elasticsearch-py/archive/1.4.0.tar.gz', 'local':'elasticsearch-1.4.0.tar.gz', 'install' : {'method':'pip', 'option_str': None, 'dict_extra_env': None}}, - 'PYELASTICSEARCH': {'setup': 'pyelasticsearch', 'url':'https://pypi.python.org/packages/source/p/pyelasticsearch/pyelasticsearch-1.2.3.tar.gz', 'local':'pyelasticsearch-1.2.3.tar.gz', 'install' : {'method':'pip', 'option_str': None, 'dict_extra_env': None}}, + 'ELASTICSEARCH': {'setup': 'elasticsearch', 'url':'https://pypi.python.org/packages/source/e/elasticsearch/elasticsearch-2.3.0.tar.gz', 'local':'elasticsearch-2.3.0.tar.gz', 'install' : {'method':'pip', 'option_str': None, 'dict_extra_env': None}}, 'WHOOSH': {'setup': 'whoosh', 'url':'https://bitbucket.org/mchaput/whoosh/get/2.7.0.tar.gz', 'local':'whoosh-2.7.0.tar.gz', 'install' : {'method':'pip', 'option_str': None, 'dict_extra_env': None}}, 'SETUPTOOLS_HG' : {'setup':'setuptools_hg', 'url':'https://bitbucket.org/jezdez/setuptools_hg/get/v0.4.tar.gz', 'local': 'setuptools_hg-0.4.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, defusedxml @@ -49,7 +48,7 @@ 'DJANGO-CORS-HEADERS' : {'setup':'django-cors-headers', 'url':'https://github.com/ottoyiu/django-cors-headers/archive/1.1.0.tar.gz', 'local': 'django-cors-headers-1.1.0.tar.gz', 'install' : {'method':'pip', 'option_str': None, 'dict_extra_env': None}}, 'DJANGO-CHUNCKED-UPLOADS' : {'setup': 'django-chuncked-uploads', 'url':'https://github.com/IRI-Research/django-chunked-uploads/archive/v0.7.tar.gz', 'local':'django-chunked-uploads-0.7.tar.gz', 'install' : {'method':'pip', 'option_str': None, 'dict_extra_env': None}}, 'OAUTHLIB': { 'setup': 'oauthlib', 'url':"https://github.com/idan/oauthlib/archive/0.7.2.tar.gz", 'local':"oauthlib-0.7.2.tar.gz", 'install': {'method': 'pip', 'option_str': None, 'dict_extra_env': None}}, - 'URLLIB3': { 'setup': 'urllib3', 'url':'https://github.com/shazow/urllib3/archive/1.10.4.tar.gz', 'local':"urllib3-1.10.4.tar.gz", 'install': {'method': 'pip', 'option_str': None, 'dict_extra_env': None}}, + 'URLLIB3': { 'setup': 'urllib3', 'url':'https://github.com/shazow/urllib3/archive/1.14.tar.gz', 'local':"urllib3-1.14.tar.gz", 'install': {'method': 'pip', 'option_str': None, 'dict_extra_env': None}}, 'SIMPLEJSON' : { 'setup': 'simplejson', 'url': 'https://github.com/simplejson/simplejson/archive/v3.6.5.tar.gz', 'local' : 'simplejson-3.6.5.tar.gz', 'install': {'method': 'pip', 'option_str': None, 'dict_extra_env': None}}, 'PYJWT' : { 'setup': 'pyjwt', 'url': 'https://github.com/jpadilla/pyjwt/archive/1.1.0.tar.gz', 'local' : 'pyjwt-1.1.0.tar.gz', 'install': {'method': 'pip', 'option_str': None, 'dict_extra_env': None}}, 'PYTHON-MIMEPARSE': { 'setup': 'python-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}}, @@ -57,13 +56,13 @@ } if system_str == 'Windows': - + size = 8 * struct.calcsize("P") if size==32: mysqlres = "MySQL-python-1.2.3.win32-py2.7.exe" else: mysqlres = "MySQL-python-1.2.3.win-amd64-py2.7.exe" - + URLS.update({ 'PSYCOPG2': {'setup': 'psycopg2','url': 'psycopg2-2.4.6.win32-py2.7-pg9.2.2-release.exe', 'local':"psycopg2-2.4.6.win32-py2.7-pg9.2.2-release.exe", 'install': {'method': 'install_psycopg2', 'option_str': None, 'dict_extra_env': None}}, 'PIL': {'setup': 'pil', 'url': 'http://effbot.org/media/downloads/PIL-1.1.7.win32-py2.7.exe', 'local':"PIL-1.1.7.win32-py2.7.exe", 'install': {'method': 'easy_install', 'option_str': None, 'dict_extra_env': None}}, @@ -88,7 +87,7 @@ 'LXML': {'setup': 'lxml', 'url': 'lxml-3.2.1.tar.bz2', 'local': 'lxml-3.2.1.tar.bz2', 'install': {'method': 'pip', 'option_str': None, 'dict_extra_env': lxml_options}}, 'MYSQL': { 'setup': 'mysql-python', 'url': 'http://downloads.sourceforge.net/project/mysql-python/mysql-python-test/1.2.4b4/MySQL-python-1.2.4b4.tar.gz', 'local':"MySQL-python-1.2.4b4.tar.gz", 'install': {'method': mysql_method, 'option_str': None, 'dict_extra_env': None}}, }) - + class ResourcesEnv(object): @@ -103,11 +102,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() @@ -127,7 +126,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', @@ -163,15 +162,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, @@ -181,19 +180,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) @@ -202,15 +201,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, @@ -218,20 +217,20 @@ def gen_install_comp_lib(lib_name, lib_key, configure_options=[], configure_env={}): - + 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]) - - + + context_map = { 'option_str' : option_str, 'home_dir': os.path.abspath(home_dir), @@ -239,10 +238,10 @@ 'tmp_dir': os.path.abspath(tmp_dir), 'src_dir': os.path.abspath(src_dir), } - + configure_options_trans = map(lambda s: s % context_map, configure_options) configure_env_trans = {k: s % context_map for k,s in configure_env.items()} - + logger.notify(lib_name + " configure in " + lib_src_path) call_subprocess(['./configure', '--prefix='+os.path.abspath(home_dir)] + configure_options_trans, cwd=os.path.abspath(lib_src_path), @@ -256,7 +255,7 @@ 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), @@ -271,11 +270,11 @@ osx_extra_env = {} 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): @@ -287,8 +286,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': @@ -343,16 +342,16 @@ filter_stdout=filter_python_develop, show_stdout=True, 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') @@ -360,23 +359,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): @@ -395,7 +394,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': @@ -405,26 +404,26 @@ #flags += " -Wno-error=unused-command-line-argument-hard-error-in-future" flags += " "+flag_value 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 @@ -433,4 +432,3 @@ setattr(options, opt, opt_val) return adjust_options, extend_parser, after_install -