From e1ec1ab993a06591439ff3a2c6e4646c62c4db1a Mon Sep 17 00:00:00 2001
From: Erwan Rouchet <rouchet@teklia.com>
Date: Thu, 10 Dec 2020 10:55:25 +0100
Subject: [PATCH] Nuke the MLToolType
---
arkindex/dataimport/migrations/0007_worker_workerversion.py | 5 ++---
arkindex/documents/migrations/0001_initial.py | 4 ++--
.../documents/migrations/0013_datasource_type_length.py | 6 +++---
3 files changed, 7 insertions(+), 8 deletions(-)
diff --git a/arkindex/dataimport/migrations/0007_worker_workerversion.py b/arkindex/dataimport/migrations/0007_worker_workerversion.py
index 0f7d0fc81d..8190e417d9 100644
--- a/arkindex/dataimport/migrations/0007_worker_workerversion.py
+++ b/arkindex/dataimport/migrations/0007_worker_workerversion.py
@@ -1,14 +1,13 @@
# Generated by Django 2.2.11 on 2020-05-19 14:55
import uuid
+from enum import Enum
import django.contrib.postgres.fields.jsonb
import django.db.models.deletion
import enumfields.fields
from django.db import migrations, models
-import arkindex_common.ml_tool
-
class Migration(migrations.Migration):
@@ -23,7 +22,7 @@ class Migration(migrations.Migration):
('id', models.UUIDField(default=uuid.uuid4, editable=False, primary_key=True, serialize=False)),
('name', models.CharField(max_length=100)),
('slug', models.CharField(max_length=100)),
- ('type', enumfields.fields.EnumField(enum=arkindex_common.ml_tool.MLToolType, max_length=50)),
+ ('type', enumfields.fields.EnumField(enum=Enum('MLToolType', ''), max_length=50)),
('repository', models.ForeignKey(
on_delete=django.db.models.deletion.CASCADE,
related_name='workers',
diff --git a/arkindex/documents/migrations/0001_initial.py b/arkindex/documents/migrations/0001_initial.py
index 81c04e49b9..3e3e3aaac5 100644
--- a/arkindex/documents/migrations/0001_initial.py
+++ b/arkindex/documents/migrations/0001_initial.py
@@ -6,12 +6,12 @@ import django.contrib.postgres.fields.hstore
import django.db.models.deletion
import enumfields.fields
from django.db import migrations, models
+from enumfields import Enum
import arkindex.documents.dates
import arkindex.documents.models
import arkindex.project.fields
import arkindex_common.enums
-import arkindex_common.ml_tool
class Migration(migrations.Migration):
@@ -66,7 +66,7 @@ class Migration(migrations.Migration):
name='DataSource',
fields=[
('id', models.UUIDField(default=uuid.uuid4, editable=False, primary_key=True, serialize=False)),
- ('type', enumfields.fields.EnumField(enum=arkindex_common.ml_tool.MLToolType, max_length=10)),
+ ('type', enumfields.fields.EnumField(enum=Enum('MLToolType', ''), max_length=10)),
('slug', models.CharField(max_length=100)),
('name', models.CharField(max_length=100)),
('revision', models.CharField(max_length=100)),
diff --git a/arkindex/documents/migrations/0013_datasource_type_length.py b/arkindex/documents/migrations/0013_datasource_type_length.py
index 93ff7fdd96..d9b10a58b7 100644
--- a/arkindex/documents/migrations/0013_datasource_type_length.py
+++ b/arkindex/documents/migrations/0013_datasource_type_length.py
@@ -1,10 +1,10 @@
# Generated by Django 2.2.10 on 2020-05-19 14:59
+from enum import Enum
+
import enumfields.fields
from django.db import migrations
-import arkindex_common.ml_tool
-
class Migration(migrations.Migration):
@@ -16,6 +16,6 @@ class Migration(migrations.Migration):
migrations.AlterField(
model_name='datasource',
name='type',
- field=enumfields.fields.EnumField(enum=arkindex_common.ml_tool.MLToolType, max_length=50),
+ field=enumfields.fields.EnumField(enum=Enum('MLToolType', ''), max_length=50),
),
]
--
GitLab