From da5eddb3c8393101d8a043b4e10dc73c27d20d7d Mon Sep 17 00:00:00 2001
From: Andre Anjos <andre.dos.anjos@gmail.com>
Date: Mon, 4 Jul 2016 13:27:37 +0200
Subject: [PATCH] [issue #435] Squash/remove useless migrations
---
.../migrations/0002_auto_20160630_1644.py | 19 --------
.../migrations/0003_auto_20160701_1707.py | 19 --------
.../migrations/0004_auto_20160704_1109.py | 19 --------
.../migrations/0003_auto_20160630_1710.py | 19 --------
...704_1109.py => 0003_auto_20160704_1316.py} | 4 +-
.../migrations/0004_auto_20160701_1707.py | 19 --------
...701_1712.py => 0002_auto_20160704_1319.py} | 4 +-
.../migrations/0003_auto_20160704_1109.py | 19 --------
.../migrations/0006_auto_20160630_1644.py | 44 -------------------
...o_20160701_0909.py => 0006_block_order.py} | 2 +-
.../migrations/0002_auto_20160630_1644.py | 19 --------
.../migrations/0003_auto_20160701_1707.py | 19 --------
.../migrations/0004_auto_20160704_1109.py | 19 --------
.../migrations/0002_auto_20160630_1644.py | 23 ----------
.../migrations/0003_auto_20160701_1707.py | 23 ----------
.../migrations/0004_auto_20160704_1109.py | 23 ----------
.../migrations/0002_auto_20160630_1644.py | 19 --------
.../migrations/0003_auto_20160701_1707.py | 19 --------
.../migrations/0004_auto_20160704_1109.py | 19 --------
19 files changed, 5 insertions(+), 346 deletions(-)
delete mode 100644 beat/web/algorithms/migrations/0002_auto_20160630_1644.py
delete mode 100644 beat/web/algorithms/migrations/0003_auto_20160701_1707.py
delete mode 100644 beat/web/algorithms/migrations/0004_auto_20160704_1109.py
delete mode 100644 beat/web/databases/migrations/0003_auto_20160630_1710.py
rename beat/web/databases/migrations/{0005_auto_20160704_1109.py => 0003_auto_20160704_1316.py} (76%)
delete mode 100644 beat/web/databases/migrations/0004_auto_20160701_1707.py
rename beat/web/dataformats/migrations/{0002_auto_20160701_1712.py => 0002_auto_20160704_1319.py} (70%)
delete mode 100644 beat/web/dataformats/migrations/0003_auto_20160704_1109.py
delete mode 100644 beat/web/experiments/migrations/0006_auto_20160630_1644.py
rename beat/web/experiments/migrations/{0007_auto_20160701_0909.py => 0006_block_order.py} (98%)
delete mode 100644 beat/web/libraries/migrations/0002_auto_20160630_1644.py
delete mode 100644 beat/web/libraries/migrations/0003_auto_20160701_1707.py
delete mode 100644 beat/web/libraries/migrations/0004_auto_20160704_1109.py
delete mode 100644 beat/web/plotters/migrations/0002_auto_20160630_1644.py
delete mode 100644 beat/web/plotters/migrations/0003_auto_20160701_1707.py
delete mode 100644 beat/web/plotters/migrations/0004_auto_20160704_1109.py
delete mode 100644 beat/web/toolchains/migrations/0002_auto_20160630_1644.py
delete mode 100644 beat/web/toolchains/migrations/0003_auto_20160701_1707.py
delete mode 100644 beat/web/toolchains/migrations/0004_auto_20160704_1109.py
diff --git a/beat/web/algorithms/migrations/0002_auto_20160630_1644.py b/beat/web/algorithms/migrations/0002_auto_20160630_1644.py
deleted file mode 100644
index b2922b3c1..000000000
--- a/beat/web/algorithms/migrations/0002_auto_20160630_1644.py
+++ /dev/null
@@ -1,19 +0,0 @@
-# -*- coding: utf-8 -*-
-# Generated by Django 1.9.5 on 2016-06-30 16:44
-from __future__ import unicode_literals
-
-from django.db import migrations
-
-
-class Migration(migrations.Migration):
-
- dependencies = [
- ('algorithms', '0001_initial'),
- ]
-
- operations = [
- migrations.AlterModelOptions(
- name='algorithm',
- options={'ordering': ['previous_version_id', 'fork_of_id', 'id']},
- ),
- ]
diff --git a/beat/web/algorithms/migrations/0003_auto_20160701_1707.py b/beat/web/algorithms/migrations/0003_auto_20160701_1707.py
deleted file mode 100644
index 36700aa4e..000000000
--- a/beat/web/algorithms/migrations/0003_auto_20160701_1707.py
+++ /dev/null
@@ -1,19 +0,0 @@
-# -*- coding: utf-8 -*-
-# Generated by Django 1.9.4 on 2016-07-01 17:07
-from __future__ import unicode_literals
-
-from django.db import migrations
-
-
-class Migration(migrations.Migration):
-
- dependencies = [
- ('algorithms', '0002_auto_20160630_1644'),
- ]
-
- operations = [
- migrations.AlterModelOptions(
- name='algorithm',
- options={'ordering': ['version', 'id']},
- ),
- ]
diff --git a/beat/web/algorithms/migrations/0004_auto_20160704_1109.py b/beat/web/algorithms/migrations/0004_auto_20160704_1109.py
deleted file mode 100644
index c1ba409b4..000000000
--- a/beat/web/algorithms/migrations/0004_auto_20160704_1109.py
+++ /dev/null
@@ -1,19 +0,0 @@
-# -*- coding: utf-8 -*-
-# Generated by Django 1.9.5 on 2016-07-04 11:09
-from __future__ import unicode_literals
-
-from django.db import migrations
-
-
-class Migration(migrations.Migration):
-
- dependencies = [
- ('algorithms', '0003_auto_20160701_1707'),
- ]
-
- operations = [
- migrations.AlterModelOptions(
- name='algorithm',
- options={'ordering': ['author__username', 'name', 'version']},
- ),
- ]
diff --git a/beat/web/databases/migrations/0003_auto_20160630_1710.py b/beat/web/databases/migrations/0003_auto_20160630_1710.py
deleted file mode 100644
index 9ba33dccc..000000000
--- a/beat/web/databases/migrations/0003_auto_20160630_1710.py
+++ /dev/null
@@ -1,19 +0,0 @@
-# -*- coding: utf-8 -*-
-# Generated by Django 1.9.5 on 2016-06-30 17:10
-from __future__ import unicode_literals
-
-from django.db import migrations
-
-
-class Migration(migrations.Migration):
-
- dependencies = [
- ('databases', '0002_scheduler_addons'),
- ]
-
- operations = [
- migrations.AlterModelOptions(
- name='database',
- options={'ordering': ['previous_version_id', 'fork_of_id', 'id']},
- ),
- ]
diff --git a/beat/web/databases/migrations/0005_auto_20160704_1109.py b/beat/web/databases/migrations/0003_auto_20160704_1316.py
similarity index 76%
rename from beat/web/databases/migrations/0005_auto_20160704_1109.py
rename to beat/web/databases/migrations/0003_auto_20160704_1316.py
index 08830e327..575732e94 100644
--- a/beat/web/databases/migrations/0005_auto_20160704_1109.py
+++ b/beat/web/databases/migrations/0003_auto_20160704_1316.py
@@ -1,5 +1,5 @@
# -*- coding: utf-8 -*-
-# Generated by Django 1.9.5 on 2016-07-04 11:09
+# Generated by Django 1.9.4 on 2016-07-04 13:16
from __future__ import unicode_literals
from django.db import migrations
@@ -8,7 +8,7 @@ from django.db import migrations
class Migration(migrations.Migration):
dependencies = [
- ('databases', '0004_auto_20160701_1707'),
+ ('databases', '0002_scheduler_addons'),
]
operations = [
diff --git a/beat/web/databases/migrations/0004_auto_20160701_1707.py b/beat/web/databases/migrations/0004_auto_20160701_1707.py
deleted file mode 100644
index f56c20d59..000000000
--- a/beat/web/databases/migrations/0004_auto_20160701_1707.py
+++ /dev/null
@@ -1,19 +0,0 @@
-# -*- coding: utf-8 -*-
-# Generated by Django 1.9.4 on 2016-07-01 17:07
-from __future__ import unicode_literals
-
-from django.db import migrations
-
-
-class Migration(migrations.Migration):
-
- dependencies = [
- ('databases', '0003_auto_20160630_1710'),
- ]
-
- operations = [
- migrations.AlterModelOptions(
- name='database',
- options={'ordering': ['version', 'id']},
- ),
- ]
diff --git a/beat/web/dataformats/migrations/0002_auto_20160701_1712.py b/beat/web/dataformats/migrations/0002_auto_20160704_1319.py
similarity index 70%
rename from beat/web/dataformats/migrations/0002_auto_20160701_1712.py
rename to beat/web/dataformats/migrations/0002_auto_20160704_1319.py
index 6bfb8fe68..c950a9e8f 100644
--- a/beat/web/dataformats/migrations/0002_auto_20160701_1712.py
+++ b/beat/web/dataformats/migrations/0002_auto_20160704_1319.py
@@ -1,5 +1,5 @@
# -*- coding: utf-8 -*-
-# Generated by Django 1.9.4 on 2016-07-01 17:12
+# Generated by Django 1.9.4 on 2016-07-04 13:19
from __future__ import unicode_literals
from django.db import migrations
@@ -14,7 +14,7 @@ class Migration(migrations.Migration):
operations = [
migrations.AlterModelOptions(
name='dataformat',
- options={'ordering': ['version', 'id'], 'verbose_name': 'dataformat', 'verbose_name_plural': 'dataformats'},
+ options={'ordering': ['author__username', 'name', 'version'], 'verbose_name': 'dataformat', 'verbose_name_plural': 'dataformats'},
),
migrations.AlterUniqueTogether(
name='dataformat',
diff --git a/beat/web/dataformats/migrations/0003_auto_20160704_1109.py b/beat/web/dataformats/migrations/0003_auto_20160704_1109.py
deleted file mode 100644
index b434ca036..000000000
--- a/beat/web/dataformats/migrations/0003_auto_20160704_1109.py
+++ /dev/null
@@ -1,19 +0,0 @@
-# -*- coding: utf-8 -*-
-# Generated by Django 1.9.5 on 2016-07-04 11:09
-from __future__ import unicode_literals
-
-from django.db import migrations
-
-
-class Migration(migrations.Migration):
-
- dependencies = [
- ('dataformats', '0002_auto_20160701_1712'),
- ]
-
- operations = [
- migrations.AlterModelOptions(
- name='dataformat',
- options={'ordering': ['author__username', 'name', 'version'], 'verbose_name': 'dataformat', 'verbose_name_plural': 'dataformats'},
- ),
- ]
diff --git a/beat/web/experiments/migrations/0006_auto_20160630_1644.py b/beat/web/experiments/migrations/0006_auto_20160630_1644.py
deleted file mode 100644
index 6a5e22b5d..000000000
--- a/beat/web/experiments/migrations/0006_auto_20160630_1644.py
+++ /dev/null
@@ -1,44 +0,0 @@
-#!/usr/bin/env python
-# vim: set fileencoding=utf-8 :
-
-###############################################################################
-# #
-# Copyright (c) 2016 Idiap Research Institute, http://www.idiap.ch/ #
-# Contact: beat.support@idiap.ch #
-# #
-# This file is part of the beat.web module of the BEAT platform. #
-# #
-# Commercial License Usage #
-# Licensees holding valid commercial BEAT licenses may use this file in #
-# accordance with the terms contained in a written agreement between you #
-# and Idiap. For further information contact tto@idiap.ch #
-# #
-# Alternatively, this file may be used under the terms of the GNU Affero #
-# Public License version 3 as published by the Free Software and appearing #
-# in the file LICENSE.AGPL included in the packaging of this file. #
-# The BEAT platform is distributed in the hope that it will be useful, but #
-# WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY #
-# or FITNESS FOR A PARTICULAR PURPOSE. #
-# #
-# You should have received a copy of the GNU Affero Public License along #
-# with the BEAT platform. If not, see http://www.gnu.org/licenses/. #
-# #
-###############################################################################
-
-from __future__ import unicode_literals
-
-from django.db import migrations
-
-
-class Migration(migrations.Migration):
-
- dependencies = [
- ('experiments', '0005_scheduler_addons_4'),
- ]
-
- operations = [
- migrations.AlterModelOptions(
- name='block',
- options={'ordering': ['id']},
- ),
- ]
diff --git a/beat/web/experiments/migrations/0007_auto_20160701_0909.py b/beat/web/experiments/migrations/0006_block_order.py
similarity index 98%
rename from beat/web/experiments/migrations/0007_auto_20160701_0909.py
rename to beat/web/experiments/migrations/0006_block_order.py
index 7ccca4467..4f83b5d17 100644
--- a/beat/web/experiments/migrations/0007_auto_20160701_0909.py
+++ b/beat/web/experiments/migrations/0006_block_order.py
@@ -80,7 +80,7 @@ def set_block_order(apps, schema_editor):
class Migration(migrations.Migration):
dependencies = [
- ('experiments', '0006_auto_20160630_1644'),
+ ('experiments', '0005_scheduler_addons_4'),
]
operations = [
diff --git a/beat/web/libraries/migrations/0002_auto_20160630_1644.py b/beat/web/libraries/migrations/0002_auto_20160630_1644.py
deleted file mode 100644
index 50dd6910c..000000000
--- a/beat/web/libraries/migrations/0002_auto_20160630_1644.py
+++ /dev/null
@@ -1,19 +0,0 @@
-# -*- coding: utf-8 -*-
-# Generated by Django 1.9.5 on 2016-06-30 16:44
-from __future__ import unicode_literals
-
-from django.db import migrations
-
-
-class Migration(migrations.Migration):
-
- dependencies = [
- ('libraries', '0001_initial'),
- ]
-
- operations = [
- migrations.AlterModelOptions(
- name='library',
- options={'ordering': ['previous_version_id', 'fork_of_id', 'id'], 'verbose_name_plural': 'libraries'},
- ),
- ]
diff --git a/beat/web/libraries/migrations/0003_auto_20160701_1707.py b/beat/web/libraries/migrations/0003_auto_20160701_1707.py
deleted file mode 100644
index 2e8dafe92..000000000
--- a/beat/web/libraries/migrations/0003_auto_20160701_1707.py
+++ /dev/null
@@ -1,19 +0,0 @@
-# -*- coding: utf-8 -*-
-# Generated by Django 1.9.4 on 2016-07-01 17:07
-from __future__ import unicode_literals
-
-from django.db import migrations
-
-
-class Migration(migrations.Migration):
-
- dependencies = [
- ('libraries', '0002_auto_20160630_1644'),
- ]
-
- operations = [
- migrations.AlterModelOptions(
- name='library',
- options={'ordering': ['version', 'id'], 'verbose_name_plural': 'libraries'},
- ),
- ]
diff --git a/beat/web/libraries/migrations/0004_auto_20160704_1109.py b/beat/web/libraries/migrations/0004_auto_20160704_1109.py
deleted file mode 100644
index 6d541b08d..000000000
--- a/beat/web/libraries/migrations/0004_auto_20160704_1109.py
+++ /dev/null
@@ -1,19 +0,0 @@
-# -*- coding: utf-8 -*-
-# Generated by Django 1.9.5 on 2016-07-04 11:09
-from __future__ import unicode_literals
-
-from django.db import migrations
-
-
-class Migration(migrations.Migration):
-
- dependencies = [
- ('libraries', '0003_auto_20160701_1707'),
- ]
-
- operations = [
- migrations.AlterModelOptions(
- name='library',
- options={'ordering': ['author__username', 'name', 'version'], 'verbose_name_plural': 'libraries'},
- ),
- ]
diff --git a/beat/web/plotters/migrations/0002_auto_20160630_1644.py b/beat/web/plotters/migrations/0002_auto_20160630_1644.py
deleted file mode 100644
index 97cac19ce..000000000
--- a/beat/web/plotters/migrations/0002_auto_20160630_1644.py
+++ /dev/null
@@ -1,23 +0,0 @@
-# -*- coding: utf-8 -*-
-# Generated by Django 1.9.5 on 2016-06-30 16:44
-from __future__ import unicode_literals
-
-from django.db import migrations
-
-
-class Migration(migrations.Migration):
-
- dependencies = [
- ('plotters', '0001_initial'),
- ]
-
- operations = [
- migrations.AlterModelOptions(
- name='plotter',
- options={'ordering': ['previous_version_id', 'fork_of_id', 'id']},
- ),
- migrations.AlterModelOptions(
- name='plotterparameter',
- options={'ordering': ['previous_version_id', 'fork_of_id', 'id']},
- ),
- ]
diff --git a/beat/web/plotters/migrations/0003_auto_20160701_1707.py b/beat/web/plotters/migrations/0003_auto_20160701_1707.py
deleted file mode 100644
index cd1e2c236..000000000
--- a/beat/web/plotters/migrations/0003_auto_20160701_1707.py
+++ /dev/null
@@ -1,23 +0,0 @@
-# -*- coding: utf-8 -*-
-# Generated by Django 1.9.4 on 2016-07-01 17:07
-from __future__ import unicode_literals
-
-from django.db import migrations
-
-
-class Migration(migrations.Migration):
-
- dependencies = [
- ('plotters', '0002_auto_20160630_1644'),
- ]
-
- operations = [
- migrations.AlterModelOptions(
- name='plotter',
- options={'ordering': ['version', 'id']},
- ),
- migrations.AlterModelOptions(
- name='plotterparameter',
- options={'ordering': ['version', 'id']},
- ),
- ]
diff --git a/beat/web/plotters/migrations/0004_auto_20160704_1109.py b/beat/web/plotters/migrations/0004_auto_20160704_1109.py
deleted file mode 100644
index e7de40106..000000000
--- a/beat/web/plotters/migrations/0004_auto_20160704_1109.py
+++ /dev/null
@@ -1,23 +0,0 @@
-# -*- coding: utf-8 -*-
-# Generated by Django 1.9.5 on 2016-07-04 11:09
-from __future__ import unicode_literals
-
-from django.db import migrations
-
-
-class Migration(migrations.Migration):
-
- dependencies = [
- ('plotters', '0003_auto_20160701_1707'),
- ]
-
- operations = [
- migrations.AlterModelOptions(
- name='plotter',
- options={'ordering': ['author__username', 'name', 'version']},
- ),
- migrations.AlterModelOptions(
- name='plotterparameter',
- options={'ordering': ['author__username', 'name', 'version']},
- ),
- ]
diff --git a/beat/web/toolchains/migrations/0002_auto_20160630_1644.py b/beat/web/toolchains/migrations/0002_auto_20160630_1644.py
deleted file mode 100644
index ce1b4cb98..000000000
--- a/beat/web/toolchains/migrations/0002_auto_20160630_1644.py
+++ /dev/null
@@ -1,19 +0,0 @@
-# -*- coding: utf-8 -*-
-# Generated by Django 1.9.5 on 2016-06-30 16:44
-from __future__ import unicode_literals
-
-from django.db import migrations
-
-
-class Migration(migrations.Migration):
-
- dependencies = [
- ('toolchains', '0001_initial'),
- ]
-
- operations = [
- migrations.AlterModelOptions(
- name='toolchain',
- options={'ordering': ['previous_version_id', 'fork_of_id', 'id']},
- ),
- ]
diff --git a/beat/web/toolchains/migrations/0003_auto_20160701_1707.py b/beat/web/toolchains/migrations/0003_auto_20160701_1707.py
deleted file mode 100644
index 321e28360..000000000
--- a/beat/web/toolchains/migrations/0003_auto_20160701_1707.py
+++ /dev/null
@@ -1,19 +0,0 @@
-# -*- coding: utf-8 -*-
-# Generated by Django 1.9.4 on 2016-07-01 17:07
-from __future__ import unicode_literals
-
-from django.db import migrations
-
-
-class Migration(migrations.Migration):
-
- dependencies = [
- ('toolchains', '0002_auto_20160630_1644'),
- ]
-
- operations = [
- migrations.AlterModelOptions(
- name='toolchain',
- options={'ordering': ['version', 'id']},
- ),
- ]
diff --git a/beat/web/toolchains/migrations/0004_auto_20160704_1109.py b/beat/web/toolchains/migrations/0004_auto_20160704_1109.py
deleted file mode 100644
index 555d2d6dc..000000000
--- a/beat/web/toolchains/migrations/0004_auto_20160704_1109.py
+++ /dev/null
@@ -1,19 +0,0 @@
-# -*- coding: utf-8 -*-
-# Generated by Django 1.9.5 on 2016-07-04 11:09
-from __future__ import unicode_literals
-
-from django.db import migrations
-
-
-class Migration(migrations.Migration):
-
- dependencies = [
- ('toolchains', '0003_auto_20160701_1707'),
- ]
-
- operations = [
- migrations.AlterModelOptions(
- name='toolchain',
- options={'ordering': ['author__username', 'name', 'version']},
- ),
- ]
--
GitLab