From 23a1804e23b78c88c24cfb4a7e8c0ca40a780bc4 Mon Sep 17 00:00:00 2001 From: margaretmeehan Date: Mon, 21 Oct 2019 15:11:09 -0400 Subject: [PATCH] Merge migration issue --- app/api/migrations/0005_merge_20191021_1548.py | 14 ++++++++++++++ app/api/views.py | 1 - .../management/commands/create_role_mapping.py | 1 + 3 files changed, 15 insertions(+), 1 deletion(-) create mode 100644 app/api/migrations/0005_merge_20191021_1548.py diff --git a/app/api/migrations/0005_merge_20191021_1548.py b/app/api/migrations/0005_merge_20191021_1548.py new file mode 100644 index 00000000..481f400d --- /dev/null +++ b/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 = [ + ] diff --git a/app/api/views.py b/app/api/views.py index 00d93c9a..3bc91156 100644 --- a/app/api/views.py +++ b/app/api/views.py @@ -19,7 +19,6 @@ from .permissions import IsProjectAdmin, IsAnnotatorAndReadOnly, IsAnnotator, Is 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 diff --git a/app/server/management/commands/create_role_mapping.py b/app/server/management/commands/create_role_mapping.py index 458657b3..e8f27664 100644 --- a/app/server/management/commands/create_role_mapping.py +++ b/app/server/management/commands/create_role_mapping.py @@ -5,6 +5,7 @@ from django.core.management.base import BaseCommand, CommandError 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.')