# HG changeset patch # User ymh # Date 1432804044 -7200 # Node ID 993f18158ccb8f701d9342ea41b89cda5dbeb9cf # Parent adc5311b1b0d0eb3ec53919cd3860d07b2767a34 Remove unused LDT_MEDIA_PREFIX + upgrade django-registration then remove unused migration diff -r adc5311b1b0d -r 993f18158ccb src/app_migrations/__init__.py diff -r adc5311b1b0d -r 993f18158ccb src/app_migrations/registration/0001_initial.py --- a/src/app_migrations/registration/0001_initial.py Wed May 27 12:47:39 2015 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,27 +0,0 @@ -# -*- coding: utf-8 -*- -from __future__ import unicode_literals - -from django.db import models, migrations -from django.conf import settings - - -class Migration(migrations.Migration): - - dependencies = [ - migrations.swappable_dependency(settings.AUTH_USER_MODEL), - ] - - operations = [ - migrations.CreateModel( - name='RegistrationProfile', - fields=[ - ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)), - ('activation_key', models.CharField(max_length=40, verbose_name='activation key')), - ('user', models.OneToOneField(verbose_name='user', to=settings.AUTH_USER_MODEL)), - ], - options={ - 'verbose_name': 'registration profile', - 'verbose_name_plural': 'registration profiles', - }, - ), - ] diff -r adc5311b1b0d -r 993f18158ccb src/app_migrations/registration/__init__.py diff -r adc5311b1b0d -r 993f18158ccb src/ldtplatform/settings.py --- a/src/ldtplatform/settings.py Wed May 27 12:47:39 2015 +0200 +++ b/src/ldtplatform/settings.py Thu May 28 11:07:24 2015 +0200 @@ -66,7 +66,6 @@ # trailing slash. # Examples: "http://foo.com/media/", "/media/". -#LDT_MEDIA_PREFIX = '/ldt/' # Make this unique, and don't share it with anybody. SECRET_KEY = 't^lii5_z@tho$%6t&b#dm#t9nz$$ylyclxvkdiyqbl+(dnt(ma' @@ -154,10 +153,6 @@ 'metadatacomposer', ) -MIGRATION_MODULES = { - "registration": "app_migrations.registration", -} - #AUTH_PROFILE_MODULE = 'user.UserProfile' AUTH_USER_MODEL = 'user.LdtUser' @@ -172,12 +167,6 @@ ) AUTHENTICATION_BACKENDS = ( - 'social.backends.open_id.OpenIdAuth', - 'social.backends.google.GoogleOpenId', - #'social.backends.google.GoogleOAuth2', - #'social.backends.google.GoogleOAuth', - 'social.backends.twitter.TwitterOAuth', - 'social.backends.facebook.FacebookOAuth2', 'guardian.backends.ObjectPermissionBackend', 'django.contrib.auth.backends.ModelBackend', ) @@ -205,15 +194,10 @@ OAUTH_CALLBACK_VIEW = 'oauth_provider.views.fake_callback_view' TEST_WEBSERVER_ADDRPORT = "127.0.0.1:8888" -SOCIAL_AUTH_TWITTER_KEY = 'UxAdbOLSo4Mx3CXIwDG9Eg' -SOCIAL_AUTH_TWITTER_SECRET = '2PcWgdjnJL6Vp8srB40jeAo0fjMEtDnUwmAia6EUww' -SOCIAL_AUTH_FACEBOOK_KEY = '163134140411313' -SOCIAL_AUTH_FACEBOOK_SECRET = 'f25e0754a44f0d90d3f4d9ea961ff012' SOCIAL_AUTH_COMPLETE_URL_NAME = 'complete' SOCIAL_AUTH_ASSOCIATE_URL_NAME = 'associate_complete' - AUTO_INDEX_AFTER_SAVE = True ANONYMOUS_USER_ID = -1 @@ -273,9 +257,6 @@ if not "LOGIN_ERROR_URL" in locals(): LOGIN_ERROR_URL = SRC_BASE_URL + 'accounts/login' -# Used in a lot of templates -if not "LDT_MEDIA_PREFIX" in locals(): - LDT_MEDIA_PREFIX = STATIC_URL + 'ldt/' # URL that handles the media served from MEDIA_ROOT. if not "MEDIA_URL" in locals(): MEDIA_URL = BASE_URL + 'static/media/' diff -r adc5311b1b0d -r 993f18158ccb virtualenv/res/lib/lib_create_env.py --- a/virtualenv/res/lib/lib_create_env.py Wed May 27 12:47:39 2015 +0200 +++ b/virtualenv/res/lib/lib_create_env.py Thu May 28 11:07:24 2015 +0200 @@ -19,7 +19,7 @@ '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/IRI-Research/django/archive/d11d79737105223c99d15b3956837c1246f60441.tar.gz', 'local':"django-1.8.2.dev.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-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.14.0.tar.gz', 'local':"django-taggit-0.14.0.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}}, diff -r adc5311b1b0d -r 993f18158ccb virtualenv/res/src/django-registration-redux-1.2.tar.gz Binary file virtualenv/res/src/django-registration-redux-1.2.tar.gz has changed