Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'develop': release 0.12
- Loading branch information
Showing
17 changed files
with
218 additions
and
102 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,20 +1,8 @@ | ||
| language: python | ||
| python: | ||
| - 2.7 | ||
| - 3.3 | ||
| env: | ||
| - DJANGO='django>=1.5,<1.6' | ||
| - DJANGO='django>=1.6,<1.7' | ||
| - DJANGO='git+git://github.com/django/django.git@1.7c1' | ||
| before_install: | ||
| - export PIP_USE_MIRRORS=true | ||
| install: | ||
| - pip install $DJANGO | ||
| - pip install -e . | ||
| - pip install coveralls | ||
| before_script: | ||
| - export DJANGO_SETTINGS_MODULE=simple_email_confirmation.test_project.settings | ||
| - pip install tox coveralls | ||
| script: | ||
| - coverage run --include='*simple_email_confirmation*' --omit='*test_project*,*tests.py' $(which django-admin.py) test simple_email_confirmation | ||
| - tox | ||
| - tox -e coverage | ||
| after_success: | ||
| - coveralls |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,53 +1,35 @@ | ||
| # -*- coding: utf-8 -*- | ||
| import datetime | ||
| from south.db import db | ||
| from south.v2 import SchemaMigration | ||
| from django.db import models | ||
|
|
||
| from django.contrib.auth import get_user_model | ||
| User = get_user_model() | ||
| user_orm_label = '%s.%s' % (User._meta.app_label, User._meta.object_name) | ||
| user_model_label = '%s.%s' % (User._meta.app_label, User._meta.module_name) | ||
|
|
||
|
|
||
| class Migration(SchemaMigration): | ||
|
|
||
| def forwards(self, orm): | ||
| # Adding model 'EmailAddress' | ||
| db.create_table(u'simple_email_confirmation_emailaddress', ( | ||
| (u'id', self.gf('django.db.models.fields.AutoField')(primary_key=True)), | ||
| ('user', self.gf('django.db.models.fields.related.ForeignKey')(related_name=u'email_address_set', to=orm[user_orm_label])), | ||
| ('email', self.gf('django.db.models.fields.EmailField')(max_length=255)), | ||
| ('key', self.gf('django.db.models.fields.CharField')(unique=True, max_length=40)), | ||
| ('set_at', self.gf('django.db.models.fields.DateTimeField')()), | ||
| ('confirmed_at', self.gf('django.db.models.fields.DateTimeField')(null=True, blank=True)), | ||
| )) | ||
| db.send_create_signal(u'simple_email_confirmation', ['EmailAddress']) | ||
|
|
||
| # Adding unique constraint on 'EmailAddress', fields ['user', 'email'] | ||
| db.create_unique(u'simple_email_confirmation_emailaddress', ['user_id', 'email']) | ||
|
|
||
|
|
||
| def backwards(self, orm): | ||
| # Removing unique constraint on 'EmailAddress', fields ['user', 'email'] | ||
| db.delete_unique(u'simple_email_confirmation_emailaddress', ['user_id', 'email']) | ||
|
|
||
| # Deleting model 'EmailAddress' | ||
| db.delete_table(u'simple_email_confirmation_emailaddress') | ||
|
|
||
|
|
||
| models = { | ||
| u'simple_email_confirmation.emailaddress': { | ||
| 'Meta': {'unique_together': "((u'user', u'email'),)", 'object_name': 'EmailAddress'}, | ||
| 'confirmed_at': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}), | ||
| 'email': ('django.db.models.fields.EmailField', [], {'max_length': '75'}), | ||
| u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), | ||
| 'key': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '40'}), | ||
| 'set_at': ('django.db.models.fields.DateTimeField', [], {}), | ||
| 'user': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "u'email_address_set'", 'to': u"orm['%s']" % user_orm_label}) | ||
| }, | ||
| user_model_label: { | ||
| }, | ||
| } | ||
|
|
||
| complete_apps = ['simple_email_confirmation'] | ||
| from __future__ import unicode_literals | ||
|
|
||
| from django.db import models, migrations | ||
| import django.utils.timezone | ||
| from django.conf import settings | ||
|
|
||
|
|
||
| class Migration(migrations.Migration): | ||
|
|
||
| dependencies = [ | ||
| migrations.swappable_dependency(settings.AUTH_USER_MODEL), | ||
| ] | ||
|
|
||
| operations = [ | ||
| migrations.CreateModel( | ||
| name='EmailAddress', | ||
| fields=[ | ||
| ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)), | ||
| ('email', models.EmailField(max_length=255)), | ||
| ('key', models.CharField(unique=True, max_length=40)), | ||
| ('set_at', models.DateTimeField(default=django.utils.timezone.now, help_text='When the confirmation key expiration was set')), | ||
| ('confirmed_at', models.DateTimeField(help_text='First time this email was confirmed', null=True, blank=True)), | ||
| ('user', models.ForeignKey(related_name='email_address_set', to=settings.AUTH_USER_MODEL)), | ||
| ], | ||
| options={ | ||
| 'verbose_name_plural': 'email addresses', | ||
| }, | ||
| bases=(models.Model,), | ||
| ), | ||
| migrations.AlterUniqueTogether( | ||
| name='emailaddress', | ||
| unique_together=set([('user', 'email')]), | ||
| ), | ||
| ] |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
54 changes: 54 additions & 0 deletions
54
simple_email_confirmation/south_migrations/0001_initial.py
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,54 @@ | ||
| # -*- coding: utf-8 -*- | ||
| from __future__ import unicode_literals | ||
| import datetime | ||
| from south.db import db | ||
| from south.v2 import SchemaMigration | ||
| from django.db import models | ||
|
|
||
| from django.contrib.auth import get_user_model | ||
| User = get_user_model() | ||
| user_orm_label = '%s.%s' % (User._meta.app_label, User._meta.object_name) | ||
| user_model_label = '%s.%s' % (User._meta.app_label, User._meta.module_name) | ||
|
|
||
|
|
||
| class Migration(SchemaMigration): | ||
|
|
||
| def forwards(self, orm): | ||
| # Adding model 'EmailAddress' | ||
| db.create_table('simple_email_confirmation_emailaddress', ( | ||
| ('id', self.gf('django.db.models.fields.AutoField')(primary_key=True)), | ||
| ('user', self.gf('django.db.models.fields.related.ForeignKey')(related_name='email_address_set', to=orm[user_orm_label])), | ||
| ('email', self.gf('django.db.models.fields.EmailField')(max_length=255)), | ||
| ('key', self.gf('django.db.models.fields.CharField')(unique=True, max_length=40)), | ||
| ('set_at', self.gf('django.db.models.fields.DateTimeField')()), | ||
| ('confirmed_at', self.gf('django.db.models.fields.DateTimeField')(null=True, blank=True)), | ||
| )) | ||
| db.send_create_signal('simple_email_confirmation', ['EmailAddress']) | ||
|
|
||
| # Adding unique constraint on 'EmailAddress', fields ['user', 'email'] | ||
| db.create_unique('simple_email_confirmation_emailaddress', ['user_id', 'email']) | ||
|
|
||
|
|
||
| def backwards(self, orm): | ||
| # Removing unique constraint on 'EmailAddress', fields ['user', 'email'] | ||
| db.delete_unique('simple_email_confirmation_emailaddress', ['user_id', 'email']) | ||
|
|
||
| # Deleting model 'EmailAddress' | ||
| db.delete_table('simple_email_confirmation_emailaddress') | ||
|
|
||
|
|
||
| models = { | ||
| 'simple_email_confirmation.emailaddress': { | ||
| 'Meta': {'unique_together': "(('user', 'email'),)", 'object_name': 'EmailAddress'}, | ||
| 'confirmed_at': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}), | ||
| 'email': ('django.db.models.fields.EmailField', [], {'max_length': '75'}), | ||
| 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), | ||
| 'key': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '40'}), | ||
| 'set_at': ('django.db.models.fields.DateTimeField', [], {}), | ||
| 'user': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'email_address_set'", 'to': "orm['%s']" % user_orm_label}) | ||
| }, | ||
| user_model_label: { | ||
| }, | ||
| } | ||
|
|
||
| complete_apps = ['simple_email_confirmation'] |
File renamed without changes.
File renamed without changes.
Empty file.
Empty file.
File renamed without changes.
Oops, something went wrong.