hdabo: comparison virtualenv/res/lib/lib_create

equal deleted inserted replaced

-:1473ba25af1f
+:7bc38c7d6cf9
 system_str = platform.system()
 URLS = {
 #'': {'setup': '', 'url':'', 'local':''},
 'DISTRIBUTE': {'setup': 'distribute', 'url':'http://pypi.python.org/packages/source/d/distribute/distribute-0.6.24.tar.gz', 'local':"distribute-0.6.24.tar.gz", 'install': {'method': 'pip', 'option_str': None, 'dict_extra_env': None}},
-'DJANGO': {'setup': 'django', 'url': 'http://www.djangoproject.com/download/1.6.5/tarball/', 'local':"Django-1.6.5.tar.gz", 'install': {'method': 'pip', 'option_str': None, 'dict_extra_env': None}},
+'DJANGO': {'setup': 'django', 'url': 'https://www.djangoproject.com/download/1.6.8/tarball/', 'local':"Django-1.6.8.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/tarball/1.3.7', 'local':"django-extensions-1.3.7.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.4.4.tar.gz', 'local':"django-extensions-1.4.4.tar.gz", 'install': {'method': 'pip', 'option_str': None, 'dict_extra_env': None}},
-'REGISTRATION': { 'setup': 'registration', 'url':'https://bitbucket.org/LinnTroll/django-registration-1.5/get/c71d5b8e2735.zip', 'local':"django-registration-1.5-c71d5b8e2735.zip", 'install': {'method': 'pip', 'option_str': None, 'dict_extra_env': None}},
+'REGISTRATION': { 'setup': 'django-registration', 'url':'https://github.com/macropin/django-registration/archive/v1.1.tar.gz', 'local':"django-registration-1.1.tar.gz", 'install': {'method': 'pip', 'option_str': None, 'dict_extra_env': None}},
-'HTTPLIB2': { 'setup': 'python-httplib2', 'url':'http://code.google.com/p/httplib2/downloads/detail?name=httplib2-0.7.4.tar.gz&can=2&q=', 'local':"httplib2-0.7.4.tar.gz", 'install': {'method': 'pip', 'option_str': None, 'dict_extra_env': None}},
+'HTTPLIB2': { 'setup': 'httplib2', 'url':'https://github.com/jcgregorio/httplib2/archive/v0.9.tar.gz', 'local':"httplib2-0.7.4.tar.gz", 'install': {'method': 'pip', 'option_str': None, 'dict_extra_env': None}},
-'SOUTH': { 'setup': 'South', 'url':'http://www.aeracode.org/releases/south/south-0.8.4.tar.gz', 'local':"south-0.8.4.tar.gz", 'install': {'method': 'pip', 'option_str': None, 'dict_extra_env': None}},
+'SOUTH': { 'setup': 'South', 'url':'http://www.aeracode.org/releases/south/south-1.0.1.tar.gz', 'local':"South-1.0.1.tar.gz", 'install': {'method': 'pip', 'option_str': None, 'dict_extra_env': None}},
-'PYCRYPTO': {'setup': 'pycrypto', 'url':'https://ftp.dlitz.net/pub/dlitz/crypto/pycrypto/pycrypto-2.6.tar.gz', 'local':'pycrypto-2.6.tar.gz', 'install': {'method': 'pip', 'option_str': None, 'dict_extra_env': None}},
+'PYCRYPTO': {'setup': 'pycrypto', 'url':'https://github.com/dlitz/pycrypto/archive/v2.6.1.tar.gz', 'local':'pycrypto-2.6.1.tar.gz', 'install': {'method': 'pip', 'option_str': None, 'dict_extra_env': None}},
 'SSH': {'setup': 'ssh', 'url':'http://pypi.python.org/packages/source/s/ssh/ssh-1.7.14.tar.gz#md5=4cdd0549ef4699bd67b96264d3b21427', 'local':'ssh-1.7.14.tar.gz', 'install': {'method': 'pip', 'option_str': None, 'dict_extra_env': None}},
 'FABRIC': {'setup': 'fabric', 'url':'https://github.com/fabric/fabric/tarball/1.4.2', 'local':'fabric-1.4.2.tar.gz', 'install': {'method': 'pip', 'option_str': None, 'dict_extra_env': None}},
 'MERCURIAL': {'setup': 'mercurial', 'url':'http://mercurial.selenic.com/release/mercurial-2.2.3.tar.gz', 'local':'mercurial-2.2.3.tar.gz', 'install': {'method': 'pip', 'option_str': None, 'dict_extra_env': None}},
-'HAYSTACK': {'setup': 'django-haystack', 'url': 'https://github.com/toastdriven/django-haystack/archive/v2.1.0.tar.gz', 'local': 'django-haystack-2.1.0.tar.gz', 'install':{'method':'pip', 'option_str': None, 'dict_extra_env': None}},
+'HAYSTACK': {'setup': 'django-haystack', 'url': 'https://github.com/toastdriven/django-haystack/archive/v2.2.0.tar.gz', 'local': 'django-haystack-2.2.0.tar.gz', 'install':{'method':'pip', 'option_str': None, 'dict_extra_env': None}},
 'WHOOSH': {'setup': 'whoosh', 'url':'https://pypi.python.org/packages/source/W/Whoosh/Whoosh-2.5.7.tar.gz', 'local':'whoosh-2.5.7.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': 'https://github.com/alexz-enwp/wikitools/archive/1.2.tar.gz', 'local': 'wikitools-1.2.tar.gz', 'install': {'method': 'pip', 'option_str': None, 'dict_extra_env': None}},
-'ISODATE' : {'setup': 'isodate', 'url': 'http://pypi.python.org/packages/source/i/isodate/isodate-0.4.8.tar.gz', 'local': 'isodate-0.4.8.tar.gz', 'install' : {'method': 'pip', 'option_str': None, 'dict_extra_env': None}},
+'ISODATE' : {'setup': 'isodate', 'url': 'http://pypi.python.org/packages/source/i/isodate/isodate-0.5.0.tar.gz', 'local': 'isodate-0.5.0.tar.gz', 'install' : {'method': 'pip', 'option_str': None, 'dict_extra_env': None}},
-'RDFLIB' : { 'setup': 'rdflib', 'url': 'http://rdflib.googlecode.com/files/rdflib-3.2.0.tar.gz', 'local': 'rdflib-3.2.0.tar.gz', 'install': {'method': 'pip', 'option_str': None, 'dict_extra_env': None}},
+'RDFLIB' : { 'setup': 'rdflib', 'url': 'https://github.com/RDFLib/rdflib/archive/4.1.2.tar.gz', 'local': 'rdflib-4.1.2.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.0/SPARQLWrapper-1.5.0.tar.gz', 'local' : 'SPARQLWrapper-1.5.0.tar.gz', 'install': {'method': 'pip', 'option_str': None, 'dict_extra_env': None}},
+'SPARQLWRAPPER' : { 'setup': 'SPARQLWrapper', 'url': 'https://github.com/RDFLib/sparqlwrapper/archive/1.6.4.tar.gz', 'local' : 'SPARQLWrapper-1.6.4.tar.gz', 'install': {'method': 'pip', 'option_str': None, 'dict_extra_env': None}},
-'REQUESTS' : { 'setup': 'requests', 'url': 'https://github.com/kennethreitz/requests/archive/v2.3.0.tar.gz', 'local' : 'requests-2.3.0.tar.gz', 'install': {'method': 'pip', 'option_str': None, 'dict_extra_env': None}},
+'REQUESTS' : { 'setup': 'requests', 'url': 'https://github.com/kennethreitz/requests/archive/v2.4.3.tar.gz', 'local' : 'requests-2.4.3.tar.gz', 'install': {'method': 'pip', 'option_str': None, 'dict_extra_env': None}},
-'PYELASTICSEARCH' : { 'setup': 'pyelasticsearch', 'url': 'https://github.com/rhec/pyelasticsearch/archive/0.6.1.tar.gz', 'local' : 'pyelasticsearch-0.6.1.tar.gz', 'install': {'method': 'pip', 'option_str': None, 'dict_extra_env': None}},
+'ELASTICSEARCH' : { 'setup': 'elasticsearch', 'url': 'https://github.com/elasticsearch/elasticsearch-py/archive/1.2.0.tar.gz', 'local' : 'elasticsearch-1.2.0.tar.gz', 'install': {'method': 'pip', 'option_str': None, 'dict_extra_env': None}},
-'PIL' : { 'setup': 'pil', 'url': 'http://effbot.org/downloads/Imaging-1.1.7.tar.gz', 'local' : 'Imaging-1.1.7.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.3.tar.gz', 'local' : 'pyparsing-2.0.3.tar.gz', 'install': {'method': 'pip', 'option_str': None, 'dict_extra_env': None}},
-'EASYTHUMBNAIL' : { 'setup': 'easythumbnail', 'url': 'https://github.com/SmileyChris/easy-thumbnails/archive/2.0.1.tar.gz', 'local' : 'easy-thumbnails-2.0.1.tar.gz', 'install': {'method': 'pip', 'option_str': None, 'dict_extra_env': None}},
+'PIL' : { 'setup': 'pil', 'url': 'http://effbot.org/downloads/Imaging-1.1.7.tar.gz', 'local' : 'Imaging-1.1.7.tar.gz', 'install': {'method': 'pip', 'option_str': None, 'dict_extra_env': None}},
+'EASYTHUMBNAIL' : { 'setup': 'easy-thumbnail', 'url': 'https://github.com/SmileyChris/easy-thumbnails/archive/2.2.tar.gz', 'local' : 'easy-thumbnails-2.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.8.0.tar.gz', 'local' : 'six-1.8.0.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}},
+'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}},
+'HTTPLIB2': { 'setup': 'urllib3', 'url':'https://github.com/shazow/urllib3/archive/1.9.1.tar.gz', 'local':"urllib3-1.9.1.tar.gz", 'install': {'method': 'pip', 'option_str': None, 'dict_extra_env': None}},
 }
 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.0.14.win32-py2.6-pg8.4.3-release.zip', 'local':"psycopg2-2.0.14.win32-py2.6-pg8.4.3-release.zip", '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.6.exe', 'local':"PIL-1.1.7.win32-py2.6.exe", 'install': {'method': 'easy_install', 'option_str': None, 'dict_extra_env': None}},
 'LXML': {'setup': 'lxml', 'url': 'http://pypi.python.org/packages/2.6/l/lxml/lxml-2.2.2-py2.6-win32.egg', 'local':"lxml-2.2.2-py2.6-win32.egg", 'install': {'method': 'easy_install', 'option_str': None, 'dict_extra_env': None}},
 'PYYAML' : { 'setup': 'PyYAML', 'url': 'http://pyyaml.org/download/pyyaml/PyYAML-3.09.win32-py2.6.exe', 'local': 'PyYAML-3.09.win32-py2.6.exe', 'install': {'method': 'easy_install', 'option_str': None, 'dict_extra_env': None}},
 'PYSTEMMER' : { 'setup': 'pystemmer', 'url': 'PyStemmer_compiled_for_pc.zip', 'local': 'PyStemmer_compiled_for_pc.zip'},
 })
 else:
 if system_str == "Darwin":
