# HG changeset patch # User ymh # Date 1431646176 -7200 # Node ID 249a7c73e0a1facf824e96ebf9c65059a97764f4 # Parent ce5e55a6597dc07ee12013a556e46e894300175d update guardian to correct pb in admin diff -r ce5e55a6597d -r 249a7c73e0a1 sbin/sync/config.py.tmpl --- a/sbin/sync/config.py.tmpl Wed May 13 01:28:55 2015 +0200 +++ b/sbin/sync/config.py.tmpl Fri May 15 01:29:36 2015 +0200 @@ -48,6 +48,7 @@ "+ core", ] } +env.migrate_method = 'migrate' env.web_relaunch_cmd = "supervisorctl restart platform" diff -r ce5e55a6597d -r 249a7c73e0a1 src/ldtplatform/__init__.py --- a/src/ldtplatform/__init__.py Wed May 13 01:28:55 2015 +0200 +++ b/src/ldtplatform/__init__.py Fri May 15 01:29:36 2015 +0200 @@ -1,4 +1,4 @@ -VERSION = (2, 15, 00, "final", 0) +VERSION = (2, 15, 1, "final", 0) VERSION_STR = unicode(".".join(map(lambda i:"%02d" % (i,), VERSION[:2]))) diff -r ce5e55a6597d -r 249a7c73e0a1 src/requirement.txt --- a/src/requirement.txt Wed May 13 01:28:55 2015 +0200 +++ b/src/requirement.txt Fri May 15 01:29:36 2015 +0200 @@ -1,3 +1,3 @@ -ldt (==1.56) +ldt (==1.56.1) hashcut (==0.15) metadatacomposer (==0.1.20) diff -r ce5e55a6597d -r 249a7c73e0a1 virtualenv/res/lib/lib_create_env.py --- a/virtualenv/res/lib/lib_create_env.py Wed May 13 01:28:55 2015 +0200 +++ b/virtualenv/res/lib/lib_create_env.py Fri May 15 01:29:36 2015 +0200 @@ -17,7 +17,7 @@ URLS = { #'': {'setup': '', 'url':'', 'local':''}, 'DISTRIBUTE': {'setup': 'distribute', 'url':'http://pypi.python.org/packages/source/d/distribute/distribute-0.6.34.tar.gz', 'local':"distribute-0.6.34.tar.gz", 'install': {'method': 'pip', 'option_str': None, 'dict_extra_env': None}}, - 'DJANGO': {'setup': 'django', 'url': 'https://github.com/django/django/archive/1.8.tar.gz', 'local':"django-1.8.tar.gz", 'install': {'method': 'pip', 'option_str': None, 'dict_extra_env': None}}, + 'DJANGO': {'setup': 'django', 'url': 'https://github.com/django/django/archive/1.8.1.tar.gz', 'local':"django-1.8.1.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.3.tar.gz', 'local':"django-extensions-1.5.3.tar.gz", 'install': {'method': 'pip', 'option_str': None, 'dict_extra_env': None}}, 'DJANGO-REGISTRATION': { 'setup': 'django-registration', 'url':'https://github.com/macropin/django-registration/archive/8b38c5a925ad7a95b3884e8ce9729a05d42d0a65.tar.gz', 'local':"django-registration-redux-1.2.tar.gz", 'install': {'method': 'easy_install', 'option_str': '-Z', 'dict_extra_env': None}}, 'DJANGO-TEMPLATETAG-SUGAR': { 'setup': 'django-templatetag-sugar', 'url': 'https://github.com/alex/django-templatetag-sugar/archive/1.0.tar.gz', 'local': 'django-templatetag-sugar-1.0.tar.gz', 'install': {'method': 'pip', 'option_str': None, 'dict_extra_env': None}}, @@ -28,7 +28,7 @@ 'DJANGO-OAUTH-PLUS': { 'setup': 'django-oauth-plus', 'url':'https://pypi.python.org/packages/source/d/django-oauth-plus/django-oauth-plus-2.2.6.tar.gz', 'local':"django-oauth-plus-2.2.6.tar.gz", 'install': {'method': 'pip', 'option_str': None, 'dict_extra_env': None}}, 'OPENID': {'setup':'openid', 'url':'http://pypi.python.org/packages/source/p/python-openid/python-openid-2.2.5.tar.gz', 'local':"python-openid-2.2.5.tar.gz", 'install': {'method': 'pip', 'option_str': None, 'dict_extra_env': None}}, 'SOCIAL_AUTH': {'setup':'social_auth', 'url':'https://github.com/omab/python-social-auth/archive/v0.2.7.tar.gz', 'local':"python-social-auth-0.2.7.tar.gz", 'install': {'method': 'pip', 'option_str': None, 'dict_extra_env': None}}, - 'DJANGO_GUARDIAN' : { 'setup': 'django-guardian', 'url':'https://github.com/lukaszb/django-guardian/archive/8f82cf92b6b4140c84023b06d81820e5c7f24194.tar.gz', 'local':"django-guardian-1.2.6.dev0.tar.gz", 'install': {'method': 'pip', 'option_str': None, 'dict_extra_env': None}}, + 'DJANGO_GUARDIAN' : { 'setup': 'django-guardian', 'url':'https://github.com/TauPan/django-guardian/archive/full-django-1.8-compatibility.tar.gz', 'local':"django-guardian-1.2.6.dev.tar.gz", 'install': {'method': 'pip', 'option_str': None, 'dict_extra_env': None}}, 'SORL_THUMBNAIL' : { 'setup': 'sorl-thumbnail', 'url':'https://github.com/mariocesar/sorl-thumbnail/archive/v12.2.tar.gz', 'local':"sorl-thumbnail-12.2.tar.gz", 'install': {'method': 'pip', 'option_str': None, 'dict_extra_env': None}}, 'LIBJPEG': {'setup': None, 'url':'jpegsrc.v9.tar.gz', 'local':'jpegsrc.v9.tar.gz', 'install': {'method': 'install_libjpeg', 'option_str': None, 'dict_extra_env': None}}, 'ZLIB': {'setup': None, 'url':'zlib-1.2.8.tar.gz', 'local':'zlib-1.2.8.tar.gz', 'install': {'method': 'install_zlib', 'option_str': None, 'dict_extra_env': None}}, diff -r ce5e55a6597d -r 249a7c73e0a1 virtualenv/res/src/Django-1.8.1.tar.gz Binary file virtualenv/res/src/Django-1.8.1.tar.gz has changed diff -r ce5e55a6597d -r 249a7c73e0a1 virtualenv/res/src/django-1.8.tar.gz Binary file virtualenv/res/src/django-1.8.tar.gz has changed diff -r ce5e55a6597d -r 249a7c73e0a1 virtualenv/res/src/django-guardian-1.2.6.dev.tar.gz Binary file virtualenv/res/src/django-guardian-1.2.6.dev.tar.gz has changed diff -r ce5e55a6597d -r 249a7c73e0a1 virtualenv/res/src/django-guardian-1.2.6.dev0.tar.gz Binary file virtualenv/res/src/django-guardian-1.2.6.dev0.tar.gz has changed diff -r ce5e55a6597d -r 249a7c73e0a1 virtualenv/web/res/requirements.txt --- a/virtualenv/web/res/requirements.txt Wed May 13 01:28:55 2015 +0200 +++ b/virtualenv/web/res/requirements.txt Fri May 15 01:29:36 2015 +0200 @@ -1,10 +1,10 @@ -f ../../res/src defusedxml==0.4.1 -Django==1.8 +Django==1.8.1 django-chunked-uploads==0.6 django-cors-headers==1.0.0 django-extensions==1.5.3 -django-guardian==1.2.6.dev0 +django-guardian==1.2.6.dev django-haystack==2.3.1 django-oauth-plus==2.2.6 django-registration-redux==1.2