diff -r aaa8629d42c9 -r 63c5437a9b7d virtualenv/web/res/res_create_env.py --- a/virtualenv/web/res/res_create_env.py Tue Aug 27 22:18:57 2013 +0200 +++ b/virtualenv/web/res/res_create_env.py Wed Aug 28 11:16:03 2013 +0200 @@ -6,24 +6,25 @@ INSTALLS = [ #(key,method, option_str, dict_extra_env) - 'SIX', - 'WSGIREF', - 'REQUESTS', - 'SIMPLEJSON', - 'ISODATE', - 'PYPARSING', - 'HTML5LIB', - 'PSYCOPG2', - 'SOUTH', - 'DJANGO', - 'DJANGO-EXTENSIONS', - 'RDFLIB', - 'SPARQLWRAPPER', - 'DEFUSEDXML', - 'DJANGO-CORS-HEADERS', - 'DJANGO-FILTERS', - 'MARKDOWN', - 'DJANGO-REST-FRAMEWORK', + {'requirement':'requirement.txt', 'install': {'option_str': None, 'dict_extra_env': None}}, +# 'SIX', +# 'WSGIREF', +# 'REQUESTS', +# 'SIMPLEJSON', +# 'ISODATE', +# 'PYPARSING', +# 'HTML5LIB', +# 'PSYCOPG2', +# 'DJANGO', +# 'DJANGO-EXTENSIONS', +# 'SOUTH', +# 'RDFLIB', +# 'SPARQLWRAPPER', +# 'DEFUSEDXML', +# 'DJANGO-CORS-HEADERS', +# 'DJANGO-FILTER', +# 'MARKDOWN', +# 'DJANGO-REST-FRAMEWORK', ] if system_str == "Linux": @@ -33,5 +34,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)