1.8beta1 cheers for an upcoming new release of Django

zackmdavis · Mar 8, 2015 · 32c8f3d · 32c8f3d
1 parent 5b29b8c
commit 32c8f3d
Show file tree

Hide file tree

Showing 6 changed files with 75 additions and 18 deletions.
diff --git a/core/migrations/0007_auto_20150308_2143.py b/core/migrations/0007_auto_20150308_2143.py
@@ -0,0 +1,47 @@
+# -*- coding: utf-8 -*-
+from __future__ import unicode_literals
+
+from django.db import models, migrations
+import django.contrib.auth.models
+import django.core.validators
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('auth', '0006_require_contenttypes_0002'),
+        ('core', '0006_auto_20141012_0251'),
+    ]
+
+    operations = [
+        migrations.AlterModelManagers(
+            name='finetoothuser',
+            managers=[
+                ('objects', django.contrib.auth.models.UserManager()),
+            ],
+        ),
+        migrations.AlterField(
+            model_name='finetoothuser',
+            name='email',
+            field=models.EmailField(blank=True, verbose_name='email address', max_length=254),
+        ),
+        migrations.RemoveField(
+            model_name='finetoothuser',
+            name='groups',
+        ),
+        migrations.AddField(
+            model_name='finetoothuser',
+            name='groups',
+            field=models.ManyToManyField(blank=True, help_text='The groups this user belongs to. A user will get all permissions granted to each of their groups.', related_name='user_set', to='auth.Group', verbose_name='groups', related_query_name='user'),
+        ),
+        migrations.AlterField(
+            model_name='finetoothuser',
+            name='last_login',
+            field=models.DateTimeField(null=True, verbose_name='last login', blank=True),
+        ),
+        migrations.AlterField(
+            model_name='finetoothuser',
+            name='username',
+            field=models.CharField(unique=True, help_text='Required. 30 characters or fewer. Letters, digits and @/./+/-/_ only.', validators=[django.core.validators.RegexValidator('^[\\w.@+-]+$', 'Enter a valid username. This value may contain only letters, numbers and @/./+/-/_ characters.', 'invalid')], error_messages={'unique': 'A user with that username already exists.'}, verbose_name='username', max_length=30),
+        ),
+    ]
diff --git a/core/tests/view_tests.py b/core/tests/view_tests.py
@@ -31,7 +31,8 @@ def test_cannnot_claim_extant_username(self):
              'email': "[email protected]"},
             follow=True
         )
-        self.assertIn(b"Username already exists.", response.content)
+        self.assertIn(b"A user with that username already exists.",
+                      response.content)
 
     def test_confirm_password_must_match(self):
         prior_user_count = FinetoothUser.objects.count()

diff --git a/dev_requirements.txt b/dev_requirements.txt
@@ -1,7 +1,7 @@
 bleach==1.4
-Django==1.7
+git+https://github.com/django/[email protected]#egg=Django
 django-bootstrap3==4.11.0
-django-debug-toolbar==1.2.1
+git+https://github.com/django-debug-toolbar/django-debug-toolbar.git@0e1c35449c#egg=django-debug-toolbar
 Markdown==2.4.1
 jasmine==2.0.1
 factory_boy==2.4.1
diff --git a/requirements.txt b/requirements.txt
@@ -1,5 +1,5 @@
 bleach==1.4
-Django==1.7
+git+https://github.com/django/[email protected]#egg=Django
 django-bootstrap3==4.11.0
 Markdown==2.4.1
 dj-database-url==0.3.0

diff --git a/settings.py b/settings.py
@@ -95,19 +95,28 @@
 
 LOCALE_PATHS = ('translations',)
 
-TEMPLATE_DIRS = ('templates',)
-TEMPLATE_CONTEXT_PROCESSORS = (
-    'django.contrib.auth.context_processors.auth',
-    'django.core.context_processors.debug',
-    'django.core.context_processors.i18n',
-    'django.core.context_processors.media',
-    'django.core.context_processors.static',
-    'django.core.context_processors.tz',
-    'django.contrib.messages.context_processors.messages',
-    'core.context_processors.tag_cloud_context_processor',
-    'core.context_processors.contextual_static_serving_context_processor',
-    'core.context_processors.sidebar_login_form_context_processor',
-    'core.context_processors.monthly_archives_context_processor',
+TEMPLATES = (
+    {
+        'BACKEND': 'django.template.backends.django.DjangoTemplates',
+        'DIRS': ('templates',),
+        'APP_DIRS': True,
+        'OPTIONS': {
+            'context_processors': (
+                'django.contrib.auth.context_processors.auth',
+                'django.core.context_processors.debug',
+                'django.core.context_processors.i18n',
+                'django.core.context_processors.media',
+                'django.core.context_processors.static',
+                'django.core.context_processors.tz',
+                'django.contrib.messages.context_processors.messages',
+                'core.context_processors.tag_cloud_context_processor',
+                ('core.context_processors'
+                 '.contextual_static_serving_context_processor'),
+                'core.context_processors.sidebar_login_form_context_processor',
+                'core.context_processors.monthly_archives_context_processor',
+            ),
+        },
+    },
 )
 
 STATIC_ROOT = 'staticfiles'

diff --git a/wsgi.py b/wsgi.py
@@ -4,7 +4,7 @@
 It exposes the WSGI callable as a module-level variable named ``application``.
 
 For more information on this file, see
-https://docs.djangoproject.com/en/1.6/howto/deployment/wsgi/
+https://docs.djangoproject.com/en/1.8/howto/deployment/wsgi/
 """
 
 import os