# HG changeset patch # User ymh # Date 1437575116 -7200 # Node ID d5f030dbdb472f0fd4606e78b0e495e9749e7865 # Parent ed7e67d744a2287706ce0e076ccb6b2ddf52141e upgrade ldt, add project copy, remove django warnings as much as possible diff -r ed7e67d744a2 -r d5f030dbdb47 server/src/remieplt/__init__.py --- a/server/src/remieplt/__init__.py Mon Jul 20 18:43:52 2015 +0200 +++ b/server/src/remieplt/__init__.py Wed Jul 22 16:25:16 2015 +0200 @@ -1,4 +1,4 @@ -VERSION = (0, 0, 9, "final", 0) +VERSION = (0, 0, 10, "final", 0) VERSION_STR = unicode(".".join(map(lambda i:"%02d" % (i,), VERSION[:2]))) diff -r ed7e67d744a2 -r d5f030dbdb47 server/src/requirement.txt --- a/server/src/requirement.txt Mon Jul 20 18:43:52 2015 +0200 +++ b/server/src/requirement.txt Wed Jul 22 16:25:16 2015 +0200 @@ -1,1 +1,1 @@ -ldt (==1.56.9) +ldt (==1.57) diff -r ed7e67d744a2 -r d5f030dbdb47 server/virtualenv/res/lib/lib_create_env.py --- a/server/virtualenv/res/lib/lib_create_env.py Mon Jul 20 18:43:52 2015 +0200 +++ b/server/virtualenv/res/lib/lib_create_env.py Wed Jul 22 16:25:16 2015 +0200 @@ -20,8 +20,8 @@ 'DJANGO': {'setup': 'django', 'url': 'https://github.com/IRI-Research/django/archive/1.8.3+IRI.tar.gz', 'local':"Django-1.8.3.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.5.tar.gz', 'local':"django-extensions-1.5.5.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/v1.2.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}}, - 'DJANGO-TAGGIT': { 'setup': 'django-taggit', 'url':'https://github.com/alex/django-taggit/archive/0.16.2.tar.gz', 'local':"django-taggit-0.16.2.tar.gz", 'install': {'method': 'pip', 'option_str': None, 'dict_extra_env': None}}, + 'DJANGO-TEMPLATETAG-SUGAR': { 'setup': 'django-templatetag-sugar', 'url': 'https://github.com/IRI-Research/django-templatetag-sugar/archive/1.0.1.tar.gz', 'local': 'django-templatetag-sugar-1.0.1.tar.gz', 'install': {'method': 'pip', 'option_str': None, 'dict_extra_env': None}}, + 'DJANGO-TAGGIT': { 'setup': 'django-taggit', 'url':'https://github.com/IRI-Research/django-taggit/archive/0.16.2+IRI.tar.gz', 'local':"django-taggit-0.16.2-IRI.tar.gz", 'install': {'method': 'pip', 'option_str': None, 'dict_extra_env': None}}, 'DJANGO-TAGGIT-TEMPLATETAGS': { 'setup': 'django-taggit-templatetags', 'url':'https://github.com/feuervogel/django-taggit-templatetags/archive/d2216c9d1888e0739a04899a36e5149b5cbb3381.zip', 'local':"django-taggit-templatetags-0.4.5dev-r0.zip", 'install': {'method': 'pip', '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':'https://pypi.python.org/packages/source/h/httplib2/httplib2-0.9.1.tar.gz', 'local':"httplib2-0.9.1.tar.gz", 'install': {'method': 'pip', 'option_str': None, 'dict_extra_env': None}}, @@ -29,7 +29,7 @@ '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/v1.3.tar.gz', 'local':"django-guardian-1.3.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}}, + 'SORL_THUMBNAIL' : { 'setup': 'sorl-thumbnail', 'url':'https://github.com/mariocesar/sorl-thumbnail/archive/master.tar.gz', 'local':"sorl-thumbnail-12.3.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}}, 'HAYSTACK': {'setup': 'django-haystack', 'url': 'https://github.com/toastdriven/django-haystack/archive/v2.4.0.tar.gz', 'local': 'django-haystack-2.4.0.tar.gz', 'install':{'method':'pip', 'option_str': None, 'dict_extra_env': None}}, @@ -41,12 +41,12 @@ # dependencies for Tastypie : mimeparse>=0.1.3, python-dateutil>=2.1, lxml, PyYAML (not necessary but we never know), python-digest, defusedxml '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}}, 'SIX' : {'setup':'six', 'url':'https://pypi.python.org/packages/source/s/six/six-1.9.0.tar.gz', 'local': 'six-1.9.0.tar.gz', 'install' : {'method':'pip', 'option_str': None, 'dict_extra_env': None}}, - 'PYTHON-DATEUTIL' : {'setup':'python-dateutil', 'url':'https://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}}, + 'DATEUTIL' : {'setup':'python-dateutil', 'url':'https://github.com/dateutil/dateutil/archive/2.4.2.tar.gz', 'local': 'dateutil-2.4.2.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.11.tar.gz', 'local': 'PyYAML-3.11.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}}, 'DEFUSEDXML' : {'setup':'defusedxml', 'url':'https://pypi.python.org/packages/source/d/defusedxml/defusedxml-0.4.1.tar.gz', 'local': 'defusedxml-0.4.1.tar.gz', 'install' : {'method':'pip', 'option_str': None, 'dict_extra_env': None}}, 'DJANGO-TASTYPIE' : {'setup':'django-tastypie', 'url':'https://github.com/django-tastypie/django-tastypie/archive/master.tar.gz', 'local': 'django-tastypie-0.12.2.tar.gz', 'install' : {'method':'pip', 'option_str': None, 'dict_extra_env': None}}, - 'DJANGO-CORS-HEADERS' : {'setup':'django-cors-headers', 'url':'https://github.com/ottoyiu/django-cors-headers/archive/1.0.0.tar.gz', 'local': 'django-cors-headers-1.0.0.tar.gz', 'install' : {'method':'pip', 'option_str': None, 'dict_extra_env': None}}, + 'DJANGO-CORS-HEADERS' : {'setup':'django-cors-headers', 'url':'https://github.com/ottoyiu/django-cors-headers/archive/1.1.0.tar.gz', 'local': 'django-cors-headers-1.1.0.tar.gz', 'install' : {'method':'pip', 'option_str': None, 'dict_extra_env': None}}, 'DJANGO-CHUNCKED-UPLOADS' : {'setup': 'django-chuncked-uploads', 'url':'https://github.com/IRI-Research/django-chunked-uploads/archive/v0.7.tar.gz', 'local':'django-chunked-uploads-0.7.tar.gz', 'install' : {'method':'pip', 'option_str': None, 'dict_extra_env': None}}, 'OAUTHLIB': { 'setup': 'oauthlib', 'url':"https://github.com/idan/oauthlib/archive/0.7.2.tar.gz", 'local':"oauthlib-0.7.2.tar.gz", 'install': {'method': 'pip', 'option_str': None, 'dict_extra_env': None}}, 'URLLIB3': { 'setup': 'urllib3', 'url':'https://github.com/shazow/urllib3/archive/1.10.4.tar.gz', 'local':"urllib3-1.10.4.tar.gz", 'install': {'method': 'pip', 'option_str': None, 'dict_extra_env': None}}, @@ -306,6 +306,7 @@ args.insert(2, '-f') args.insert(3, res_env.get_src_base_path("")) args.insert(4, '--no-index') + args.insert(5, '--no-cache-dir') logger.notify("Install %s from %s with %s args %s " % (key,res_path,method, repr(args))) call_subprocess(args, cwd=os.path.abspath(tmp_dir), @@ -325,6 +326,7 @@ args.insert(2, '-f') args.insert(3, res_env.get_src_base_path("")) args.insert(4, '--no-index') + args.insert(5, '--no-cache-dir') logger.notify("Install %s from %s with %s args %s " % (key,res_path,method, repr(args))) call_subprocess(args, cwd=os.path.abspath(tmp_dir), diff -r ed7e67d744a2 -r d5f030dbdb47 server/virtualenv/res/src/django-cors-headers-1.0.0.tar.gz Binary file server/virtualenv/res/src/django-cors-headers-1.0.0.tar.gz has changed diff -r ed7e67d744a2 -r d5f030dbdb47 server/virtualenv/res/src/django-cors-headers-1.1.0.tar.gz Binary file server/virtualenv/res/src/django-cors-headers-1.1.0.tar.gz has changed diff -r ed7e67d744a2 -r d5f030dbdb47 server/virtualenv/res/src/django-taggit-0.16.2-IRI.tar.gz Binary file server/virtualenv/res/src/django-taggit-0.16.2-IRI.tar.gz has changed diff -r ed7e67d744a2 -r d5f030dbdb47 server/virtualenv/res/src/django-taggit-0.16.2.tar.gz Binary file server/virtualenv/res/src/django-taggit-0.16.2.tar.gz has changed diff -r ed7e67d744a2 -r d5f030dbdb47 server/virtualenv/res/src/django-tastypie-0.12.2.tar.gz Binary file server/virtualenv/res/src/django-tastypie-0.12.2.tar.gz has changed diff -r ed7e67d744a2 -r d5f030dbdb47 server/virtualenv/res/src/django-templatetag-sugar-1.0.1.tar.gz Binary file server/virtualenv/res/src/django-templatetag-sugar-1.0.1.tar.gz has changed diff -r ed7e67d744a2 -r d5f030dbdb47 server/virtualenv/res/src/django-templatetag-sugar-1.0.tar.gz Binary file server/virtualenv/res/src/django-templatetag-sugar-1.0.tar.gz has changed diff -r ed7e67d744a2 -r d5f030dbdb47 server/virtualenv/res/src/python-dateutil-2.1.tar.gz Binary file server/virtualenv/res/src/python-dateutil-2.1.tar.gz has changed diff -r ed7e67d744a2 -r d5f030dbdb47 server/virtualenv/res/src/python-dateutil-2.4.2.tar.gz Binary file server/virtualenv/res/src/python-dateutil-2.4.2.tar.gz has changed diff -r ed7e67d744a2 -r d5f030dbdb47 server/virtualenv/res/src/sorl-thumbnail-12.2.tar.gz Binary file server/virtualenv/res/src/sorl-thumbnail-12.2.tar.gz has changed diff -r ed7e67d744a2 -r d5f030dbdb47 server/virtualenv/res/src/sorl-thumbnail-12.3.tar.gz Binary file server/virtualenv/res/src/sorl-thumbnail-12.3.tar.gz has changed diff -r ed7e67d744a2 -r d5f030dbdb47 server/virtualenv/web/res/requirements.txt --- a/server/virtualenv/web/res/requirements.txt Mon Jul 20 18:43:52 2015 +0200 +++ b/server/virtualenv/web/res/requirements.txt Wed Jul 22 16:25:16 2015 +0200 @@ -3,16 +3,16 @@ Django==1.8.3 django-chunked-uploads==0.7 django-cas-ng==3.4.2 -django-cors-headers==1.0.0 +django-cors-headers==1.1.0 django-extensions==1.5.5 django-guardian==1.3 django-haystack==2.4.0 django-oauth-plus==2.2.8 django-registration-redux==1.2 -django-taggit==0.16.2 +django-taggit==0.16.2-IRI django-taggit-templatetags===0.4.5dev-r0 django-tastypie==0.12.2 -django-templatetag-sugar==1.0 +django-templatetag-sugar==1.0.1 django-url-shortener==0.1 elasticsearch==1.4.0 httplib2==0.9.1 @@ -24,7 +24,7 @@ psycopg2==2.6 pyelasticsearch==1.2.3 PyJWT==1.1.0 -python-dateutil==2.1 +python-dateutil==2.4.2 python-digest==1.7 python-mimeparse==0.1.4 python-openid==2.2.5 @@ -35,6 +35,6 @@ setuptools-hg==0.4 simplejson==3.6.5 six==1.9.0 -sorl-thumbnail==12.2 +sorl-thumbnail==12.3 urllib3==1.10.4 Whoosh==2.7.0