[GNUnet-SVN] [taler-bank] branch master updated: get rid of old migrations, and keeping their squashed version.

[gnunet]

This is an automated email from the git hooks/post-receive script.

marcello pushed a commit to branch master
in repository bank.

The following commit(s) were added to refs/heads/master by this push:
     new 5f50d22  get rid of old migrations, and keeping their squashed version.
5f50d22 is described below

commit 5f50d227ed8971262f8e40566080ad9af901a50c
Author: Marcello Stanisci <address@hidden>
AuthorDate: Wed Feb 28 12:17:19 2018 +0100

    get rid of old migrations, and keeping their
    squashed version.
---
 ...shed_0013_remove_banktransaction_reimburses.py} | 35 +++++++++++++++++-----
 .../app/migrations/0002_bankaccount_amount.py      | 21 -------------
 .../app/migrations/0003_auto_20171030_1346.py      | 21 -------------
 .../app/migrations/0004_auto_20171030_1428.py      | 34 ---------------------
 .../0005_remove_banktransaction_currency.py        | 19 ------------
 .../app/migrations/0006_auto_20171031_0823.py      | 21 -------------
 .../app/migrations/0007_auto_20171031_0906.py      | 21 -------------
 .../app/migrations/0008_auto_20171031_0938.py      | 31 -------------------
 .../app/migrations/0009_auto_20171120_1642.py      | 20 -------------
 .../migrations/0010_banktransaction_cancelled.py   | 20 -------------
 .../migrations/0011_banktransaction_reimburses.py  | 19 ------------
 .../app/migrations/0012_auto_20171212_1540.py      | 19 ------------
 .../0013_remove_banktransaction_reimburses.py      | 17 -----------
 13 files changed, 28 insertions(+), 270 deletions(-)

diff --git a/talerbank/app/migrations/0001_initial.py 
b/talerbank/app/migrations/0001_squashed_0013_remove_banktransaction_reimburses.py
similarity index 52%
rename from talerbank/app/migrations/0001_initial.py
rename to 
talerbank/app/migrations/0001_squashed_0013_remove_banktransaction_reimburses.py
index ff05150..31c38a3 100644
--- a/talerbank/app/migrations/0001_initial.py
+++ 
b/talerbank/app/migrations/0001_squashed_0013_remove_banktransaction_reimburses.py
@@ -1,14 +1,15 @@
-# -*- coding: utf-8 -*-
-# Generated by Django 1.10.3 on 2017-03-22 20:22
-from __future__ import unicode_literals
+# Generated by Django 2.0.1 on 2018-02-13 10:23
 
 from django.conf import settings
 from django.db import migrations, models
 import django.db.models.deletion
+import talerbank.app.models
 
 
 class Migration(migrations.Migration):
 
+    replaces = [('app', '0001_initial'), ('app', '0002_bankaccount_amount'), 
('app', '0003_auto_20171030_1346'), ('app', '0004_auto_20171030_1428'), ('app', 
'0005_remove_banktransaction_currency'), ('app', '0006_auto_20171031_0823'), 
('app', '0007_auto_20171031_0906'), ('app', '0008_auto_20171031_0938'), ('app', 
'0009_auto_20171120_1642'), ('app', '0010_banktransaction_cancelled'), ('app', 
'0011_banktransaction_reimburses'), ('app', '0012_auto_20171212_1540'), ('app', 
'0013_remove_banktr [...]
+
     initial = True
 
     dependencies = [
@@ -33,13 +34,33 @@ class Migration(migrations.Migration):
             name='BankTransaction',
             fields=[
                 ('id', models.AutoField(auto_created=True, primary_key=True, 
serialize=False, verbose_name='ID')),
-                ('amount_value', models.IntegerField(default=0)),
-                ('amount_fraction', models.IntegerField(default=0)),
-                ('currency', models.CharField(max_length=12)),
                 ('subject', models.CharField(default='(no subject given)', 
max_length=200)),
-                ('date', models.DateTimeField(auto_now=True)),
+                ('date', models.DateTimeField(auto_now=True, db_index=True)),
                 ('credit_account', 
models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, 
related_name='credit_account', to='app.BankAccount')),
                 ('debit_account', 
models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, 
related_name='debit_account', to='app.BankAccount')),
+                ('amount', talerbank.app.models.AmountField(default=False)),
+                ('cancelled', models.BooleanField(default=False)),
             ],
         ),
+        migrations.AddField(
+            model_name='bankaccount',
+            name='amount',
+            
field=talerbank.app.models.AmountField(default=talerbank.app.models.get_zero_amount),
+        ),
+        migrations.RemoveField(
+            model_name='bankaccount',
+            name='balance',
+        ),
+        migrations.RemoveField(
+            model_name='bankaccount',
+            name='balance_fraction',
+        ),
+        migrations.RemoveField(
+            model_name='bankaccount',
+            name='balance_value',
+        ),
+        migrations.RemoveField(
+            model_name='bankaccount',
+            name='currency',
+        ),
     ]
