Fix up for the migration issues

opentech/apply/funds/migrations/0029_add_reviewers.py

-# Generated by Django 2.0.2 on 2018-03-13 15:06
-
-from django.conf import settings
-from django.db import migrations, models
-import django.db.models.deletion
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        migrations.swappable_dependency(settings.AUTH_USER_MODEL),
-        ('funds', '0028_update_on_delete_django2'),
-    ]
-
-    operations = [
-        migrations.AddField(
-            model_name='applicationsubmission',
-            name='reviewers',
-            field=models.ManyToManyField(limit_choices_to={'groups__name__in': ['Staff', 'Reviewer']}, related_name='submissions_reviewer', to=settings.AUTH_USER_MODEL),
-        ),
-        migrations.AddField(
-            model_name='fundtype',
-            name='reviewers',
-            field=models.ManyToManyField(limit_choices_to={'groups__name': 'Reviewer'}, related_name='fund_reviewers', to=settings.AUTH_USER_MODEL),
-        ),
-        migrations.AddField(
-            model_name='round',
-            name='reviewers',
-            field=models.ManyToManyField(limit_choices_to={'groups__name': 'Reviewer'}, related_name='rounds_reviewer', to=settings.AUTH_USER_MODEL),
-        ),
-        migrations.AlterField(
-            model_name='round',
-            name='lead',
-            field=models.ForeignKey(limit_choices_to={'groups__name': 'Staff'}, on_delete=django.db.models.deletion.PROTECT, related_name='round_lead', to=settings.AUTH_USER_MODEL),
-        ),
-    ]

opentech/apply/review/admin.py

-from django.contrib import admin
-
-# Register your models here.

opentech/apply/review/migrations/0002_add_common_fields.py

@@ -28,7 +28,7 @@ class Migration(migrations.Migration):
         migrations.AddField(
             model_name='review',
             name='recommendation',
-            field=models.IntegerField(choices=[(0, 'No'), (1, 'Yes'), (2, 'Maybe')], default=0, verbose_name='Recommendation'),
+            field=models.IntegerField(choices=[(0, 'No'), (1, 'Maybe'), (2, 'Yes')], default=0, verbose_name='Recommendation'),
         ),
         migrations.AddField(
             model_name='review',

opentech/apply/review/tests.py

-from django.test import TestCase
-
-# Create your tests here.

opentech/apply/users/models.py

@@ -14,7 +14,7 @@ class UserQuerySet(models.QuerySet):
         return self.filter(groups__name=REVIEWER_GROUP_NAME)
 
 
-class UserManager(BaseUserManager):
+class UserManager(BaseUserManager.from_queryset(UserQuerySet)):
     use_in_migrations = True
 
     def _create_user(self, email, password, **extra_fields):
@@ -68,7 +68,7 @@ class User(AbstractUser):
     first_name = None
     last_name = None
 
-    objects = UserManager.from_queryset(UserQuerySet)()
+    objects = UserManager()
 
     def __str__(self):
         return self.get_full_name() if self.get_full_name() else self.get_short_name()