collapsed migrations (#402)

cvat-ai · Apr 16, 2019 · 16cf076 · 16cf076
1 parent 17a4e8e
commit 16cf076
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 40 deletions.
diff --git a/cvat/apps/engine/migrations/0015_db_redesign_20190217.py b/cvat/apps/engine/migrations/0015_db_redesign_20190217.py
@@ -77,6 +77,11 @@ class Migration(migrations.Migration):
             name='status',
             field=models.CharField(choices=[('ANNOTATION', 'annotation'), ('VALIDATION', 'validation'), ('COMPLETED', 'completed')], default=cvat.apps.engine.models.StatusChoice('annotation'), max_length=32),
         ),
+        migrations.AlterField(
+            model_name='task',
+            name='overlap',
+            field=models.PositiveIntegerField(null=True),
+        ),
         migrations.RemoveField(
             model_name='task',
             name='path',

diff --git a/cvat/apps/engine/migrations/0016_attribute_spec_20190217.py b/cvat/apps/engine/migrations/0016_attribute_spec_20190217.py
@@ -95,7 +95,7 @@ def fill_task_meta_data_forward(apps, schema_editor):
                 db_video.width = image.width
                 db_video.height = image.height
                 image.close()
-            except:
+            except FileNotFoundError:
                 db_video.width = 0
                 db_video.height = 0
 
@@ -119,7 +119,7 @@ def fill_task_meta_data_forward(apps, schema_editor):
                     db_image.width = image.width
                     db_image.height = image.height
                     image.close()
-                except:
+                except FileNotFoundError:
                     db_image.width = 0
                     db_image.height = 0
 

diff --git a/cvat/apps/engine/migrations/0017_db_redesign_20190221.py b/cvat/apps/engine/migrations/0017_db_redesign_20190221.py
@@ -722,13 +722,10 @@ class Migration(migrations.Migration):
             name='image',
             field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='engine.LabeledImage'),
         ),
-
         migrations.RunPython(
             code=copy_annotations_forward,
             reverse_code=copy_annotations_backward,
         ),
-
-
         migrations.RemoveField(
             model_name='labeledbox',
             name='job',
@@ -765,6 +762,10 @@ class Migration(migrations.Migration):
             model_name='labeledpolygon',
             name='job',
         ),
+        migrations.RemoveField(
+            model_name='job',
+            name='max_shape_id',
+        ),
         migrations.RemoveField(
             model_name='labeledpolygon',
             name='label',

diff --git a/cvat/apps/engine/migrations/0018_remove_job_max_shape_id.py b/cvat/apps/engine/migrations/0018_remove_job_max_shape_id.py
diff --git a/cvat/apps/engine/migrations/0019_auto_20190404_1906.py b/cvat/apps/engine/migrations/0019_auto_20190404_1906.py