diff --git a/talerbank/app/migrations/0002_bankaccount_amount.py 
b/talerbank/app/migrations/0002_bankaccount_amount.py
deleted file mode 100644
index beaa1d8..0000000
--- a/talerbank/app/migrations/0002_bankaccount_amount.py
+++ /dev/null
@@ -1,21 +0,0 @@
-# -*- coding: utf-8 -*-
-# Generated by Django 1.10.3 on 2017-10-30 13:23
-from __future__ import unicode_literals
-
-from django.db import migrations
-import talerbank.app.models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('app', '0001_initial'),
-    ]
-
-    operations = [
-        migrations.AddField(
-            model_name='bankaccount',
-            name='amount',
-            field=talerbank.app.models.AmountField(default=False),
-        ),
-    ]
diff --git a/talerbank/app/migrations/0003_auto_20171030_1346.py 
b/talerbank/app/migrations/0003_auto_20171030_1346.py
deleted file mode 100644
index 91c6cb9..0000000
--- a/talerbank/app/migrations/0003_auto_20171030_1346.py
+++ /dev/null
@@ -1,21 +0,0 @@
-# -*- coding: utf-8 -*-
-# Generated by Django 1.10.3 on 2017-10-30 13:46
-from __future__ import unicode_literals
-
-from django.db import migrations
-import talerbank.app.models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('app', '0002_bankaccount_amount'),
-    ]
-
-    operations = [
-        migrations.AlterField(
-            model_name='bankaccount',
-            name='amount',
-            field=talerbank.app.models.AmountField(),
-        ),
-    ]
diff --git a/talerbank/app/migrations/0004_auto_20171030_1428.py 
b/talerbank/app/migrations/0004_auto_20171030_1428.py
deleted file mode 100644
index b93ebd4..0000000
--- a/talerbank/app/migrations/0004_auto_20171030_1428.py
+++ /dev/null
@@ -1,34 +0,0 @@
-# -*- coding: utf-8 -*-
-# Generated by Django 1.10.3 on 2017-10-30 14:28
-from __future__ import unicode_literals
-
-from django.db import migrations
-import talerbank.app.models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('app', '0003_auto_20171030_1346'),
-    ]
-
-    operations = [
-        migrations.RemoveField(
-            model_name='banktransaction',
-            name='amount_fraction',
-        ),
-        migrations.RemoveField(
-            model_name='banktransaction',
-            name='amount_value',
-        ),
-        migrations.AddField(
-            model_name='banktransaction',
-            name='amount',
-            field=talerbank.app.models.AmountField(default=False),
-        ),
-        migrations.AlterField(
-            model_name='bankaccount',
-            name='amount',
-            field=talerbank.app.models.AmountField(default=False),
-        ),
-    ]
diff --git a/talerbank/app/migrations/0005_remove_banktransaction_currency.py 
b/talerbank/app/migrations/0005_remove_banktransaction_currency.py
deleted file mode 100644
index 9cd781f..0000000
--- a/talerbank/app/migrations/0005_remove_banktransaction_currency.py
+++ /dev/null
@@ -1,19 +0,0 @@
-# -*- coding: utf-8 -*-
-# Generated by Django 1.10.3 on 2017-10-30 14:37
-from __future__ import unicode_literals
-
-from django.db import migrations
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('app', '0004_auto_20171030_1428'),
-    ]
-
-    operations = [
-        migrations.RemoveField(
-            model_name='banktransaction',
-            name='currency',
-        ),
-    ]
diff --git a/talerbank/app/migrations/0006_auto_20171031_0823.py 
b/talerbank/app/migrations/0006_auto_20171031_0823.py
deleted file mode 100644
index 67c1a70..0000000
--- a/talerbank/app/migrations/0006_auto_20171031_0823.py
+++ /dev/null
@@ -1,21 +0,0 @@
-# -*- coding: utf-8 -*-
-# Generated by Django 1.10.3 on 2017-10-31 08:23
-from __future__ import unicode_literals
-
-from django.db import migrations
-import talerbank.app.models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('app', '0005_remove_banktransaction_currency'),
-    ]
-
-    operations = [
-        migrations.AlterField(
-            model_name='bankaccount',
-            name='amount',
-            field=talerbank.app.models.AmountField(default=None),
-        ),
-    ]
diff --git a/talerbank/app/migrations/0007_auto_20171031_0906.py 
b/talerbank/app/migrations/0007_auto_20171031_0906.py
deleted file mode 100644
index 923cff2..0000000
--- a/talerbank/app/migrations/0007_auto_20171031_0906.py
+++ /dev/null
@@ -1,21 +0,0 @@
-# -*- coding: utf-8 -*-
-# Generated by Django 1.10.3 on 2017-10-31 09:06
-from __future__ import unicode_literals
-
-from django.db import migrations
-import talerbank.app.models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('app', '0006_auto_20171031_0823'),
-    ]
-
-    operations = [
-        migrations.AlterField(
-            model_name='bankaccount',
-            name='amount',
-            
field=talerbank.app.models.AmountField(default=talerbank.app.models.get_zero_amount),
-        ),
-    ]
diff --git a/talerbank/app/migrations/0008_auto_20171031_0938.py 
b/talerbank/app/migrations/0008_auto_20171031_0938.py
deleted file mode 100644
index 3b97829..0000000
--- a/talerbank/app/migrations/0008_auto_20171031_0938.py
+++ /dev/null
@@ -1,31 +0,0 @@
-# -*- coding: utf-8 -*-
-# Generated by Django 1.10.3 on 2017-10-31 09:38
-from __future__ import unicode_literals
-
-from django.db import migrations
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('app', '0007_auto_20171031_0906'),
-    ]
-
-    operations = [
-        migrations.RemoveField(
-            model_name='bankaccount',
-            name='balance',
-        ),
-        migrations.RemoveField(
-            model_name='bankaccount',
-            name='balance_fraction',
-        ),
-        migrations.RemoveField(
-            model_name='bankaccount',
-            name='balance_value',
-        ),
-        migrations.RemoveField(
-            model_name='bankaccount',
-            name='currency',
-        ),
-    ]
diff --git a/talerbank/app/migrations/0009_auto_20171120_1642.py 
b/talerbank/app/migrations/0009_auto_20171120_1642.py
deleted file mode 100644
index 590fb93..0000000
--- a/talerbank/app/migrations/0009_auto_20171120_1642.py
+++ /dev/null
@@ -1,20 +0,0 @@
-# -*- coding: utf-8 -*-
-# Generated by Django 1.10.3 on 2017-11-20 16:42
-from __future__ import unicode_literals
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('app', '0008_auto_20171031_0938'),
-    ]
-
-    operations = [
-        migrations.AlterField(
-            model_name='banktransaction',
-            name='date',
-            field=models.DateTimeField(auto_now=True, db_index=True),
-        ),
-    ]
diff --git a/talerbank/app/migrations/0010_banktransaction_cancelled.py 
b/talerbank/app/migrations/0010_banktransaction_cancelled.py
deleted file mode 100644
index ee46222..0000000
--- a/talerbank/app/migrations/0010_banktransaction_cancelled.py
+++ /dev/null
@@ -1,20 +0,0 @@
-# -*- coding: utf-8 -*-
-# Generated by Django 1.10.3 on 2017-12-07 16:11
-from __future__ import unicode_literals
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('app', '0009_auto_20171120_1642'),
-    ]
-
-    operations = [
-        migrations.AddField(
-            model_name='banktransaction',
-            name='cancelled',
-            field=models.BooleanField(default=False),
-        ),
-    ]
diff --git a/talerbank/app/migrations/0011_banktransaction_reimburses.py 
b/talerbank/app/migrations/0011_banktransaction_reimburses.py
deleted file mode 100644
index 6ea385d..0000000
--- a/talerbank/app/migrations/0011_banktransaction_reimburses.py
+++ /dev/null
@@ -1,19 +0,0 @@
-# Generated by Django 2.0 on 2017-12-12 15:31
-
-from django.db import migrations, models
-import django.db.models.deletion
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('app', '0010_banktransaction_cancelled'),
-    ]
-
-    operations = [
-        migrations.AddField(
-            model_name='banktransaction',
-            name='reimburses',
-            field=models.ForeignKey(default=False, 
on_delete=django.db.models.deletion.CASCADE, related_name='reimburser', 
to='app.BankTransaction'),
-        ),
-    ]
diff --git a/talerbank/app/migrations/0012_auto_20171212_1540.py 
b/talerbank/app/migrations/0012_auto_20171212_1540.py
deleted file mode 100644
index 21af37a..0000000
--- a/talerbank/app/migrations/0012_auto_20171212_1540.py
+++ /dev/null
@@ -1,19 +0,0 @@
-# Generated by Django 2.0 on 2017-12-12 15:40
-
-from django.db import migrations, models
-import django.db.models.deletion
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('app', '0011_banktransaction_reimburses'),
-    ]
-
-    operations = [
-        migrations.AlterField(
-            model_name='banktransaction',
-            name='reimburses',
-            field=models.ForeignKey(default=None, null=True, 
on_delete=django.db.models.deletion.CASCADE, related_name='reimburser', 
to='app.BankTransaction'),
-        ),
-    ]
diff --git a/talerbank/app/migrations/0013_remove_banktransaction_reimburses.py 
b/talerbank/app/migrations/0013_remove_banktransaction_reimburses.py
deleted file mode 100644
index 5b88248..0000000
--- a/talerbank/app/migrations/0013_remove_banktransaction_reimburses.py
+++ /dev/null
@@ -1,17 +0,0 @@
-# Generated by Django 2.0 on 2017-12-14 10:19
-
-from django.db import migrations
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('app', '0012_auto_20171212_1540'),
-    ]
-
-    operations = [
-        migrations.RemoveField(
-            model_name='banktransaction',
-            name='reimburses',
-        ),
-    ]

-- 
To stop receiving notification emails like this one, please contact
address@hidden