From a258377207c0f78af4296514ad08a9f1ac70f4a1 Mon Sep 17 00:00:00 2001 From: Grant McConnaughey Date: Fri, 23 Oct 2015 09:33:10 -0500 Subject: [PATCH] Revert unique user/primary pair --- .coveragerc | 25 +++++++++++++++++++ CHANGELOG.rst | 1 - .../0002_add_user_primary_unique_together.py | 18 ------------- avatar/migrations/__init__.py | 21 ---------------- avatar/models.py | 1 - 5 files changed, 25 insertions(+), 41 deletions(-) create mode 100644 .coveragerc delete mode 100755 avatar/migrations/0002_add_user_primary_unique_together.py diff --git a/.coveragerc b/.coveragerc new file mode 100644 index 0000000..b9917df --- /dev/null +++ b/.coveragerc @@ -0,0 +1,25 @@ +[report] +exclude_lines = + pragma: no cover + + # Don't complain about missing debug-only code: + def __repr__ + if self\.debug + + # Don't complain if tests don't hit defensive assertion code: + raise AssertionError + raise NotImplementedError + except ImportError + + # Don't complain if non-runnable code isn't run: + if 0: + if __name__ == .__main__.: + +omit = + avatar/*/migrations/* + +show_missing = True +precision = 2 + +[html] +directory = output/html/ diff --git a/CHANGELOG.rst b/CHANGELOG.rst index f09625f..eebe0ea 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -4,7 +4,6 @@ Changelog * 2.2 (Not released) * Added Python 3.5 support * Added Django 1.9 support - * Added database-level enforcement of unique user/primary pair in Avatar model. * Removed Python 2.6 support * Removed Django 1.4, 1.5, and 1.6 support diff --git a/avatar/migrations/0002_add_user_primary_unique_together.py b/avatar/migrations/0002_add_user_primary_unique_together.py deleted file mode 100755 index 41fb958..0000000 --- a/avatar/migrations/0002_add_user_primary_unique_together.py +++ /dev/null @@ -1,18 +0,0 @@ -# -*- coding: utf-8 -*- -from __future__ import unicode_literals - -from django.db import migrations - - -class Migration(migrations.Migration): - - dependencies = [ - ('avatar', '0001_initial'), - ] - - operations = [ - migrations.AlterUniqueTogether( - name='avatar', - unique_together=set([('user', 'primary')]), - ), - ] diff --git a/avatar/migrations/__init__.py b/avatar/migrations/__init__.py index 3b10179..e69de29 100644 --- a/avatar/migrations/__init__.py +++ b/avatar/migrations/__init__.py @@ -1,21 +0,0 @@ -""" -Django migrations for django-avatar app - -This package does not contain South migrations. South migrations can be found -in the ``south_migrations`` package. -""" - -SOUTH_ERROR_MESSAGE = """\n -For South support, customize the SOUTH_MIGRATION_MODULES setting like so: - - SOUTH_MIGRATION_MODULES = { - 'django-avatar': 'avatar.south_migrations', - } -""" - -# Ensure the user is not using Django 1.6 or below with South -try: - from django.db import migrations # noqa -except ImportError: - from django.core.exceptions import ImproperlyConfigured - raise ImproperlyConfigured(SOUTH_ERROR_MESSAGE) diff --git a/avatar/models.py b/avatar/models.py index e7127ff..1463df0 100644 --- a/avatar/models.py +++ b/avatar/models.py @@ -72,7 +72,6 @@ class Avatar(models.Model): class Meta: app_label = 'avatar' - unique_together = ('user', 'primary') def __unicode__(self): return _(six.u('Avatar for %s')) % self.user