From 7d122f43a7ca3dc3153d5bee1034412337eb498e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=C3=A3o=20Rodrigues?= Date: Wed, 13 May 2020 16:11:50 -0300 Subject: [PATCH] =?UTF-8?q?Fix=20materia=20migrations=20(ap=C3=B3s=20c?= =?UTF-8?q?=C3=B3pia)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../migrations/0054_merge_20190802_1112.py | 4 +-- .../migrations/0059_merge_20191003_0854.py | 2 +- .../migrations/0060_auto_20190930_1136.py | 2 +- .../migrations/0062_auto_20190905_1134.py | 32 ------------------- ...14_1119.py => 0062_merge_20191209_1531.py} | 4 +-- .../migrations/0063_auto_20191220_1351.py | 21 ++++++++++++ ...114_1125.py => 0064_auto_20200114_1121.py} | 14 ++------ .../migrations/0065_auto_20200313_1137.py | 2 +- .../migrations/0067_auto_20200416_1538.py | 30 +++++++++++++++++ .../migrations/0067_merge_20200401_1354.py | 16 ---------- ...905_1135.py => 0068_auto_20200513_1544.py} | 27 ++++++++++++++-- 11 files changed, 84 insertions(+), 70 deletions(-) delete mode 100644 sapl/materia/migrations/0062_auto_20190905_1134.py rename sapl/materia/migrations/{0064_merge_20200114_1119.py => 0062_merge_20191209_1531.py} (71%) create mode 100644 sapl/materia/migrations/0063_auto_20191220_1351.py rename sapl/materia/migrations/{0065_auto_20200114_1125.py => 0064_auto_20200114_1121.py} (94%) create mode 100644 sapl/materia/migrations/0067_auto_20200416_1538.py delete mode 100644 sapl/materia/migrations/0067_merge_20200401_1354.py rename sapl/materia/migrations/{0063_auto_20190905_1135.py => 0068_auto_20200513_1544.py} (56%) diff --git a/sapl/materia/migrations/0054_merge_20190802_1112.py b/sapl/materia/migrations/0054_merge_20190802_1112.py index 1f4b05171..2ee5d755e 100644 --- a/sapl/materia/migrations/0054_merge_20190802_1112.py +++ b/sapl/materia/migrations/0054_merge_20190802_1112.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# Generated by Django 1.11.20 on 2019-08-02 14:17 +# Generated by Django 1.11.20 on 2019-08-02 14:12 from __future__ import unicode_literals from django.db import migrations @@ -8,8 +8,8 @@ from django.db import migrations class Migration(migrations.Migration): dependencies = [ - ('materia', '0053_proposicao_ultima_edicao'), ('materia', '0052_auto_20190712_1053'), + ('materia', '0053_proposicao_ultima_edicao'), ] operations = [ diff --git a/sapl/materia/migrations/0059_merge_20191003_0854.py b/sapl/materia/migrations/0059_merge_20191003_0854.py index 53054ed62..efe0351ac 100644 --- a/sapl/materia/migrations/0059_merge_20191003_0854.py +++ b/sapl/materia/migrations/0059_merge_20191003_0854.py @@ -13,4 +13,4 @@ class Migration(migrations.Migration): ] operations = [ - ] \ No newline at end of file + ] diff --git a/sapl/materia/migrations/0060_auto_20190930_1136.py b/sapl/materia/migrations/0060_auto_20190930_1136.py index 560328c2f..0aeed586f 100644 --- a/sapl/materia/migrations/0060_auto_20190930_1136.py +++ b/sapl/materia/migrations/0060_auto_20190930_1136.py @@ -17,4 +17,4 @@ class Migration(migrations.Migration): name='texto', field=models.TextField(blank=True, verbose_name='Texto da Ação'), ), - ] \ No newline at end of file + ] diff --git a/sapl/materia/migrations/0062_auto_20190905_1134.py b/sapl/materia/migrations/0062_auto_20190905_1134.py deleted file mode 100644 index 1bb36abae..000000000 --- a/sapl/materia/migrations/0062_auto_20190905_1134.py +++ /dev/null @@ -1,32 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.11.20 on 2019-09-05 14:34 -from __future__ import unicode_literals - -from django.db import migrations, models -import django.db.models.deletion - - -class Migration(migrations.Migration): - - dependencies = [ - ('materia', '0061_auto_20191120_1440'), - ] - - operations = [ - migrations.CreateModel( - name='TipoTurnoTramitacao', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('nome', models.CharField(max_length=100, verbose_name='Nome do Turno')), - ], - options={ - 'verbose_name': 'Tipo de Turno de Tramitação', - 'verbose_name_plural': 'Tipos de Turno de Tramitação', - }, - ), - migrations.AddField( - model_name='tramitacao', - name='tipo_turno', - field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, to='materia.TipoTurnoTramitacao', verbose_name='Turno'), - ), - ] diff --git a/sapl/materia/migrations/0064_merge_20200114_1119.py b/sapl/materia/migrations/0062_merge_20191209_1531.py similarity index 71% rename from sapl/materia/migrations/0064_merge_20200114_1119.py rename to sapl/materia/migrations/0062_merge_20191209_1531.py index 755ed81a5..857e34e29 100644 --- a/sapl/materia/migrations/0064_merge_20200114_1119.py +++ b/sapl/materia/migrations/0062_merge_20191209_1531.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# Generated by Django 1.11.20 on 2020-01-14 14:19 +# 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 = [ - ('materia', '0063_auto_20190905_1135'), + ('materia', '0061_auto_20191120_1440'), ('materia', '0061_merge_20191009_1814'), ] diff --git a/sapl/materia/migrations/0063_auto_20191220_1351.py b/sapl/materia/migrations/0063_auto_20191220_1351.py new file mode 100644 index 000000000..77194a87c --- /dev/null +++ b/sapl/materia/migrations/0063_auto_20191220_1351.py @@ -0,0 +1,21 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.11.20 on 2019-12-20 16:51 +from __future__ import unicode_literals + +from django.db import migrations, models +import django.db.models.deletion + + +class Migration(migrations.Migration): + + dependencies = [ + ('materia', '0062_merge_20191209_1531'), + ] + + operations = [ + migrations.AlterField( + model_name='pautareuniao', + name='materia', + field=models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, related_name='materia_set', to='materia.MateriaLegislativa', verbose_name='Matéria'), + ), + ] diff --git a/sapl/materia/migrations/0065_auto_20200114_1125.py b/sapl/materia/migrations/0064_auto_20200114_1121.py similarity index 94% rename from sapl/materia/migrations/0065_auto_20200114_1125.py rename to sapl/materia/migrations/0064_auto_20200114_1121.py index e5a93b446..13e8b08d0 100644 --- a/sapl/materia/migrations/0065_auto_20200114_1125.py +++ b/sapl/materia/migrations/0064_auto_20200114_1121.py @@ -1,22 +1,17 @@ # -*- 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 -import django.db.models.deletion class Migration(migrations.Migration): dependencies = [ - ('materia', '0064_merge_20200114_1119'), + ('materia', '0063_auto_20191220_1351'), ] operations = [ - migrations.RemoveField( - model_name='tramitacao', - name='turno', - ), migrations.AlterField( model_name='materialegislativa', name='ano', @@ -32,11 +27,6 @@ class Migration(migrations.Migration): name='ano_materia', field=models.PositiveSmallIntegerField(choices=[(2021, 2021), (2020, 2020), (2019, 2019), (2018, 2018), (2017, 2017), (2016, 2016), (2015, 2015), (2014, 2014), (2013, 2013), (2012, 2012), (2011, 2011), (2010, 2010), (2009, 2009), (2008, 2008), (2007, 2007), (2006, 2006), (2005, 2005), (2004, 2004), (2003, 2003), (2002, 2002), (2001, 2001), (2000, 2000), (1999, 1999), (1998, 1998), (1997, 1997), (1996, 1996), (1995, 1995), (1994, 1994), (1993, 1993), (1992, 1992), (1991, 1991), (1990, 1990), (1989, 1989), (1988, 1988), (1987, 1987), (1986, 1986), (1985, 1985), (1984, 1984), (1983, 1983), (1982, 1982), (1981, 1981), (1980, 1980), (1979, 1979), (1978, 1978), (1977, 1977), (1976, 1976), (1975, 1975), (1974, 1974), (1973, 1973), (1972, 1972), (1971, 1971), (1970, 1970), (1969, 1969), (1968, 1968), (1967, 1967), (1966, 1966), (1965, 1965), (1964, 1964), (1963, 1963), (1962, 1962), (1961, 1961), (1960, 1960), (1959, 1959), (1958, 1958), (1957, 1957), (1956, 1956), (1955, 1955), (1954, 1954), (1953, 1953), (1952, 1952), (1951, 1951), (1950, 1950), (1949, 1949), (1948, 1948), (1947, 1947), (1946, 1946), (1945, 1945), (1944, 1944), (1943, 1943), (1942, 1942), (1941, 1941), (1940, 1940), (1939, 1939), (1938, 1938), (1937, 1937), (1936, 1936), (1935, 1935), (1934, 1934), (1933, 1933), (1932, 1932), (1931, 1931), (1930, 1930), (1929, 1929), (1928, 1928), (1927, 1927), (1926, 1926), (1925, 1925), (1924, 1924), (1923, 1923), (1922, 1922), (1921, 1921), (1920, 1920), (1919, 1919), (1918, 1918), (1917, 1917), (1916, 1916), (1915, 1915), (1914, 1914), (1913, 1913), (1912, 1912), (1911, 1911), (1910, 1910), (1909, 1909), (1908, 1908), (1907, 1907), (1906, 1906), (1905, 1905), (1904, 1904), (1903, 1903), (1902, 1902), (1901, 1901), (1900, 1900), (1899, 1899), (1898, 1898), (1897, 1897), (1896, 1896), (1895, 1895), (1894, 1894), (1893, 1893), (1892, 1892), (1891, 1891), (1890, 1890)], verbose_name='Ano'), ), - migrations.AlterField( - model_name='pautareuniao', - name='materia', - field=models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, related_name='materia_set', to='materia.MateriaLegislativa', verbose_name='Matéria'), - ), migrations.AlterField( model_name='proposicao', name='ano', diff --git a/sapl/materia/migrations/0065_auto_20200313_1137.py b/sapl/materia/migrations/0065_auto_20200313_1137.py index f5e310a80..9c6c8d5d5 100644 --- a/sapl/materia/migrations/0065_auto_20200313_1137.py +++ b/sapl/materia/migrations/0065_auto_20200313_1137.py @@ -8,7 +8,7 @@ from django.db import migrations class Migration(migrations.Migration): dependencies = [ - ('materia', '0064_merge_20200114_1119'), + ('materia', '0064_auto_20200114_1121'), ] operations = [ diff --git a/sapl/materia/migrations/0067_auto_20200416_1538.py b/sapl/materia/migrations/0067_auto_20200416_1538.py new file mode 100644 index 000000000..39582f089 --- /dev/null +++ b/sapl/materia/migrations/0067_auto_20200416_1538.py @@ -0,0 +1,30 @@ +# -*- 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 = [ + ('materia', '0066_auto_20200313_1441'), + ] + + operations = [ + migrations.AlterField( + model_name='materialegislativa', + name='ip', + field=models.CharField(blank=True, default='', max_length=60, verbose_name='IP'), + ), + migrations.AlterField( + model_name='proposicao', + name='ip', + field=models.CharField(blank=True, default='', max_length=60, verbose_name='IP'), + ), + migrations.AlterField( + model_name='tramitacao', + name='ip', + field=models.CharField(blank=True, default='', max_length=60, verbose_name='IP'), + ), + ] diff --git a/sapl/materia/migrations/0067_merge_20200401_1354.py b/sapl/materia/migrations/0067_merge_20200401_1354.py deleted file mode 100644 index 1bfa50d30..000000000 --- a/sapl/materia/migrations/0067_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 = [ - ('materia', '0066_auto_20200313_1441'), - ('materia', '0065_auto_20200114_1125'), - ] - - operations = [ - ] diff --git a/sapl/materia/migrations/0063_auto_20190905_1135.py b/sapl/materia/migrations/0068_auto_20200513_1544.py similarity index 56% rename from sapl/materia/migrations/0063_auto_20190905_1135.py rename to sapl/materia/migrations/0068_auto_20200513_1544.py index e3895853e..a43902c60 100644 --- a/sapl/materia/migrations/0063_auto_20190905_1135.py +++ b/sapl/materia/migrations/0068_auto_20200513_1544.py @@ -1,11 +1,12 @@ # -*- coding: utf-8 -*- -# Generated by Django 1.11.20 on 2019-09-05 13:30 +# Generated by Django 1.11.29 on 2020-05-13 18:44 from __future__ import unicode_literals from django.db import migrations, models from django.utils.translation import ugettext_lazy as _ import django.db.models.deletion + def migra_tipos_turnos_tramitacao(apps, schema_editor): TipoTurnoTramitacao = apps.get_model('materia', 'TipoTurnoTramitacao') Tramitacao = apps.get_model('materia', 'Tramitacao') @@ -41,9 +42,29 @@ def migra_tipos_turnos_tramitacao(apps, schema_editor): class Migration(migrations.Migration): dependencies = [ - ('materia', '0062_auto_20190905_1134') + ('materia', '0067_auto_20200416_1538'), ] operations = [ - migrations.RunPython(migra_tipos_turnos_tramitacao) + migrations.CreateModel( + name='TipoTurnoTramitacao', + fields=[ + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('nome', models.CharField(max_length=100, verbose_name='Nome do Turno')), + ], + options={ + 'verbose_name': 'Tipo de Turno de Tramitação', + 'verbose_name_plural': 'Tipos de Turno de Tramitação', + }, + ), + migrations.AddField( + model_name='tramitacao', + name='tipo_turno', + field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, to='materia.TipoTurnoTramitacao', verbose_name='Turno'), + ), + migrations.RunPython(migra_tipos_turnos_tramitacao), + migrations.RemoveField( + model_name='tramitacao', + name='turno', + ), ]