-lxml_options = {'STATIC_DEPS': 'true', 'LIBXML2_VERSION': '2.9.1', 'LIBXSLT_VERSION': '1.1.28', 'LIBICONV_VERSION': '1.14'}
+lxml_options = {'STATIC_DEPS': 'true', 'LIBXML2_VERSION': '2.9.2', 'LIBXSLT_VERSION': '1.1.28', 'LIBICONV_VERSION': '1.14'}
-lxml_method = 'easy_install'
-mysql_method = 'install_mysql'
 else:
 lxml_options = None
-lxml_method = 'pip'
-mysql_method = 'pip'
 URLS.update({
-'PSYCOPG2': {'setup': 'psycopg2','url': 'https://pypi.python.org/packages/source/p/psycopg2/psycopg2-2.5.3.tar.gz', 'local':"psycopg2-2.5.3.tar.gz", 'install': {'method': 'pip', 'option_str': None, 'dict_extra_env': None}},
+'PSYCOPG2': {'setup': 'psycopg2','url': 'http://initd.org/psycopg/tarballs/PSYCOPG-2-5/psycopg2-2.5.4.tar.gz', 'local':"psycopg2-2.5.4.tar.gz", 'install': {'method': 'pip', 'option_str': None, 'dict_extra_env': None}},
 'PIL': {'setup': 'pil', 'url': 'http://effbot.org/downloads/Imaging-1.1.7.tar.gz', 'local':"Imaging-1.1.7.tar.gz", 'install': {'method': 'easy_install', 'option_str': None, 'dict_extra_env': None}},
-'LXML': {'setup': 'lxml', 'url':"lxml-3.2.1.tar.bz2", 'local':"lxml-3.2.1.tar.bz2", 'install': {'method': lxml_method, 'option_str': None, 'dict_extra_env': lxml_options}},
+'LXML': {'setup': 'lxml', 'url':"lxml-3.4.0.tar.gz", 'local':"lxml-3.4.0.tar.gz", 'install': {'method': 'pip', 'option_str': None, 'dict_extra_env': lxml_options}},
-'PYYAML' : { 'setup': 'PyYAML', 'url': 'http://pyyaml.org/download/pyyaml/PyYAML-3.09.tar.gz', 'local': 'PyYAML-3.09.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}},
 })
 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):
 logger.notify('Creating directory %s' % dir)
 os.makedirs(dir)
 def extend_parser(parser):
 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.0.14-py2.6.egg-info'), os.path.abspath(os.path.join(home_dir, 'Lib/site-packages', 'site-packages')))
