diff -r 884b1b7fc420 -r e1d3c1469691 script/virtualenv/res/lib/lib_create_env.py --- a/script/virtualenv/res/lib/lib_create_env.py Mon Mar 14 11:06:36 2016 +0100 +++ b/script/virtualenv/res/lib/lib_create_env.py Wed Mar 16 23:09:57 2016 +0100 @@ -15,33 +15,37 @@ system_str = platform.system() URLS = { - 'SQLALCHEMY': {'setup': 'SQLAlchemy','url': 'https://pypi.python.org/packages/source/S/SQLAlchemy/SQLAlchemy-0.9.9.tar.gz', 'local':"SQLAlchemy-0.9.9.tar.gz", 'install': {'method': 'pip', 'option_str': None, 'dict_extra_env': None}}, + 'SQLALCHEMY': {'setup': 'SQLAlchemy','url': 'https://pypi.python.org/packages/source/S/SQLAlchemy/SQLAlchemy-1.0.12.tar.gz', 'local':"SQLAlchemy-1.0.12.tar.gz", 'install': {'method': 'pip', 'option_str': None, 'dict_extra_env': None}}, 'ANYJSON': {'setup': 'anyjson','url': 'https://bitbucket.org/runeh/anyjson/get/0.3.3.tar.gz', 'local':"anyjson-0.3.3.tar.gz", 'install': {'method': 'pip', 'option_str': None, 'dict_extra_env': None}}, - 'BLESSINGS': {'setup': 'blessings','url': 'https://pypi.python.org/packages/source/b/blessings/blessings-1.5.1.tar.gz', 'local':"blessings-1.5.1.tar.gz", 'install': {'method': 'pip', 'option_str': None, 'dict_extra_env': None}}, - 'HTTPLIB2': {'setup': 'httplib2','url': 'https://pypi.python.org/packages/source/h/httplib2/httplib2-0.8.tar.gz', 'local':"httplib2-0.8.tar.gz", 'install': {'method': 'pip', 'option_str': None, 'dict_extra_env': None}}, - 'LOCKFILE': {'setup': 'lockfile','url': 'https://pypi.python.org/packages/source/l/lockfile/lockfile-0.9.1.tar.gz', 'local':"lockfile-0.9.1.tar.gz", 'install': {'method': 'pip', 'option_str': None, 'dict_extra_env': None}}, - 'OAUTH2': {'setup': 'oauth2','url': 'https://pypi.python.org/packages/source/o/oauth2/oauth2-1.5.211.tar.gz', 'local':"oauth2-1.5.211.tar.gz", 'install': {'method': 'pip', 'option_str': None, 'dict_extra_env': None}}, - 'OAUTHLIB': {'setup': 'oauthlib','url': 'https://github.com/idan/oauthlib/archive/0.6.0.tar.gz', 'local':"oauthlib-0.6.0.tar.gz", 'install': {'method': 'pip', 'option_str': None, 'dict_extra_env': None}}, - 'PSYCOPG2': {'setup': 'psycopg2','url': 'psycopg2-2.5.1.tar.gz', 'local':"psycopg2-2.5.1.tar.gz", 'install': {'method': 'pip', 'option_str': None, 'dict_extra_env': None}}, - 'DAEMON': {'setup': 'python-daemon','url': 'https://pypi.python.org/packages/source/p/python-daemon/python-daemon-1.5.5.tar.gz', 'local':"python-daemon-1.5.5.tar.gz", 'install': {'method': 'pip', 'option_str': None, 'dict_extra_env': None}}, - 'DATEUTIL': {'setup': 'python-dateutil','url': 'https://pypi.python.org/packages/source/p/python-dateutil/python-dateutil-2.1.tar.gz', 'local':"python-dateutil-2.1.tar.gz", 'install': {'method': 'pip', 'option_str': None, 'dict_extra_env': None}}, - 'PYTZ': {'setup': 'pytz','url': 'https://pypi.python.org/packages/source/p/pytz/pytz-2013d.tar.gz', 'local':"pytz-2013d.tar.gz", 'install': {'method': 'pip', 'option_str': None, 'dict_extra_env': None}}, - 'REQUESTS': {'setup': 'requests', 'url':'https://github.com/kennethreitz/requests/archive/v2.6.0.tar.gz', 'local':'requests-2.6.0.tar.gz', 'install' : {'method':'pip', 'option_str': None, 'dict_extra_env': None}}, - 'REQUESTS-OAUTHLIB': {'setup': 'requests-oauthlib', 'url':'https://github.com/requests/requests-oauthlib/archive/v0.3.3.tar.gz', 'local':'requests-oauthlib-0.3.3.tar.gz', 'install' : {'method':'pip', 'option_str': None, 'dict_extra_env': None}}, - 'SIMPLEJSON': {'setup': 'simplejson','url':'https://pypi.python.org/packages/source/s/simplejson/simplejson-3.3.0.tar.gz', 'local': 'simplejson-3.3.0.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.4.1.tar.gz', 'local': 'six-1.4.1.tar.gz', 'install' : {'method':'pip', 'option_str': None, 'dict_extra_env': None}}, - 'TWITTER' : {'setup':'twitter', 'url':'https://pypi.python.org/packages/source/t/twitter/twitter-1.10.0.tar.gz', 'local': 'twitter-1.10.0.tar.gz', 'install' : {'method':'pip', 'option_str': None, 'dict_extra_env': None}}, - 'TWITTER-TEXT' : {'setup':'twitter-text-py', 'url':'https://github.com/dryan/twitter-text-py/archive/v2.0.0.tar.gz', 'local': 'twitter-text-py-2.0.0.tar.gz', 'install' : {'method':'pip', 'option_str': None, 'dict_extra_env': None}}, - 'WSGIREF': {'setup': 'wsgiref','url': 'https://pypi.python.org/packages/source/w/wsgiref/wsgiref-0.1.2.zip', 'local':"wsgiref-0.1.2.zip", 'install': {'method': 'pip', 'option_str': None, 'dict_extra_env': None}}, + 'BLESSINGS': {'setup': 'blessings','url': 'https://pypi.python.org/packages/source/b/blessings/blessings-1.6.tar.gz', 'local':"blessings-1.6.tar.gz", 'install': {'method': 'pip', 'option_str': None, 'dict_extra_env': None}}, + 'HTTPLIB2': {'setup': 'httplib2','url': 'https://pypi.python.org/packages/source/h/httplib2/httplib2-0.9.2.tar.gz', 'local':"httplib2-0.9.2.tar.gz", 'install': {'method': 'pip', 'option_str': None, 'dict_extra_env': None}}, + 'LOCKFILE': {'setup': 'lockfile','url': 'https://pypi.python.org/packages/source/l/lockfile/lockfile-0.12.2.tar.gz', 'local':"lockfile-0.12.2.tar.gz", 'install': {'method': 'pip', 'option_str': None, 'dict_extra_env': None}}, + 'OAUTH2': {'setup': 'oauth2','url': 'https://pypi.python.org/packages/source/o/oauth2/oauth2-1.9.0.post1.tar.gz', 'local':"oauth2-1.9.0.post1.tar.gz", 'install': {'method': 'pip', 'option_str': None, 'dict_extra_env': None}}, + 'OAUTHLIB': {'setup': 'oauthlib','url': 'https://github.com/idan/oauthlib/archive/1.0.3.tar.gz', 'local':"oauthlib-1.0.3.tar.gz", 'install': {'method': 'pip', 'option_str': None, 'dict_extra_env': None}}, + 'PSYCOPG2': {'setup': 'psycopg2','url': 'http://initd.org/psycopg/tarballs/PSYCOPG-2-6/psycopg2-2.6.1.tar.gz', 'local':"psycopg2-2.6.1.tar.gz", 'install': {'method': 'pip', 'option_str': None, 'dict_extra_env': None}}, + 'DAEMON': {'setup': 'python-daemon','url': 'https://pypi.python.org/packages/source/p/python-daemon/python-daemon-2.1.1.tar.gz', 'local':"python-daemon-2.1.1.tar.gz", 'install': {'method': 'pip', 'option_str': None, 'dict_extra_env': None}}, + 'DATEUTIL': {'setup': 'python-dateutil','url': 'https://pypi.python.org/packages/source/p/python-dateutil/python-dateutil-2.5.0.tar.gz', 'local':"python-dateutil-2.5.0.tar.gz", 'install': {'method': 'pip', 'option_str': None, 'dict_extra_env': None}}, + 'PYTZ': {'setup': 'pytz','url': 'https://pypi.python.org/packages/source/p/pytz/pytz-2016.1.tar.gz', 'local':"pytz-2016.1.tar.gz", 'install': {'method': 'pip', 'option_str': None, 'dict_extra_env': None}}, + 'REQUESTS': {'setup': 'requests', 'url':'https://github.com/kennethreitz/requests/archive/v2.9.1.tar.gz', 'local':'requests-2.9.1.tar.gz', 'install' : {'method':'pip', 'option_str': None, 'dict_extra_env': None}}, + 'REQUESTS-OAUTHLIB': {'setup': 'requests-oauthlib', 'url':'https://github.com/requests/requests-oauthlib/archive/v0.6.1.tar.gz', 'local':'requests-oauthlib-0.6.1.tar.gz', 'install' : {'method':'pip', 'option_str': None, 'dict_extra_env': None}}, + 'SIMPLEJSON': {'setup': 'simplejson','url':'https://pypi.python.org/packages/source/s/simplejson/simplejson-3.8.2.tar.gz', 'local': 'simplejson-3.8.2.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.10.0.tar.gz', 'local': 'six-1.10.0.tar.gz', 'install' : {'method':'pip', 'option_str': None, 'dict_extra_env': None}}, + 'TWITTER' : {'setup':'twitter', 'url':'https://pypi.python.org/packages/source/t/twitter/twitter-1.17.1.tar.gz', 'local': 'twitter-1.17.1.tar.gz', 'install' : {'method':'pip', 'option_str': None, 'dict_extra_env': None}}, + 'TWITTER-TEXT' : {'setup':'twitter-text-py', 'url':'https://github.com/dryan/twitter-text-py/archive/2.0.2.tar.gz', 'local': 'twitter-text-py-2.0.2.tar.gz', 'install' : {'method':'pip', 'option_str': None, 'dict_extra_env': None}}, + 'WSGIREF': {'setup': 'wsgiref','url': 'https://pypi.python.org/packages/source/w/wsgiref/wsgiref-0.1.2.zip', 'local':"wsgiref-0.1.2.zip", 'install': {'method': 'pip', 'option_str': None, 'dict_extra_env': None}}, + 'PYQUERY': {'setup': 'pyquery','url': 'https://github.com/gawel/pyquery/archive/1.2.11.tar.gz', 'local':"pyquery-1.2.11.tar.gz", 'install': {'method': 'pip', 'option_str': None, 'dict_extra_env': None}}, + 'CSSSELECT': {'setup': 'cssselect','url': 'https://pypi.python.org/packages/source/c/cssselect/cssselect-0.9.1.tar.gz', 'local':"cssselect-0.9.1.tar.gz", 'install': {'method': 'pip', 'option_str': None, 'dict_extra_env': None}}, + 'DOCUTILS': {'setup': 'docutils','url': 'https://pypi.python.org/packages/source/d/docutils/docutils-0.12.tar.gz', 'local':"docutils-0.12.tar.gz", 'install': {'method': 'pip', 'option_str': None, 'dict_extra_env': None}}, + 'SELENIUM': {'setup': 'selenium','url': 'https://pypi.python.org/packages/source/s/selenium/selenium-2.53.1.tar.gz', 'local':"selenium-2.53.1.tar.gz", 'install': {'method': 'pip', 'option_str': None, 'dict_extra_env': None}}, } -if system_str == "Darwin": +if system_str == "Darwin": lxml_options = {'STATIC_DEPS': 'true', 'LIBXML2_VERSION': '2.9.1', 'LIBXSLT_VERSION': '1.1.28', 'LIBICONV_VERSION': '1.14'} else: lxml_options = None URLS.update({ - 'LXML': {'setup': 'lxml', 'url':"lxml-3.2.2.tar.bz2", 'local':"lxml-3.2.2.tar.bz2", 'install': {'method': 'pip', 'option_str': None, 'dict_extra_env': lxml_options}}, + 'LXML': {'setup': 'lxml', 'url':"lxml-3.5.0.tar.bz2", 'local':"lxml-3.5.0.tar.bz2", 'install': {'method': 'pip', 'option_str': None, 'dict_extra_env': lxml_options}}, }) @@ -58,18 +62,18 @@ 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() if url_dict.get('install', {}).get('method','pip') == 'pip-req': get_base_path = self.get_run_res_base_path else: - get_base_path = self.get_src_base_path + get_base_path = self.get_src_base_path if not url_dict['url'].startswith("http://"): url_dict_copy['url'] = get_base_path(url_dict['url']) url_dict_copy['local'] = get_base_path(url_dict['local']) @@ -82,7 +86,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', @@ -99,7 +103,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") @@ -109,15 +113,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, @@ -127,19 +131,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) @@ -148,15 +152,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, @@ -164,31 +168,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), @@ -198,14 +202,14 @@ install_libjpeg = gen_install_comp_lib("libjpeg", "LIBJPEG", ['--enable-shared']) install_zlib = gen_install_comp_lib("zlib", "ZLIB", []) - + 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): @@ -217,8 +221,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': @@ -272,18 +276,18 @@ 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 print(repr(Logger)) 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') @@ -291,23 +295,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): @@ -326,28 +330,28 @@ 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) + extra_env['TMPDIR'] = os.path.abspath(tmp_dir) #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