jocondelab: comparison virtualenv/res/lib/lib_create

equal deleted inserted replaced

-:92b880e5901c
+:9b02cc842a69
 system_str = platform.system()
 URLS = {
 #'': {'setup': '', 'url':'', 'local':''},
 'DISTRIBUTE': {'setup': 'distribute', 'url':'http://pypi.python.org/packages/source/d/distribute/distribute-0.6.34.tar.gz', 'local':"distribute-0.6.34.tar.gz", 'install': {'method': 'pip', 'option_str': None, 'dict_extra_env': None}},
-'DJANGO': {'setup': 'django', 'url': 'https://github.com/IRI-Research/django/archive/1.5.5+IRI.tar.gz', 'local':"django-1.5.5-IRI.tar.gz", 'install': {'method': 'pip', 'option_str': None, 'dict_extra_env': None}},
+'DJANGO': {'setup': 'django', 'url': 'https://github.com/IRI-Research/django/archive/1.6.1+IRI.tar.gz', 'local':"Django-1.6.1.tar.bz2", 'install': {'method': 'pip', 'option_str': None, 'dict_extra_env': None}},
 'SIX' : {'setup':'six', 'url':'https://pypi.python.org/packages/source/s/six/six-1.3.0.tar.gz', 'local': 'six-1.3.0.tar.gz', 'install' : {'method':'pip', 'option_str': None, 'dict_extra_env': None}},
 'DJANGO-EXTENSIONS': { 'setup': 'django-extensions', 'url':'https://github.com/django-extensions/django-extensions/archive/1.1.1.tar.gz', 'local':"django-extensions-1.1.1.tar.gz", 'install': {'method': 'pip', 'option_str': None, 'dict_extra_env': None}},
 'SOUTH': { 'setup': 'South', 'url':'http://www.aeracode.org/releases/south/south-0.7.6.tar.gz', 'local':"south-0.7.6.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/toastdriven/django-haystack/archive/v2.0.0.tar.gz', 'local': 'django-haystack-2.0.0.tar.gz', 'install':{'method':'pip', 'option_str': None, 'dict_extra_env': None}},
 'PYELASTICSEARCH': {'setup': 'pyelasticsearch', 'url':'https://github.com/rhec/pyelasticsearch/archive/0.5.tar.gz', 'local':'pyelasticsearch-0.5.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.1.tar.gz', 'local': 'python-dateutil-2.1.tar.gz', 'install' : {'method':'pip', 'option_str': None, 'dict_extra_env': None}},
 'RDFLIB' : {'setup':'rdflib', 'url':'https://github.com/RDFLib/rdflib/archive/4.0.1.tar.gz', 'local': 'rdflib-4.0.1.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-0.8.1.tar.gz', 'local': 'SQLAlchemy-0.8.1.tar.gz', 'install' : {'method':'pip', 'option_str': None, 'dict_extra_env': None}},
-'RDFLIB-SQLALCHEMY' : {'setup':'rdflib-sqlalchemy', 'url':'https://github.com/editorsnotes/rdflib-sqlalchemy/archive/9996e2fd7cdd87e35384c529196407808c9f60ee.tar.gz', 'local': 'rdflib-sqlalchemy-9996e2fd7cdd87e35384c529196407808c9f60ee.tar.gz', 'install' : {'method':'pip', 'option_str': None, 'dict_extra_env': None}},
+'RDFLIB-SQLALCHEMY' : {'setup':'rdflib-sqlalchemy', 'url':'https://github.com/editorsnotes/rdflib-sqlalchemy/archive/9996e2fd7cdd87e35384c529196407808c9f60ee.tar.gz', 'local': 'rdflib-sqlalchemy-0.2.dev.tar.gz', 'install' : {'method':'pip', 'option_str': None, 'dict_extra_env': None}},
 'REQUESTS': {'setup': 'requests', 'url':'https://github.com/kennethreitz/requests/archive/v1.2.3.tar.gz', 'local':'requests-1.2.3.tar.gz', 'install' : {'method':'pip', 'option_str': None, 'dict_extra_env': None}},
 'SIMPLEJSON': {'setup': 'simplejson','url':'https://github.com/simplejson/simplejson/archive/v3.3.0.tar.gz', 'local': 'simplejson-3.3.0.tar.gz', 'install' : {'method':'pip', 'option_str': None, 'dict_extra_env': None}},
 'ISODATE': {'setup': 'isodate','url':'https://pypi.python.org/packages/source/i/isodate/isodate-0.4.9.tar.gz', 'local': 'isodate-0.4.9.tar.gz', 'install' : {'method':'pip', 'option_str': None, 'dict_extra_env': None}},
 'PYPARSING': {'setup': 'pyparsing','url':'http://downloads.sourceforge.net/project/pyparsing/pyparsing/pyparsing-1.5.7/pyparsing-1.5.7.tar.gz', 'local': 'pyparsing-1.5.7.tar.gz', 'install' : {'method':'pip', 'option_str': None, 'dict_extra_env': None}},
 'SPARQLWRAPPER': {'setup': 'sparqlwrapper','url':'http://downloads.sourceforge.net/project/sparql-wrapper/sparql-wrapper-python/1.5.2/SPARQLWrapper-1.5.2.tar.gz', 'local': 'SPARQLWrapper-1.5.2.tar.gz', 'install' : {'method':'pip', 'option_str': None, 'dict_extra_env': None}},
-'HTML5LIB': {'setup': 'html5lib','url':'https://github.com/html5lib/html5lib-python/archive/1.0b1.tar.gz', 'local': 'html5lib-python-1.0b1.tar.gz', 'install' : {'method':'pip', 'option_str': None, 'dict_extra_env': None}},
+'HTML5LIB': {'setup': 'html5lib','url':'https://github.com/html5lib/html5lib-python/archive/1.0b1.tar.gz', 'local': 'html5lib-1.0b1.tar.gz', 'install' : {'method':'pip', 'option_str': None, 'dict_extra_env': None}},
-'WIKITOOLS' : { 'setup': 'wikitools', 'url': 'wikitools.tar.bz2', 'local': 'wikitools.tar.bz2', 'install': {'method': 'pip', 'option_str': None, 'dict_extra_env': None}},
+'WIKITOOLS' : { 'setup': 'wikitools', 'url': 'wikitools-1.1.1.tar.bz2', 'local': 'wikitools-1.1.1.tar.bz2', 'install': {'method': 'pip', 'option_str': None, 'dict_extra_env': None}},
-'MPTT' : { 'setup': 'django-mptt', 'url': 'https://codeload.github.com/django-mptt/django-mptt/tar.gz/master', 'local': 'django-mptt-master.tar.bz2', 'install': {'method': 'pip', 'option_str': None, 'dict_extra_env': None}},
+'MPTT' : { 'setup': 'django-mptt', 'url': 'https://codeload.github.com/django-mptt/django-mptt/tar.gz/master', 'local': 'django-mptt-0.5.-dev.tar.bz2', 'install': {'method': 'pip', 'option_str': None, 'dict_extra_env': None}},
 }
 if system_str == 'Windows':
 size = 8 * struct.calcsize("P")
 })
 class ResourcesEnv(object):