+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]]
-if option_str :
-args.insert(4,option_str)
-call_subprocess(args,
-cwd=os.path.abspath(tmp_dir),
-filter_stdout=filter_python_develop,
-show_stdout=True,
-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)
-if m:
-return int(m.group(1))
-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)
-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,
-show_stdout=True)
 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)
 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(libname + " configure")
+logger.notify(lib_name + " configure in " + lib_src_path)
-call_subprocess(['configure', '--prefix='+os.path.abspath(home_dir)] + configure_options,
+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(libname + " make")
+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(libname + "make install")
+logger.notify(lib_name + "make install in " + lib_src_path)
 call_subprocess(['make', 'install'],
 cwd=os.path.abspath(lib_src_path),
 filter_stdout=filter_python_develop,
 show_stdout=True)
 return install_lib
 install_libjpeg = gen_install_comp_lib("libjpeg", "LIBJPEG", ['--enable-shared'])
 install_zlib = gen_install_comp_lib("zlib", "ZLIB", [])
 def install_pystemmer(option_str, extra_env, res_source_key, home_dir, lib_dir, tmp_dir, src_dir, res_env, logger, call_subprocess, filter_python_develop):
 zf.close()
 shutil.copy(os.path.join(pystemmer_base_path, 'Stemmer.pyd'), os.path.abspath(os.path.join(home_dir, 'Lib/site-packages')))
 shutil.copy(os.path.join(pystemmer_base_path, 'PyStemmer-1.0.1-py2.6.egg-info'), os.path.abspath(os.path.join(home_dir, 'Lib/site-packages')))
+#osx_extra_env = {'ARCHFLAGS': '-Wno-error=unused-command-line-argument-hard-error-in-future', 'CFLAGS': '-Qunused-arguments', 'CPPFLAGS': '-Qunused-arguments'}
-def lib_generate_install_methods(path_locations, src_base, Logger, call_subprocess, normal_installs, options_to_add=None, urls= None):
+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, 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 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)
+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,
 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
+res_source_key = 'local'
 ignore_packages = []
 if system_str == 'Windows':
-default_install_options = {'method': 'easy_install', 'option_str': None, 'dict_extra_env': None}
+default_install_options = {'method': 'easy_install', 'option_str': None, 'dict_extra_env': {}}
 else:
-default_install_options = {'method': 'pip', 'option_str': None, 'dict_extra_env': None}
+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:
 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 not extra_env:
+extra_env = {}
+if 'TMPDIR' not in extra_env:
+extra_env['TMPDIR'] = os.path.abspath(tmp_dir)
+if system_str == 'Darwin':
+for flag_key, flag_value in iter(osx_extra_env.items()):
+flags = extra_env.get(flag_key, '')
+if flag_value not in flags:
+#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']:
 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:
+#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 345	7bc38c7d6cf9
parent 295	af29252631ac
child 346	c1e662b964d4