Removed ContainerFileField, and scrubbed any uses from the old migrat…

…ions.
cfe-lab · Jan 30, 2019 · 2050ceb · 2050ceb
1 parent ff84d99
commit 2050ceb
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 13 deletions.
diff --git a/kive/container/migrations/0002_ordering.py b/kive/container/migrations/0002_ordering.py
@@ -2,8 +2,7 @@
 # Generated by Django 1.11.13 on 2018-08-07 18:07
 from __future__ import unicode_literals
 
-import container.models
-from django.db import migrations
+from django.db import migrations, models
 
 
 class Migration(migrations.Migration):
@@ -24,6 +23,6 @@ class Migration(migrations.Migration):
         migrations.AlterField(
             model_name='container',
             name='file',
-            field=container.models.ContainerFileField(help_text='Singularity container file', upload_to=b'CodeResources', verbose_name=b'Container file'),
+            field=models.FileField(help_text='Singularity container file', upload_to=b'CodeResources', verbose_name=b'Container file'),
         ),
     ]
diff --git a/kive/container/migrations/0013_container_size.py b/kive/container/migrations/0013_container_size.py
@@ -2,7 +2,6 @@
 # Generated by Django 1.11.15 on 2019-01-08 23:43
 from __future__ import unicode_literals
 
-import container.models
 from django.db import migrations, models
 
 
@@ -21,6 +20,6 @@ class Migration(migrations.Migration):
         migrations.AlterField(
             model_name='container',
             name='file',
-            field=container.models.ContainerFileField(help_text='Singularity container file', upload_to='Containers', verbose_name='Container file'),
+            field=models.FileField(help_text='Singularity container file', upload_to='Containers', verbose_name='Container file'),
         ),
     ]
diff --git a/kive/container/migrations/0016_container_file_help_text.py b/kive/container/migrations/0016_container_file_help_text.py
@@ -2,8 +2,7 @@
 # Generated by Django 1.11.18 on 2019-01-25 02:09
 from __future__ import unicode_literals
 
-import container.models
-from django.db import migrations
+from django.db import migrations, models
 
 
 class Migration(migrations.Migration):
@@ -16,6 +15,6 @@ class Migration(migrations.Migration):
         migrations.AlterField(
             model_name='container',
             name='file',
-            field=container.models.ContainerFileField(help_text='Singularity or archive container file', upload_to='Containers', verbose_name='Container file'),
+            field=models.FileField(help_text='Singularity or archive container file', upload_to='Containers', verbose_name='Container file'),
         ),
     ]
diff --git a/kive/container/models.py b/kive/container/models.py
@@ -71,11 +71,6 @@ def remove(self):
         remove_helper(removal_plan)
 
 
-class ContainerFileField(models.FileField):
-    # FIXME remove this once we are able to squash the old migrations, as it is no longer used.
-    pass
-
-
 class ContainerNotChild(Exception):
     pass