# HG changeset patch # User ymh # Date 1352303900 -3600 # Node ID 9595ad2678ec2d270aa845a83c2e3d283b12a829 # Parent 45b05706b516a764d15a8bf595fe12f02583ef52 update ldt + virtualenv. Add workaround for basic http authentication diff -r 45b05706b516 -r 9595ad2678ec src/theend/__init__.py --- a/src/theend/__init__.py Mon Oct 22 12:03:53 2012 +0200 +++ b/src/theend/__init__.py Wed Nov 07 16:58:20 2012 +0100 @@ -1,4 +1,4 @@ -VERSION = (1, 7, 0, "final", 0) +VERSION = (1, 8, 0, "final", 0) VERSION_STR = unicode(".".join(map(lambda i:"%02d" % (i,), VERSION[:2]))) diff -r 45b05706b516 -r 9595ad2678ec src/theend/config.py.tmpl --- a/src/theend/config.py.tmpl Mon Oct 22 12:03:53 2012 +0200 +++ b/src/theend/config.py.tmpl Wed Nov 07 16:58:20 2012 +0100 @@ -7,6 +7,7 @@ BASE_DIR = '%(base_dir)s' BASE_URL = '%(base_url)s' WEB_URL = '%(web_url)s' +WEB_AUTH = [] # example [{'REGEX': 'localhost/~ymh/platform', 'NAME': 'foo', 'PASSWORD': 'bar'}] STATIC_URL = BASE_URL + 'static/site/' diff -r 45b05706b516 -r 9595ad2678ec src/theend/settings.py --- a/src/theend/settings.py Mon Oct 22 12:03:53 2012 +0200 +++ b/src/theend/settings.py Wed Nov 07 16:58:20 2012 +0100 @@ -92,7 +92,6 @@ 'django_openid_consumer.middleware.OpenIDMiddleware', 'ldt.ldt_utils.middleware.userprofile.LanguageMiddleware', 'ldt.security.middleware.SecurityMiddleware', - 'ldt.api.middleware.pistonput.PistonPutMiddleware', ) TEMPLATE_CONTEXT_PROCESSORS = ( @@ -142,11 +141,11 @@ 'ldt.indexation', 'oauth_provider', 'django_openid_consumer', - 'piston', 'social_auth', 'south', 'guardian', 'sorl.thumbnail', + 'tastypie', ) AUTH_PROFILE_MODULE = 'user.UserProfile' @@ -256,10 +255,6 @@ if not "LOGIN_ERROR_URL" in locals(): LOGIN_ERROR_URL = BASE_URL + 'theend/accounts/login' -if not "GLOBAL_LOG_LEVEL" in locals(): - GLOBAL_LOG_LEVEL = LOG_LEVEL -if not "GLOBAL_LOG_HANDLERS" in locals(): - GLOBAL_LOG_HANDLERS = [{'handler':logging.FileHandler(LOG_FILE), 'format':"%(asctime)s - %(levelname)s : %(message)s"}] # URL prefix for admin media -- CSS, JavaScript and images. Make sure to use a # trailing slash. @@ -272,4 +267,9 @@ # URL that handles the media served from MEDIA_ROOT. if not "MEDIA_URL" in locals(): MEDIA_URL = BASE_URL + 'static/media/' + +#forced settings +MAX_TAG_LENGTH = 255 +FORCE_LOWERCASE_TAGS = True + diff -r 45b05706b516 -r 9595ad2678ec virtualenv/res/lib/lib_create_env.py --- a/virtualenv/res/lib/lib_create_env.py Mon Oct 22 12:03:53 2012 +0200 +++ b/virtualenv/res/lib/lib_create_env.py Wed Nov 07 16:58:20 2012 +0100 @@ -16,15 +16,14 @@ URLS = { #'': {'setup': '', 'url':'', 'local':''}, - 'DISTRIBUTE': {'setup': 'distribute', 'url':'http://pypi.python.org/packages/source/d/distribute/distribute-0.6.24.tar.gz', 'local':"distribute-0.6.24.tar.gz", 'install': {'method': 'pip', 'option_str': None, 'dict_extra_env': None}}, - 'DJANGO': {'setup': 'django', 'url': 'http://www.djangoproject.com/download/1.4.1/tarball/', 'local':"Django-1.4.1.tar.gz", 'install': {'method': 'pip', 'option_str': None, 'dict_extra_env': None}}, + 'DISTRIBUTE': {'setup': 'distribute', 'url':'http://pypi.python.org/packages/source/d/distribute/distribute-0.6.28.tar.gz', 'local':"distribute-0.6.28.tar.gz", 'install': {'method': 'pip', 'option_str': None, 'dict_extra_env': None}}, + 'DJANGO': {'setup': 'django', 'url': 'http://www.djangoproject.com/download/1.4.2/tarball/', 'local':"Django-1.4.2.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/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://bitbucket.org/david/django-oauth-plus/get/f314f018e473.gz', 'local':"django-oauth-plus.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}}, '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}}, 'DJANGO_OPENID_CONSUMER': {'setup':'django_openid_consumer', 'url':'http://pypi.python.org/packages/source/d/django-openid-consumer/django-openid-consumer-0.1.1.tar.gz', 'local':"django-openid-consumer-0.1.1.tar.gz", 'install': {'method': 'pip', 'option_str': None, 'dict_extra_env': None}}, 'SOCIAL_AUTH': {'setup':'social_auth', 'url':'https://github.com/omab/django-social-auth/tarball/v0.3.10', 'local':"omab-django-social-auth-v0.3.10-modified.tar.gz", 'install': {'method': 'easy_install', 'option_str': None, 'dict_extra_env': None}}, @@ -41,7 +40,16 @@ 'REQUESTS': {'setup': 'requests', 'url':'https://github.com/kennethreitz/requests/tarball/v0.13.3', 'local':'requests-v0.13.3.tar.gz', 'install' : {'method':'pip', 'option_str': None, 'dict_extra_env': None}}, 'PYELASTICSEARCH': {'setup': 'pyelasticsearch', 'url':'https://github.com/toastdriven/pyelasticsearch/tarball/master', 'local':'pyelasticsearch.tar.gz', 'install' : {'method':'pip', 'option_str': None, 'dict_extra_env': None}}, '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}}, - 'LDT': {'setup': 'ldt','url': 'ldt-1.20.tar.gz', 'local':"ldt-1.20.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}}, + 'SIX' : {'setup':'six', 'url':'http://pypi.python.org/packages/source/s/six/six-1.2.0.tar.gz', 'local': 'six-1.2.0.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':'django-tastypie-0.9.11-modified.tar.gz', 'local': 'django-tastypie-0.9.11-modified.tar.gz', 'install' : {'method':'pip', 'option_str': None, 'dict_extra_env': None}}, + 'LDT': {'setup': 'ldt','url': 'ldt-1.28.tar.gz', 'local':"ldt-1.28.tar.gz", 'install': {'method': 'pip', 'option_str': None, 'dict_extra_env': None}}, } if system_str == 'Windows': @@ -53,9 +61,9 @@ mysqlres = "MySQL-python-1.2.3.win-amd64-py2.7.exe" URLS.update({ - 'PSYCOPG2': {'setup': 'psycopg2','url': 'psycopg2-2.0.14.win32-py2.6-pg8.4.3-release.zip', 'local':"psycopg2-2.0.14.win32-py2.6-pg8.4.3-release.zip", 'install': {'method': 'install_psycopg2', 'option_str': None, 'dict_extra_env': None}}, - 'PIL': {'setup': 'pil', 'url': 'http://effbot.org/media/downloads/PIL-1.1.7.win32-py2.6.exe', 'local':"PIL-1.1.7.win32-py2.6.exe", 'install': {'method': 'easy_install', 'option_str': None, 'dict_extra_env': None}}, - 'LXML': {'setup': 'lxml', 'url': 'http://pypi.python.org/packages/2.6/l/lxml/lxml-2.2.2-py2.6-win32.egg', 'local':"lxml-2.2.2-py2.6-win32.egg", 'install': {'method': 'easy_install', 'option_str': None, 'dict_extra_env': None}}, + 'PSYCOPG2': {'setup': 'psycopg2','url': 'psycopg2-2.4.5.win32-py2.7-pg9.1.3-release.zip', 'local':"psycopg2-2.4.5.win32-py2.7-pg9.1.3-release.zip", 'install': {'method': 'install_psycopg2', 'option_str': None, 'dict_extra_env': None}}, + 'PIL': {'setup': 'pil', 'url': 'http://effbot.org/media/downloads/PIL-1.1.7.win32-py2.7.exe', 'local':"PIL-1.1.7.win32-py2.7.exe", 'install': {'method': 'easy_install', 'option_str': None, 'dict_extra_env': None}}, + 'LXML': {'setup': 'lxml', 'url': 'http://pypi.python.org/packages/2.7/l/lxml/lxml-2.3-py2.7-win32.egg', 'local':"lxml-2.3-py2.7-win32.egg", 'install': {'method': 'easy_install', 'option_str': None, 'dict_extra_env': None}}, 'MYSQL': { 'setup': 'mysql-python', 'url': mysqlres, 'local': mysqlres, 'install': {'method': 'easy_install', 'option_str': None, 'dict_extra_env': None}}, }) else: @@ -74,8 +82,7 @@ 'LXML': {'setup': 'lxml', 'url':"lxml-2.3.4.tar.bz2", 'local':"lxml-2.3.4.tar.bz2", 'install': {'method': lxml_method, 'option_str': None, 'dict_extra_env': lxml_options}}, 'MYSQL': { 'setup': 'mysql-python', 'url': 'http://sourceforge.net/projects/mysql-python/files/mysql-python/1.2.3/MySQL-python-1.2.3.tar.gz/download', 'local':"MySQL-python-1.2.3.tar.gz", 'install': {'method': mysql_method, 'option_str': None, 'dict_extra_env': None}}, }) - - + class ResourcesEnv(object): @@ -135,7 +142,7 @@ psycopg2_src_path = os.path.join(psycopg2_base_path, os.listdir(psycopg2_base_path)[0]) shutil.copytree(os.path.join(psycopg2_src_path, 'psycopg2'), os.path.abspath(os.path.join(home_dir, 'Lib/site-packages', 'psycopg2'))) - shutil.copy(os.path.join(psycopg2_src_path, 'psycopg2-2.0.14-py2.6.egg-info'), os.path.abspath(os.path.join(home_dir, 'Lib/site-packages', 'site-packages'))) + shutil.copy(os.path.join(psycopg2_src_path, 'psycopg2-2.4.5-py2.7.egg-info'), os.path.abspath(os.path.join(home_dir, 'Lib/site-packages', 'site-packages'))) def install_mysql(option_str, extra_env, res_source_key, home_dir, lib_dir, tmp_dir, src_dir, res_env, logger, call_subprocess, filter_python_develop): diff -r 45b05706b516 -r 9595ad2678ec virtualenv/res/src/Django-1.4.1.tar.gz Binary file virtualenv/res/src/Django-1.4.1.tar.gz has changed diff -r 45b05706b516 -r 9595ad2678ec virtualenv/res/src/Django-1.4.2.tar.gz Binary file virtualenv/res/src/Django-1.4.2.tar.gz has changed diff -r 45b05706b516 -r 9595ad2678ec virtualenv/res/src/PIL-1.1.7.win32-py2.6.exe Binary file virtualenv/res/src/PIL-1.1.7.win32-py2.6.exe has changed diff -r 45b05706b516 -r 9595ad2678ec virtualenv/res/src/PIL-1.1.7.win32-py2.7.exe Binary file virtualenv/res/src/PIL-1.1.7.win32-py2.7.exe has changed diff -r 45b05706b516 -r 9595ad2678ec virtualenv/res/src/PyYAML-3.10.tar.gz Binary file virtualenv/res/src/PyYAML-3.10.tar.gz has changed diff -r 45b05706b516 -r 9595ad2678ec virtualenv/res/src/distribute-0.6.24.tar.gz Binary file virtualenv/res/src/distribute-0.6.24.tar.gz has changed diff -r 45b05706b516 -r 9595ad2678ec virtualenv/res/src/distribute-0.6.28.tar.gz Binary file virtualenv/res/src/distribute-0.6.28.tar.gz has changed diff -r 45b05706b516 -r 9595ad2678ec virtualenv/res/src/django-oauth-plus-2.0.tar.gz Binary file virtualenv/res/src/django-oauth-plus-2.0.tar.gz has changed diff -r 45b05706b516 -r 9595ad2678ec virtualenv/res/src/django-oauth-plus.tar.gz Binary file virtualenv/res/src/django-oauth-plus.tar.gz has changed diff -r 45b05706b516 -r 9595ad2678ec virtualenv/res/src/django-piston-7c90898072ce-modifed.tar.gz Binary file virtualenv/res/src/django-piston-7c90898072ce-modifed.tar.gz has changed diff -r 45b05706b516 -r 9595ad2678ec virtualenv/res/src/django-tastypie-0.9.11-modified.tar.gz Binary file virtualenv/res/src/django-tastypie-0.9.11-modified.tar.gz has changed diff -r 45b05706b516 -r 9595ad2678ec virtualenv/res/src/ldt-1.20.tar.gz Binary file virtualenv/res/src/ldt-1.20.tar.gz has changed diff -r 45b05706b516 -r 9595ad2678ec virtualenv/res/src/ldt-1.28.tar.gz Binary file virtualenv/res/src/ldt-1.28.tar.gz has changed diff -r 45b05706b516 -r 9595ad2678ec virtualenv/res/src/lxml-2.2.2-py2.6-win32.egg Binary file virtualenv/res/src/lxml-2.2.2-py2.6-win32.egg has changed diff -r 45b05706b516 -r 9595ad2678ec virtualenv/res/src/lxml-2.3-py2.7-win32.egg Binary file virtualenv/res/src/lxml-2.3-py2.7-win32.egg has changed diff -r 45b05706b516 -r 9595ad2678ec virtualenv/res/src/mimeparse-0.1.3.tar.gz Binary file virtualenv/res/src/mimeparse-0.1.3.tar.gz has changed diff -r 45b05706b516 -r 9595ad2678ec virtualenv/res/src/psycopg2-2.0.14.win32-py2.6-pg8.4.3-release.zip Binary file virtualenv/res/src/psycopg2-2.0.14.win32-py2.6-pg8.4.3-release.zip has changed diff -r 45b05706b516 -r 9595ad2678ec virtualenv/res/src/psycopg2-2.4.5.win32-py2.7-pg9.1.3-release.zip Binary file virtualenv/res/src/psycopg2-2.4.5.win32-py2.7-pg9.1.3-release.zip has changed diff -r 45b05706b516 -r 9595ad2678ec virtualenv/res/src/python-dateutil-2.1.tar.gz Binary file virtualenv/res/src/python-dateutil-2.1.tar.gz has changed diff -r 45b05706b516 -r 9595ad2678ec virtualenv/res/src/python-digest-1.7.tar.gz Binary file virtualenv/res/src/python-digest-1.7.tar.gz has changed diff -r 45b05706b516 -r 9595ad2678ec virtualenv/res/src/setuptools_hg-0.4.tar.gz Binary file virtualenv/res/src/setuptools_hg-0.4.tar.gz has changed diff -r 45b05706b516 -r 9595ad2678ec virtualenv/res/src/six-1.2.0.tar.gz Binary file virtualenv/res/src/six-1.2.0.tar.gz has changed diff -r 45b05706b516 -r 9595ad2678ec virtualenv/res/src/wsgiref-0.1.2.zip Binary file virtualenv/res/src/wsgiref-0.1.2.zip has changed diff -r 45b05706b516 -r 9595ad2678ec virtualenv/web/res/res_create_env.py --- a/virtualenv/web/res/res_create_env.py Mon Oct 22 12:03:53 2012 +0200 +++ b/virtualenv/web/res/res_create_env.py Wed Nov 07 16:58:20 2012 +0100 @@ -14,9 +14,10 @@ 'DJANGO-EXTENSIONS', 'DJANGO-REGISTRATION', 'DJANGO-TAGGING', - 'DJANGO-PISTON', 'HTTPLIB2', 'OAUTH2', + 'SETUPTOOLS_HG', + 'WSGIREF', 'DJANGO-OAUTH-PLUS', 'OPENID', 'DJANGO_OPENID_CONSUMER', @@ -27,6 +28,12 @@ 'REQUESTS', 'PYELASTICSEARCH', 'WHOOSH', + 'MIMEPARSE', + 'SIX', + 'PYTHON-DATEUTIL', + 'PYYAML', + 'PYTHON-DIGEST', + 'DJANGO-TASTYPIE', 'LDT', ]