# HG changeset patch # User cavaliet # Date 1350923295 -7200 # Node ID cd56949a3510620703765d507d6cd9fec9e9c5a6 # Parent f52567ae138c62ef2a7ca7f33bd644cf1e1ffccd update venv settings and dependencies diff -r f52567ae138c -r cd56949a3510 src/ldt/ldt/settings.py --- a/src/ldt/ldt/settings.py Mon Oct 22 18:22:39 2012 +0200 +++ b/src/ldt/ldt/settings.py Mon Oct 22 18:28:15 2012 +0200 @@ -30,11 +30,11 @@ 'ldt.indexation', 'oauth_provider', 'django_openid_consumer', - 'piston', 'social_auth', 'south', 'guardian', 'sorl.thumbnail', + 'tastypie', ) MIDDLEWARE_CLASSES = ( @@ -49,7 +49,6 @@ 'django.contrib.messages.middleware.MessageMiddleware', 'django_openid_consumer.middleware.OpenIDMiddleware', 'ldt.ldt_utils.middleware.userprofile.LanguageMiddleware', - 'ldt.api.middleware.pistonput.PistonPutMiddleware', ) diff -r f52567ae138c -r cd56949a3510 virtualenv/res/lib/lib_create_env.py --- a/virtualenv/res/lib/lib_create_env.py Mon Oct 22 18:22:39 2012 +0200 +++ b/virtualenv/res/lib/lib_create_env.py Mon Oct 22 18:28:15 2012 +0200 @@ -21,7 +21,6 @@ 'DJANGO-EXTENSIONS': { 'setup': 'django-extensions', 'url':'https://github.com/django-extensions/django-extensions/tarball/0.8', 'local':"django-extensions-0.8.tar.gz", 'install': {'method': 'pip', 'option_str': None, 'dict_extra_env': None}}, 'DJANGO-REGISTRATION': { 'setup': 'django-registration', 'url':'https://bitbucket.org/ubernostrum/django-registration/get/v0.8.tar.gz', 'local':"django-registration-0.8.tar.gz", 'install': {'method': 'easy_install', 'option_str': '-Z', 'dict_extra_env': None}}, 'DJANGO-TAGGING': { 'setup': 'django-tagging', 'url':'http://django-tagging.googlecode.com/files/django-tagging-0.3.1.tar.gz', 'local':"django-tagging-0.3.1.tar.gz", 'install': {'method': 'pip', 'option_str': None, 'dict_extra_env': None}}, - 'DJANGO-PISTON': { 'setup': 'django-piston', 'url':'django-piston-7c90898072ce-modifed.tar.gz', 'local':'django-piston-7c90898072ce-modifed.tar.gz', 'install': {'method': 'easy_install', 'option_str': None, 'dict_extra_env': None}}, 'OAUTH2': { 'setup': 'python-oauth2', 'url':"https://github.com/simplegeo/python-oauth2/tarball/hudson-python-oauth2-211", 'local':"oauth2-1.5.211.tar.gz", 'install': {'method': 'easy_install', '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}}, 'DJANGO-OAUTH-PLUS': { 'setup': 'django-oauth-plus', 'url':'http://pypi.python.org/packages/source/d/django-oauth-plus/django-oauth-plus-2.0.tar.gz', 'local':"django-oauth-plus-2.0.tar.gz", 'install': {'method': 'pip', 'option_str': None, 'dict_extra_env': None}}, @@ -43,6 +42,12 @@ 'WHOOSH': {'setup': 'whoosh', 'url':'https://bitbucket.org/mchaput/whoosh/get/tip.tar.gz', 'local':'whoosh-2.5.tar.gz', 'install' : {'method':'pip', 'option_str': None, 'dict_extra_env': None}}, 'SETUPTOOLS_HG' : {'setup':'setuptools_hg', 'url':'http://pypi.python.org/packages/source/s/setuptools_hg/setuptools_hg-0.4.tar.gz', 'local': 'setuptools_hg-0.4.tar.gz', 'install' : {'method':'pip', 'option_str': None, 'dict_extra_env': None}}, 'WSGIREF' : {'setup':'wsgiref', 'url':'http://pypi.python.org/packages/source/w/wsgiref/wsgiref-0.1.2.zip', 'local': 'wsgiref-0.1.2.zip', 'install' : {'method':'pip', 'option_str': None, 'dict_extra_env': None}}, + # dependencies for Tastypie : mimeparse>=0.1.3, python-dateutil>=2.1, lxml, PyYAML (not necessary but we never know), python-digest + 'MIMEPARSE' : {'setup':'mimeparse', 'url':'http://pypi.python.org/packages/source/m/mimeparse/mimeparse-0.1.3.tar.gz', 'local': 'mimeparse-0.1.3.tar.gz', 'install' : {'method':'pip', 'option_str': None, 'dict_extra_env': None}}, + 'PYTHON-DATEUTIL' : {'setup':'python-dateutil', 'url':'http://pypi.python.org/packages/source/p/python-dateutil/python-dateutil-2.1.tar.gz', 'local': 'python-dateutil-2.1.tar.gz', 'install' : {'method':'pip', 'option_str': None, 'dict_extra_env': None}}, + 'PYYAML' : {'setup':'pyyaml', 'url':'http://pypi.python.org/packages/source/P/PyYAML/PyYAML-3.10.tar.gz', 'local': 'PyYAML-3.10.tar.gz', 'install' : {'method':'pip', 'option_str': None, 'dict_extra_env': None}}, + 'PYTHON-DIGEST' : {'setup':'python-digest', 'url':'http://pypi.python.org/packages/source/p/python-digest/python-digest-1.7.tar.gz', 'local': 'python-digest-1.7.tar.gz', 'install' : {'method':'pip', 'option_str': None, 'dict_extra_env': None}}, + 'DJANGO-TASTYPIE' : {'setup':'django-tastypie', 'url':'http://pypi.python.org/packages/source/d/django-tastypie/django-tastypie-0.9.11.tar.gz', 'local': 'django-tastypie-0.9.11.tar.gz', 'install' : {'method':'pip', 'option_str': None, 'dict_extra_env': None}}, } if system_str == 'Windows': diff -r f52567ae138c -r cd56949a3510 virtualenv/res/src/django-piston-7c90898072ce-modifed.tar.gz Binary file virtualenv/res/src/django-piston-7c90898072ce-modifed.tar.gz has changed diff -r f52567ae138c -r cd56949a3510 virtualenv/web/res/res_create_env.py --- a/virtualenv/web/res/res_create_env.py Mon Oct 22 18:22:39 2012 +0200 +++ b/virtualenv/web/res/res_create_env.py Mon Oct 22 18:28:15 2012 +0200 @@ -15,7 +15,6 @@ 'DJANGO-EXTENSIONS', 'DJANGO-REGISTRATION', 'DJANGO-TAGGING', - 'DJANGO-PISTON', 'HTTPLIB2', 'OAUTH2', 'SETUPTOOLS_HG', @@ -30,6 +29,11 @@ 'REQUESTS', 'PYELASTICSEARCH', 'WHOOSH', + 'MIMEPARSE', + 'PYTHON-DATEUTIL', + 'PYYAML', + 'PYTHON-DIGEST', + 'DJANGO-TASTYPIE', ] if system_str == "Linux": diff -r f52567ae138c -r cd56949a3510 web/ldtplatform/settings.py --- a/web/ldtplatform/settings.py Mon Oct 22 18:22:39 2012 +0200 +++ b/web/ldtplatform/settings.py Mon Oct 22 18:28:15 2012 +0200 @@ -93,7 +93,6 @@ 'django_openid_consumer.middleware.OpenIDMiddleware', 'ldt.ldt_utils.middleware.userprofile.LanguageMiddleware', 'ldt.security.middleware.SecurityMiddleware', - 'ldt.api.middleware.pistonput.PistonPutMiddleware', ) TEMPLATE_CONTEXT_PROCESSORS = ( @@ -143,11 +142,11 @@ 'ldt.indexation', 'oauth_provider', 'django_openid_consumer', - 'piston', 'social_auth', 'south', 'guardian', 'sorl.thumbnail', + 'tastypie', ) AUTH_PROFILE_MODULE = 'user.UserProfile'