From d21db53770726a4d8bef0de90ada1f5f0ee3d9af Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jo=C3=A3o=20Rodrigues?= <cont.joaorodrigues@gmail.com>
Date: Wed, 13 May 2020 16:24:31 -0300
Subject: [PATCH] Norma migrations

---
 .../migrations/0026_merge_20190708_1120.py    | 16 ---------------
 .../migrations/0027_merge_20190802_1117.py    | 16 ---------------
 .../migrations/0028_merge_20191003_0909.py    | 16 ---------------
 .../migrations/0030_merge_20191204_1129.py    | 16 ---------------
 ...17_1538.py => 0030_merge_20191209_1531.py} |  4 ++--
 ...114_1125.py => 0031_auto_20200114_1121.py} |  4 ++--
 .../migrations/0032_auto_20200221_1533.py     |  2 +-
 .../migrations/0033_auto_20200416_1538.py     | 20 +++++++++++++++++++
 .../migrations/0033_merge_20200401_1354.py    | 16 ---------------
 ...704_0816.py => 0034_auto_20200513_1544.py} |  4 ++--
 10 files changed, 27 insertions(+), 87 deletions(-)
 delete mode 100644 sapl/norma/migrations/0026_merge_20190708_1120.py
 delete mode 100644 sapl/norma/migrations/0027_merge_20190802_1117.py
 delete mode 100644 sapl/norma/migrations/0028_merge_20191003_0909.py
 delete mode 100644 sapl/norma/migrations/0030_merge_20191204_1129.py
 rename sapl/norma/migrations/{0031_merge_20191217_1538.py => 0030_merge_20191209_1531.py} (71%)
 rename sapl/norma/migrations/{0032_auto_20200114_1125.py => 0031_auto_20200114_1121.py} (98%)
 create mode 100644 sapl/norma/migrations/0033_auto_20200416_1538.py
 delete mode 100644 sapl/norma/migrations/0033_merge_20200401_1354.py
 rename sapl/norma/migrations/{0025_auto_20190704_0816.py => 0034_auto_20200513_1544.py} (86%)

diff --git a/sapl/norma/migrations/0026_merge_20190708_1120.py b/sapl/norma/migrations/0026_merge_20190708_1120.py
deleted file mode 100644
index d1776b98c..000000000
--- a/sapl/norma/migrations/0026_merge_20190708_1120.py
+++ /dev/null
@@ -1,16 +0,0 @@
-# -*- coding: utf-8 -*-
-# Generated by Django 1.11.20 on 2019-07-08 14:20
-from __future__ import unicode_literals
-
-from django.db import migrations
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('norma', '0025_auto_20190704_0816'),
-        ('norma', '0025_auto_20190704_1403'),
-    ]
-
-    operations = [
-    ]
diff --git a/sapl/norma/migrations/0027_merge_20190802_1117.py b/sapl/norma/migrations/0027_merge_20190802_1117.py
deleted file mode 100644
index 00e334a7c..000000000
--- a/sapl/norma/migrations/0027_merge_20190802_1117.py
+++ /dev/null
@@ -1,16 +0,0 @@
-# -*- coding: utf-8 -*-
-# Generated by Django 1.11.20 on 2019-08-02 14:17
-from __future__ import unicode_literals
-
-from django.db import migrations
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('norma', '0026_auto_20190712_1053'),
-        ('norma', '0026_merge_20190708_1120'),
-    ]
-
-    operations = [
-    ]
diff --git a/sapl/norma/migrations/0028_merge_20191003_0909.py b/sapl/norma/migrations/0028_merge_20191003_0909.py
deleted file mode 100644
index d0c7e878c..000000000
--- a/sapl/norma/migrations/0028_merge_20191003_0909.py
+++ /dev/null
@@ -1,16 +0,0 @@
-# -*- coding: utf-8 -*-
-# Generated by Django 1.11.20 on 2019-10-03 12:09
-from __future__ import unicode_literals
-
-from django.db import migrations
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('norma', '0027_merge_20190802_1117'),
-        ('norma', '0027_auto_20191001_1115'),
-    ]
-
-    operations = [
-    ]
diff --git a/sapl/norma/migrations/0030_merge_20191204_1129.py b/sapl/norma/migrations/0030_merge_20191204_1129.py
deleted file mode 100644
index 2327472ff..000000000
--- a/sapl/norma/migrations/0030_merge_20191204_1129.py
+++ /dev/null
@@ -1,16 +0,0 @@
-# -*- coding: utf-8 -*-
-# Generated by Django 1.11.20 on 2019-12-04 14:29
-from __future__ import unicode_literals
-
-from django.db import migrations
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('norma', '0029_auto_20191024_1344'),
-        ('norma', '0028_merge_20191003_0909'),
-    ]
-
-    operations = [
-    ]
diff --git a/sapl/norma/migrations/0031_merge_20191217_1538.py b/sapl/norma/migrations/0030_merge_20191209_1531.py
similarity index 71%
rename from sapl/norma/migrations/0031_merge_20191217_1538.py
rename to sapl/norma/migrations/0030_merge_20191209_1531.py
index 34ab03bb0..9fd58f6e4 100644
--- a/sapl/norma/migrations/0031_merge_20191217_1538.py
+++ b/sapl/norma/migrations/0030_merge_20191209_1531.py
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-# Generated by Django 1.11.20 on 2019-12-17 18:38
+# Generated by Django 1.11.20 on 2019-12-09 18:31
 from __future__ import unicode_literals
 
 from django.db import migrations
