--- a/virtualenv/web/res/res_create_env.py Fri Mar 28 15:39:10 2014 +0100
+++ b/virtualenv/web/res/res_create_env.py Tue Apr 01 14:39:26 2014 +0200
@@ -6,42 +6,35 @@
INSTALLS = [ #(key,method, option_str, dict_extra_env)
- 'PSYCOPG2',
- 'PIL',
- 'DJANGO',
- 'SOUTH',
- 'DJANGO-EXTENSIONS',
- 'DJANGO-REGISTRATION',
- 'SORL_THUMBNAIL',
- 'HAYSTACK',
- 'REQUESTS',
- 'SIMPLEJSON',
- 'PYELASTICSEARCH',
- 'WHOOSH',
- 'MIMEPARSE',
- 'SIX',
- 'PYTZ',
- 'PYTHON-DATEUTIL',
- 'PYYAML',
- 'PYTHON-DIGEST',
- 'DJANGO-TASTYPIE',
- 'ISODATE',
- 'HTML5LIB',
- 'RDFLIB',
- 'PYCRYPTO',
+ {'requirement':'requirements.txt', 'install': {'option_str': None, 'dict_extra_env': None}},
+# 'PSYCOPG2',
+# 'PIL',
+# 'DJANGO',
+# 'SOUTH',
+# 'DJANGO-EXTENSIONS',
+# 'DJANGO-REGISTRATION',
+# 'SORL_THUMBNAIL',
+# 'HAYSTACK',
+# 'REQUESTS',
+# 'SIMPLEJSON',
+# 'PYELASTICSEARCH',
+# 'WHOOSH',
+# 'MIMEPARSE',
+# 'SIX',
+# 'PYTZ',
+# 'PYTHON-DATEUTIL',
+# 'PYYAML',
+# 'PYTHON-DIGEST',
+# 'DJANGO-TASTYPIE',
+# 'ISODATE',
+# 'HTML5LIB',
+# 'PYPARSING',
+# 'RDFLIB',
+# 'PYCRYPTO',
]
-#if system_str == "Linux" and 'PIL' in INSTALLS:
-# i = INSTALLS.index('PIL')
-# INSTALLS.insert(i, 'ZLIB')
-# INSTALLS.insert(i, 'LIBJPEG')
+OPTIONS_TO_ADD = ['clear', 'type_install=local', "unzip_setuptools", "use_distribute"]
-if system_str == "Linux":
- INSTALLS.insert(2, 'DISTRIBUTE')
+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)
-OPTIONS_TO_ADD = ['clear', 'type_install=local', 'unzip_setuptools']
-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)