Merge migration issue

Author: margaretmeehan

app/api/migrations/0005_merge_20191021_1548.py

@@ -0,0 +1,14 @@
+# Generated by Django 2.1.7 on 2019-10-21 15:48
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('api', '0004_project_collaborative_annotation'),
+        ('api', '0004_roles'),
+    ]
+
+    operations = [
+    ]

app/api/views.py

@@ -19,7 +19,6 @@
 from .serializers import ProjectSerializer, LabelSerializer, DocumentSerializer, UserSerializer
 from .serializers import ProjectPolymorphicSerializer, RoleMappingSerializer, RoleSerializer
 from .utils import CSVParser, ExcelParser, JSONParser, PlainTextParser, CoNLLParser, iterable_to_io
-from .serializers import ProjectPolymorphicSerializer, RoleMappingSerializer, RoleSerializer
 from .utils import JSONLRenderer
 from .utils import JSONPainter, CSVPainter
 

app/server/management/commands/create_role_mapping.py

@@ -5,6 +5,7 @@
 class Command(BaseCommand):
     help = 'Non-interactively create a rolemapping'
 
+    @classmethod
     def add_arguments(self, parser):
         parser.add_argument('--rolename', default=None,
                             help='The name of the role.')