--- a/virtualenv/res/lib/lib_create_env.py Mon Oct 19 14:21:51 2015 +0200
+++ b/virtualenv/res/lib/lib_create_env.py Mon Oct 26 19:20:54 2015 +0100
@@ -19,7 +19,7 @@
'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': 'https://www.djangoproject.com/download/1.8.2/tarball/', 'local':"Django-1.8.2.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.5.1.tar.gz', 'local':"django-extensions-1.5.1.tar.gz", '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}},
+ 'REGISTRATION': { 'setup': 'django-registration', 'url':'https://github.com/macropin/django-registration/archive/v1.2.tar.gz', 'local':"django-registration-1.2.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}},
'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}},
@@ -30,7 +30,7 @@
'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.5.1.tar.gz', 'local': 'isodate-0.5.1.tar.gz', 'install' : {'method': 'pip', 'option_str': None, 'dict_extra_env': None}},
'RDFLIB' : { 'setup': 'rdflib', 'url': 'https://github.com/IRI-Research/rdflib/archive/30f0f8ca7dba3e9dbfef39fb2006e4b395748f6c.tar.gz', 'local': 'rdflib-4.2.0-dev.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}},
+ '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.6.0.tar.gz', 'local' : 'requests-2.6.0.tar.gz', 'install': {'method': 'pip', 'option_str': None, 'dict_extra_env': None}},
'ELASTICSEARCH' : { 'setup': 'elasticsearch', 'url': 'https://github.com/elasticsearch/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}},
'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}},
@@ -68,7 +68,7 @@
if system_str == 'Windows':
-
+
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}},
@@ -88,7 +88,7 @@
'LXML': {'setup': 'lxml', 'url':"lxml-3.4.2.tar.gz", 'local':"lxml-3.4.2.tar.gz", 'install': {'method': 'pip', 'option_str': None, 'dict_extra_env': lxml_options}},
'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):
@@ -103,11 +103,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 +127,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,28 +163,28 @@
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 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),
@@ -192,10 +192,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),
@@ -203,13 +203,13 @@
show_stdout=True,
extra_env=configure_env_trans
)
-
+
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),
@@ -245,19 +245,19 @@
pystemmer_base_path = os.path.join(src_dir,"pystemmer")
zf.extractall(pystemmer_base_path)
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'}
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):
@@ -269,8 +269,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':
@@ -325,16 +325,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')
@@ -342,23 +342,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):
@@ -377,7 +377,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':
@@ -387,26 +387,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
@@ -415,4 +415,3 @@
setattr(options, opt, opt_val)
return adjust_options, extend_parser, after_install
-