# HG changeset patch
# User cavaliet
# Date 1302795576 -7200
# Node ID 795f01224eef0ec117222b9f9ad2460b19a6eab5
# Parent 125fc6df230d752dcda392fb8cb093098cc8c9cc
changes after social_auth integration, new way to create the
virtualenv and update django to 1.3. It means remove jogging,
change openid_consumer to django-openid-consumer, set the good
lxml version for windows.
diff -r 125fc6df230d -r 795f01224eef virtualenv/res/lib/lib_create_env.py
--- a/virtualenv/res/lib/lib_create_env.py Fri Apr 08 16:33:01 2011 +0200
+++ b/virtualenv/res/lib/lib_create_env.py Thu Apr 14 17:39:36 2011 +0200
@@ -14,27 +14,29 @@
URLS = {
'DISTRIBUTE': {'setup': 'distribute', 'url':'http://pypi.python.org/packages/source/d/distribute/distribute-0.6.14.tar.gz', 'local':"distribute-0.6.14.tar.gz"},
- 'DJANGO': {'setup': 'django', 'url': 'http://www.djangoproject.com/download/1.2.4/tarball/', 'local':"Django-1.2.4.tar.gz"},
- 'JOGGING': {'setup': 'jogging', 'url': 'http://github.com/zain/jogging/tarball/v0.2.2', 'local':"jogging-0.2.2.tar.gz"},
+ 'DJANGO': {'setup': 'django', 'url': 'Django-1.3-modified.tar.gz', 'local':"Django-1.3-modified.tar.gz"},
'DJANGO-EXTENSIONS': { 'setup': 'django-extensions', 'url':'https://github.com/django-extensions/django-extensions/tarball/0.6', 'local':"django-extensions-0.6.tar.gz"},
'DJANGO-REGISTRATION': { 'setup': 'django-registration', 'url':'http://bitbucket.org/ubernostrum/django-registration/get/tip.tar.gz', 'local':"django-registration.tar.gz"},
'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"},
'DJANGO-PISTON': { 'setup': 'django-piston', 'url':"django-piston-0.2.2-modified.tar.gz", 'local':"django-piston-0.2.2-modified.tar.gz"},
- 'OAUTH2': { 'setup': 'python-oauth2', 'url':"python-oauth2-1.2.1-modified.tar.gz", 'local':"python-oauth2-1.2.1-modified.tar.gz"},
- 'HTTPLIB2': { 'setup': 'python-oauth2', 'url':'http://httplib2.googlecode.com/files/httplib2-0.6.0.tar.gz', 'local':"httplib2-0.6.0.tar.gz"},
+ 'OAUTH2': { 'setup': 'python-oauth2', 'url':"http://pypi.python.org/packages/source/o/oauth2/oauth2-1.5.168.tar.gz", 'local':"oauth2-1.5.167.tar.gz"},
+ 'HTTPLIB2': { 'setup': 'python-httplib2', 'url':'http://httplib2.googlecode.com/files/httplib2-0.6.0.tar.gz', 'local':"httplib2-0.6.0.tar.gz"},
'DJANGO-OAUTH-PLUS': { 'setup': 'django-oauth-plus', 'url':'http://bitbucket.org/david/django-oauth-plus/get/f314f018e473.gz', 'local':"django-oauth-plus.tar.gz"},
'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"},
'SETUPTOOLS-HG': { 'setup':'mercurial_hg', 'url':'http://pypi.python.org/packages/source/s/setuptools_hg/setuptools_hg-0.2.tar.gz', 'local':"setuptools_hg-0.2.tar.gz"},
- 'MERCURIAL': {'setup':'mercurial', 'url':'http://pypi.python.org/packages/source/d/mercurial/mercurial-1.7.5.tar.gz', 'local':"mercurial-1.7.5.tar.gz"}
+ 'MERCURIAL': {'setup':'mercurial', 'url':'http://pypi.python.org/packages/source/d/mercurial/mercurial-1.7.5.tar.gz', 'local':"mercurial-1.7.5.tar.gz"},
+ '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"},
+ '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"},
+ '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"}
}
if system_str == 'Windows':
URLS.update({
- 'PSYCOPG2': {'setup': 'psycopg2','url': 'psycopg2-2.0.10.win32-py2.6-pg8.3.7-release.zip', 'local':"psycopg2-2.0.10.win32-py2.6-pg8.3.7-release.zip"},
- 'JCC': {'setup': 'http://pylucene-win32-binary.googlecode.com/files/JCC-2.6-py2.6-win32.egg', 'local':"JCC-2.6-py2.6-win32.egg"},
- 'PYLUCENE': {'setup': 'http://pylucene-win32-binary.googlecode.com/files/lucene-3.0.2-py2.6-win32.egg', 'local':"lucene-3.0.2-py2.6-win32.egg"},
+ '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"},
+ 'JCC': {'setup': 'jcc', 'url': 'http://pylucene-win32-binary.googlecode.com/files/JCC-2.6-py2.6-win32.egg', 'local':"JCC-2.6-py2.6-win32.egg"},
+ 'PYLUCENE': {'setup': 'pylucene', 'url': 'http://pylucene-win32-binary.googlecode.com/files/lucene-3.0.2-py2.6-win32.egg', 'local':"lucene-3.0.2-py2.6-win32.egg"},
'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"},
- 'LXML': {'setup': 'lxml', 'url': 'http://pypi.python.org/packages/2.6/l/lxml/lxml-2.2.8-py2.6-win32.egg', 'local':"lxml-2.2.8-py2.6-win32.egg"}
+ '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"}
})
else:
URLS.update({
@@ -195,8 +197,8 @@
zf.close()
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', 'psycopg2')))
- shutil.copy(os.path.join(psycopg2_src_path, 'psycopg2-2.0.10-py2.6.egg-info'), os.path.abspath(os.path.join(home_dir, 'Lib', 'site-packages')))
+ 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')))
diff -r 125fc6df230d -r 795f01224eef virtualenv/res/src/Django-1.3-modified.tar.gz
Binary file virtualenv/res/src/Django-1.3-modified.tar.gz has changed
diff -r 125fc6df230d -r 795f01224eef virtualenv/res/src/django-openid-consumer-0.1.1.tar.gz
Binary file virtualenv/res/src/django-openid-consumer-0.1.1.tar.gz has changed
diff -r 125fc6df230d -r 795f01224eef virtualenv/res/src/django-piston-0.2.2-modified.tar.gz
Binary file virtualenv/res/src/django-piston-0.2.2-modified.tar.gz has changed
diff -r 125fc6df230d -r 795f01224eef virtualenv/res/src/jogging-0.2.2.tar.gz
Binary file virtualenv/res/src/jogging-0.2.2.tar.gz has changed
diff -r 125fc6df230d -r 795f01224eef 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 125fc6df230d -r 795f01224eef virtualenv/res/src/oauth2-1.5.167.tar.gz
Binary file virtualenv/res/src/oauth2-1.5.167.tar.gz has changed
diff -r 125fc6df230d -r 795f01224eef virtualenv/res/src/omab-django-social-auth-v0.3.10-modified.tar.gz
Binary file virtualenv/res/src/omab-django-social-auth-v0.3.10-modified.tar.gz has changed
diff -r 125fc6df230d -r 795f01224eef virtualenv/res/src/psycopg2-2.0.10.win32-py2.6-pg8.3.7-release.zip
Binary file virtualenv/res/src/psycopg2-2.0.10.win32-py2.6-pg8.3.7-release.zip has changed
diff -r 125fc6df230d -r 795f01224eef 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 125fc6df230d -r 795f01224eef virtualenv/web/res/patch/django_contrib_auth_views.diff
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/virtualenv/web/res/patch/django_contrib_auth_views.diff Thu Apr 14 17:39:36 2011 +0200
@@ -0,0 +1,20 @@
+--- Django-1.3/django/contrib/auth/views.py.OLD jeu. avr. 14 15:48:14 2011
++++ Django-1.3/django/contrib/auth/views.py jeu. avr. 14 15:48:32 2011
+@@ -18,6 +18,9 @@
+ from django.contrib.auth.tokens import default_token_generator
+ from django.contrib.sites.models import get_current_site
+
++#CHANGE BY TC FOR IRI'S PLATFORM
++from social_auth.views import list as social_list
++#END TC
+
+ @csrf_protect
+ @never_cache
+@@ -63,6 +66,7 @@
+ redirect_field_name: redirect_to,
+ 'site': current_site,
+ 'site_name': current_site.name,
++ 'social_list': social_list
+ }
+ context.update(extra_context or {})
+ return render_to_response(template_name, context,
diff -r 125fc6df230d -r 795f01224eef virtualenv/web/res/patch/social_auth_views_diff.diff
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/virtualenv/web/res/patch/social_auth_views_diff.diff Thu Apr 14 17:39:36 2011 +0200
@@ -0,0 +1,31 @@
+--- D:/CavalieT/My Documents/Flex Builder 3/platform_diane/platform/virtualenv/web/res/src/omab-django-social-auth-v0.3.8-9-g5d610a5/omab-django-social-auth-5d610a5/social_auth/views.py lun. mars 28 12:03:45 2011
++++ D:/CavalieT/My Documents/Flex Builder 3/platform_diane/platform/virtualenv/web/env/myplatformenv/Lib/site-packages/django_social_auth-0.3.8-py2.6.egg/social_auth/views.py ven. avr. 8 12:06:02 2011
+@@ -7,13 +7,27 @@
+ from django.contrib.auth import login, REDIRECT_FIELD_NAME
+ from django.contrib.auth.decorators import login_required
+
+-from social_auth.backends import get_backend
++from social_auth.backends import get_backend, get_backends
+ from social_auth.utils import sanitize_redirect
+
+
+ DEFAULT_REDIRECT = getattr(settings, 'LOGIN_REDIRECT_URL', '')
+
++#TC
++def list():
++ """Start list process"""
++ log_url = getattr(settings, 'LOGIN_URL', '')
++ response = ""
++ # We list all wanted backends among all availables
++ for backend in get_backends():
++ for backend_str in settings.AUTHENTICATION_BACKENDS:
++ if backend in backend_str:
++ response += "- " + backend + "
"
++ response += "
"
++ return response
++#END change by TC
+
++
+ def auth(request, backend):
+ """Start authentication process"""
+ complete_url = getattr(settings, 'SOCIAL_AUTH_COMPLETE_URL_NAME',
diff -r 125fc6df230d -r 795f01224eef virtualenv/web/res/res_create_env.py
--- a/virtualenv/web/res/res_create_env.py Fri Apr 08 16:33:01 2011 +0200
+++ b/virtualenv/web/res/res_create_env.py Thu Apr 14 17:39:36 2011 +0200
@@ -18,26 +18,30 @@
('MYSQL', 'pip', None, None),
('PIL', 'easy_install', None, None),
('DJANGO','pip', None, None),
- ('JOGGING','pip', None, None),
('DJANGO-EXTENSIONS', 'pip', None, None),
('DJANGO-REGISTRATION', 'easy_install', '-Z', None),
('DJANGO-TAGGING', 'pip', None, None),
- ('DJANGO-PISTON', 'pip', None, None),
('HTTPLIB2', 'pip', None, None),
('OAUTH2', 'easy_install', None, None),
('DJANGO-OAUTH-PLUS', 'pip', None, None),
+ ('OPENID', 'pip', None, None),
+ ('DJANGO_OPENID_CONSUMER', 'pip', None, None),
+ ('SOCIAL_AUTH', 'easy_install', None, None),
])
if system_str == 'Windows':
INSTALLS.extend([
('JCC','easy_install',None,None),
+ ('PSYCOPG2',install_psycopg2,None,None),
('PYLUCENE','easy_install',None,None),
- ('PSYCOPG2',install_psycopg2,None,None),
+ # We have to install piston after and manually with pip install django-piston-0.2.2-modified.tar.gz, after having launched the virtualenv
+ #('DJANGO-PISTON', 'pip', None, None),
])
else:
INSTALLS.extend([
('PYLUCENE',install_pylucene,None,None),
('PSYCOPG2', 'pip', None, None),
+ ('DJANGO-PISTON', 'pip', None, None),
])
if system_str == "Darwin":
@@ -46,7 +50,8 @@
])
else:
INSTALLS.extend([
- ('LXML', 'pip', None, None),
+ # We have to install lxml after and manually with easy_install lxml-2.2.2-py2.6-win32.egg, after having launched the virtualenv
+ #('LXML', 'easy_install', None, None),
])
diff -r 125fc6df230d -r 795f01224eef web/ldtplatform/settings.py
--- a/web/ldtplatform/settings.py Fri Apr 08 16:33:01 2011 +0200
+++ b/web/ldtplatform/settings.py Thu Apr 14 17:39:36 2011 +0200
@@ -80,8 +80,7 @@
'django.contrib.auth.middleware.AuthenticationMiddleware',
'django.middleware.locale.LocaleMiddleware',
'django.contrib.messages.middleware.MessageMiddleware',
- 'jogging.middleware.LoggingMiddleware',
- 'openid_consumer.middleware.OpenIDMiddleware',
+ 'django_openid_consumer.middleware.OpenIDMiddleware',
)
TEMPLATE_CONTEXT_PROCESSORS = (
@@ -90,10 +89,6 @@
"django.core.context_processors.debug",
"django.core.context_processors.i18n",
"django.core.context_processors.media",
-# "ldt.utils.context_processors.ldt",
-# "ldt.utils.context_processors.base",
-# "ldt.utils.context_processors.web",
- #"ldtplatform.utils.context_processors.version",
"ldt.utils.context_processors.ldtcontext",
)
@@ -113,7 +108,6 @@
)
INSTALLED_APPS = (
- 'jogging',
'django_extensions',
'django.contrib.auth',
'django.contrib.contenttypes',
@@ -131,9 +125,8 @@
'ldt.user',
'ldt.management',
'oauth_provider',
- 'openid_consumer',
+ 'django_openid_consumer',
'piston',
- #'socialauth',
'social_auth',
)
diff -r 125fc6df230d -r 795f01224eef web/ldtplatform/templates/registration/login.html
--- a/web/ldtplatform/templates/registration/login.html Fri Apr 08 16:33:01 2011 +0200
+++ b/web/ldtplatform/templates/registration/login.html Thu Apr 14 17:39:36 2011 +0200
@@ -33,7 +33,7 @@
{{form.as_ul}}
{% trans "Or login with your external account" %}
- {{social_list|safe}}
+ {{social_list|safe}}