-def __init__(self, src_base, urls, normal_installs):
+def __init__(self, src_base, run_base, urls, normal_installs):
 self.src_base = src_base
+self.run_base = run_base
 self.URLS = {}
 self.__init_url(urls)
 self.NORMAL_INSTALL = normal_installs
 def get_src_base_path(self, fpath):
 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("\\","/")
 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
 if not url_dict['url'].startswith("http://"):
-url_dict_copy['url'] = self.get_src_base_path(url_dict['url'])
+url_dict_copy['url'] = get_base_path(url_dict['url'])
-url_dict_copy['local'] = self.get_src_base_path(url_dict['local'])
+url_dict_copy['local'] = get_base_path(url_dict['local'])
 self.__add_package_def(key, url_dict_copy )
 def ensure_dir(dir, logger):
 logger.notify('Check directory %s' % dir)
 if not os.path.exists(dir):
 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, Logger, call_subprocess, normal_installs, options_to_add=None, urls= None):
+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, all_urls, normal_installs)
+res_env = ResourcesEnv(src_base, run_base, all_urls, normal_installs)
 def filter_python_develop(line):
 if not line.strip():
 return Logger.DEBUG
 for prefix in ['Searching for', 'Reading ', 'Best match: ', 'Processing ',
 if line.startswith(prefix):
 return Logger.DEBUG
 return Logger.NOTIFY
-def normal_install(key, method, option_str, extra_env, res_source_key, home_dir, tmp_dir, res_env, logger, call_subprocess):
+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_env.URLS[key][res_source_key],method))
+logger.notify("Install %s from %s with %s" % (key,res_path,method))
 if method == 'pip':
 if sys.platform == 'win32':