@@ -8,7 +8,7 @@ from django.db import migrations
 class Migration(migrations.Migration):
 
     dependencies = [
-        ('norma', '0030_merge_20191204_1129'),
+        ('norma', '0029_auto_20191024_1344'),
         ('norma', '0028_merge_20191009_1814'),
     ]
 
diff --git a/sapl/norma/migrations/0032_auto_20200114_1125.py b/sapl/norma/migrations/0031_auto_20200114_1121.py
similarity index 98%
rename from sapl/norma/migrations/0032_auto_20200114_1125.py
rename to sapl/norma/migrations/0031_auto_20200114_1121.py
index e44e28b5b..1be3737d1 100644
--- a/sapl/norma/migrations/0032_auto_20200114_1125.py
+++ b/sapl/norma/migrations/0031_auto_20200114_1121.py
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-# Generated by Django 1.11.20 on 2020-01-14 14:25
+# Generated by Django 1.11.20 on 2020-01-14 14:21
 from __future__ import unicode_literals
 
 from django.db import migrations, models
@@ -9,7 +9,7 @@ import sapl.norma.models
 class Migration(migrations.Migration):
 
     dependencies = [
-        ('norma', '0031_merge_20191217_1538'),
+        ('norma', '0030_merge_20191209_1531'),
     ]
 
     operations = [
diff --git a/sapl/norma/migrations/0032_auto_20200221_1533.py b/sapl/norma/migrations/0032_auto_20200221_1533.py
index bc78d407d..810db5480 100644
--- a/sapl/norma/migrations/0032_auto_20200221_1533.py
+++ b/sapl/norma/migrations/0032_auto_20200221_1533.py
@@ -8,7 +8,7 @@ from django.db import migrations, models
 class Migration(migrations.Migration):
 
     dependencies = [
-        ('norma', '0031_merge_20191217_1538'),
+        ('norma', '0031_auto_20200114_1121'),
     ]
 
     operations = [
diff --git a/sapl/norma/migrations/0033_auto_20200416_1538.py b/sapl/norma/migrations/0033_auto_20200416_1538.py
new file mode 100644
index 000000000..29eb096fe
--- /dev/null
+++ b/sapl/norma/migrations/0033_auto_20200416_1538.py
@@ -0,0 +1,20 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.11.29 on 2020-04-16 18:38
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('norma', '0032_auto_20200221_1533'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='normajuridica',
+            name='ip',
+            field=models.CharField(blank=True, default='', max_length=60, verbose_name='IP'),
+        ),
+    ]
diff --git a/sapl/norma/migrations/0033_merge_20200401_1354.py b/sapl/norma/migrations/0033_merge_20200401_1354.py
deleted file mode 100644
index 2e8758853..000000000
--- a/sapl/norma/migrations/0033_merge_20200401_1354.py
+++ /dev/null
@@ -1,16 +0,0 @@
-# -*- coding: utf-8 -*-
-# Generated by Django 1.11.29 on 2020-04-01 16:54
-from __future__ import unicode_literals
-
-from django.db import migrations
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('norma', '0032_auto_20200114_1125'),
-        ('norma', '0032_auto_20200221_1533'),
-    ]
-
-    operations = [
-    ]
diff --git a/sapl/norma/migrations/0025_auto_20190704_0816.py b/sapl/norma/migrations/0034_auto_20200513_1544.py
similarity index 86%
rename from sapl/norma/migrations/0025_auto_20190704_0816.py
rename to sapl/norma/migrations/0034_auto_20200513_1544.py
index f34623663..eef4cfe9c 100644
--- a/sapl/norma/migrations/0025_auto_20190704_0816.py
+++ b/sapl/norma/migrations/0034_auto_20200513_1544.py
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-# Generated by Django 1.11.22 on 2019-07-04 11:16
+# Generated by Django 1.11.29 on 2020-05-13 18:44
 from __future__ import unicode_literals
 
 from django.db import migrations, models
@@ -8,7 +8,7 @@ from django.db import migrations, models
 class Migration(migrations.Migration):
 
     dependencies = [
-        ('norma', '0024_auto_20190425_0917'),
+        ('norma', '0033_auto_20200416_1538'),
     ]
 
     operations = [