From 97febbf8b4a9efd47ad923b63c38b6e66db016f2 Mon Sep 17 00:00:00 2001 From: "Fabio C. Barrioneuvo da Luz" Date: Fri, 23 Sep 2016 01:32:41 -0300 Subject: [PATCH] removed django-autoslug until it's ready for 1.10 --- requirements_to_watch.txt | 2 ++ {{cookiecutter.project_slug}}/requirements/base.txt | 1 - .../users/migrations/0001_initial.py | 12 ++++++------ 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/requirements_to_watch.txt b/requirements_to_watch.txt index 3e25cb20..34f0fe62 100644 --- a/requirements_to_watch.txt +++ b/requirements_to_watch.txt @@ -1,2 +1,4 @@ # These requirements prevented an upgrade to Django 1.10. django-coverage-plugin==1.3.1 +django-autoslug==1.9.3 + diff --git a/{{cookiecutter.project_slug}}/requirements/base.txt b/{{cookiecutter.project_slug}}/requirements/base.txt index 13378d8f..df90ba07 100644 --- a/{{cookiecutter.project_slug}}/requirements/base.txt +++ b/{{cookiecutter.project_slug}}/requirements/base.txt @@ -40,7 +40,6 @@ psycopg2==2.6.2 # Unicode slugification awesome-slugify==1.6.5 -django-autoslug==1.9.3 # Time zones support pytz==2016.6.1 diff --git a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/migrations/0001_initial.py b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/migrations/0001_initial.py index 626e10f3..e76c333f 100644 --- a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/migrations/0001_initial.py +++ b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/migrations/0001_initial.py @@ -1,9 +1,9 @@ # -*- coding: utf-8 -*- -# Generated by Django 1.9.9 on 2016-09-23 04:10 +# Generated by Django 1.10.1 on 2016-09-23 04:36 from __future__ import unicode_literals import django.contrib.auth.models -import django.core.validators +import django.contrib.auth.validators from django.db import migrations, models import django.utils.timezone @@ -13,7 +13,7 @@ class Migration(migrations.Migration): initial = True dependencies = [ - ('auth', '0007_alter_validators_add_error_messages'), + ('auth', '0008_alter_user_username_max_length'), ] operations = [ @@ -24,7 +24,7 @@ class Migration(migrations.Migration): ('password', models.CharField(max_length=128, verbose_name='password')), ('last_login', models.DateTimeField(blank=True, null=True, verbose_name='last login')), ('is_superuser', models.BooleanField(default=False, help_text='Designates that this user has all permissions without explicitly assigning them.', verbose_name='superuser status')), - ('username', models.CharField(error_messages={'unique': 'A user with that username already exists.'}, help_text='Required. 30 characters or fewer. Letters, digits and @/./+/-/_ only.', max_length=30, unique=True, validators=[django.core.validators.RegexValidator('^[\\w.@+-]+$', 'Enter a valid username. This value may contain only letters, numbers and @/./+/-/_ characters.')], verbose_name='username')), + ('username', models.CharField(error_messages={'unique': 'A user with that username already exists.'}, help_text='Required. 150 characters or fewer. Letters, digits and @/./+/-/_ only.', max_length=150, unique=True, validators=[django.contrib.auth.validators.UnicodeUsernameValidator()], verbose_name='username')), ('first_name', models.CharField(blank=True, max_length=30, verbose_name='first name')), ('last_name', models.CharField(blank=True, max_length=30, verbose_name='last name')), ('email', models.EmailField(blank=True, max_length=254, verbose_name='email address')), @@ -36,9 +36,9 @@ class Migration(migrations.Migration): ('user_permissions', models.ManyToManyField(blank=True, help_text='Specific permissions for this user.', related_name='user_set', related_query_name='user', to='auth.Permission', verbose_name='user permissions')), ], options={ - 'abstract': False, - 'verbose_name': 'user', 'verbose_name_plural': 'users', + 'verbose_name': 'user', + 'abstract': False, }, managers=[ ('objects', django.contrib.auth.models.UserManager()),