-args = [os.path.abspath(os.path.join(home_dir, 'Scripts', 'pip')), 'install', res_env.URLS[key][res_source_key]]
+args = [os.path.abspath(os.path.join(home_dir, 'Scripts', 'pip')), 'install', res_path]
 else:
-args = [os.path.abspath(os.path.join(home_dir, 'bin', 'pip')), 'install', res_env.URLS[key][res_source_key]]
+args = [os.path.abspath(os.path.join(home_dir, 'bin', 'pip')), 'install', res_path]
 if option_str :
-args.insert(4,option_str)
+args.append(option_str)
-if key == 'local':
+if res_source_key == 'local':
 if extra_env is None:
 extra_env = {}
-extra_env.append("PIP_DOWNLOAD_CACHE", res_env.get_src_base_path(""))
+extra_env["PIP_DOWNLOAD_CACHE"] = res_env.get_src_base_path("")
+args.insert(2, '-f')
+args.insert(3, res_env.get_src_base_path(""))
+args.insert(4, '--no-index')
+logger.notify("Install %s from %s with %s args %s " % (key,res_path,method, repr(args)))
+call_subprocess(args,
+cwd=os.path.abspath(tmp_dir),
+filter_stdout=filter_python_develop,
+show_stdout=True,
+extra_env=extra_env)
+if method == 'pip-req':
+if sys.platform == 'win32':
+args = [os.path.abspath(os.path.join(home_dir, 'Scripts', 'pip')), 'install', '-r', res_path]
+else:
+args = [os.path.abspath(os.path.join(home_dir, 'bin', 'pip')), 'install', '-r', res_path]
+if option_str :
+args.append(option_str)
+if res_source_key == 'local':
+if extra_env is None:
+extra_env = {}
+extra_env["PIP_DOWNLOAD_CACHE"] = res_env.get_src_base_path("")
+args.insert(2, '-f')
+args.insert(3, res_env.get_src_base_path(""))
+args.insert(4, '--no-index')
+logger.notify("Install %s from %s with %s args %s " % (key,res_path,method, repr(args)))
 call_subprocess(args,
 cwd=os.path.abspath(tmp_dir),
 filter_stdout=filter_python_develop,
 show_stdout=True,
 extra_env=extra_env)
 else:
 if sys.platform == 'win32':
-args = [os.path.abspath(os.path.join(home_dir, 'Scripts', 'easy_install')), res_env.URLS[key][res_source_key]]
+args = [os.path.abspath(os.path.join(home_dir, 'Scripts', 'easy_install')), res_path]
 else:
-args = [os.path.abspath(os.path.join(home_dir, 'bin', 'easy_install')), res_env.URLS[key][res_source_key]]
+args = [os.path.abspath(os.path.join(home_dir, 'bin', 'easy_install')), res_path]
 if option_str :
 args.insert(1,option_str)
 call_subprocess(args,
 cwd=os.path.abspath(tmp_dir),
 filter_stdout=filter_python_develop,
 ignore_packages = options.ignore_packages.split(",")
 logger.indent += 2
 try:
 for key in res_env.NORMAL_INSTALL:
-if key not in res_env.URLS:
+install_options = None
-logger.notify("%s not found in def : passing" % (key,))
+if isinstance(key, dict):
-install_options = res_env.URLS[key].get('install', None)
+install_options = key.get('install', default_install_options)
+install_options['method'] = 'pip-req'
+res_path = res_env.get_run_res_base_path(key['requirement'])
+else:
+if key not in res_env.URLS:
+logger.notify("%s not found in def : passing" % (key,))
+install_options = res_env.URLS[key].get('install', None)
+res_path = res_env.URLS[key][res_source_key]
 if install_options is None:
 install_options = default_install_options
 method = install_options.get('method', default_install_options['method'])
 option_str = install_options.get('option_str', default_install_options['option_str'])
 extra_env = install_options.get('dict_extra_env', default_install_options['dict_extra_env'])
 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']:
 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, method, option_str, extra_env, res_source_key, home_dir, tmp_dir, res_env, logger, call_subprocess)
+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.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:
-pass
+return
 for opt in options_to_add:
 test_opt = opt.split('=',1)[0]
 #if not hasattr(options,test_opt) or getattr(options, test_opt) is None:
 setattr(options, test_opt,opt.split('=',1)[1] if "=" in opt else True)
 return adjust_options, extend_parser, after_install

changeset 237	9b02cc842a69
parent 159	d3d6f0289c8f
child 329	95d84db2c351