--- a/virtualenv/web/res/res_create_env.py Wed Jan 01 17:55:04 2014 +0100
+++ b/virtualenv/web/res/res_create_env.py Thu Jan 02 13:23:45 2014 +0100
@@ -6,28 +6,29 @@
INSTALLS = [ #(key,method, option_str, dict_extra_env)
- 'SIX',
'LIBJPEG',
- 'ZLIB',
- 'REQUESTS',
- 'SIMPLEJSON',
- 'ISODATE',
- 'PYPARSING',
- 'HTML5LIB',
- 'LXML',
- 'PSYCOPG2',
- 'SOUTH',
- 'PIL',
- 'DJANGO',
- 'DJANGO-EXTENSIONS',
- 'HAYSTACK',
- 'PYELASTICSEARCH',
- 'PYTHON-DATEUTIL',
- 'RDFLIB',
- 'SQLALCHEMY',
- 'RDFLIB-SQLALCHEMY',
- 'WIKITOOLS',
- 'MPTT',
+ 'ZLIB',
+ {'requirement':'requirement.txt', 'install': {'option_str': None, 'dict_extra_env': None}},
+# 'SIX',
+# 'REQUESTS',
+# 'SIMPLEJSON',
+# 'ISODATE',
+# 'PYPARSING',
+# 'HTML5LIB',
+# 'LXML',
+# 'PSYCOPG2',
+# 'SOUTH',
+# 'PIL',
+# 'DJANGO',
+# 'DJANGO-EXTENSIONS',
+# 'HAYSTACK',
+# 'PYELASTICSEARCH',
+# 'PYTHON-DATEUTIL',
+# 'RDFLIB',
+# 'SQLALCHEMY',
+# 'RDFLIB-SQLALCHEMY',
+# 'WIKITOOLS',
+# 'MPTT',
]
if system_str == "Linux":
@@ -37,5 +38,5 @@
if system_str != 'Linux':
OPTIONS_TO_ADD.append('use_distribute')
-def generate_install_methods(path_locations, src_base, Logger, call_subprocess):
- return lib_generate_install_methods(path_locations, src_base, Logger, call_subprocess, INSTALLS, OPTIONS_TO_ADD)
+def generate_install_methods(path_locations, src_base, run_base, Logger, call_subprocess):
+ return lib_generate_install_methods(path_locations, src_base, run_base, Logger, call_subprocess, INSTALLS, OPTIONS_TO_ADD)