Merge migrations

4 files changed, 10 insertions, 72 deletions

diff --git a/commcrawler/migrations/0001_initial.py b/commcrawler/migrations/0001_initial.py
index 4712e3d..191ea1d 100644
--- a/commcrawler/migrations/0001_initial.py
+++ b/commcrawler/migrations/0001_initial.py
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-# Generated by Django 1.11 on 2019-08-09 13:04
+# Generated by Django 1.11 on 2019-08-13 10:23
 from __future__ import unicode_literals
 
 import datetime
@@ -23,18 +23,20 @@ class Migration(migrations.Migration):
             fields=[
                 ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
                 ('name', models.CharField(max_length=200, unique=True, verbose_name='Name')),
+                ('time_out', models.PositiveIntegerField(default=10, help_text='0 for no delay', verbose_name='Maximum delay for crawling a target (minutes)')),
                 ('created', models.DateTimeField(default=datetime.datetime.now, verbose_name='Creation')),
                 ('started', models.DateTimeField(blank=True, null=True, verbose_name='Started')),
+                ('pre_crawl_ended', models.DateTimeField(blank=True, null=True, verbose_name='Pre-crawl end')),
                 ('crawl_ended', models.DateTimeField(blank=True, null=True, verbose_name='Crawl end')),
                 ('ended', models.DateTimeField(blank=True, null=True, verbose_name='Ended')),
-                ('status', models.CharField(choices=[('C', 'Created'), ('A', 'Planned'), ('P', 'Crawl in progress'), ('M', 'Match link in progress'), ('F', 'Finished')], default='C', max_length=1, verbose_name='Status')),
+                ('status', models.CharField(choices=[('C', 'Created'), ('A', 'Planned'), ('W', 'Pre-crawl in progress'), ('P', 'Crawl in progress'), ('M', 'Match link in progress'), ('F', 'Finished')], default='C', max_length=1, verbose_name='Status')),
                 ('progression', models.IntegerField(blank=True, null=True, verbose_name='Progression')),
                 ('targets', models.ManyToManyField(blank=True, to='commorganization.Target')),
             ],
             options={
-                'ordering': ('created', 'name'),
-                'verbose_name': 'Crawl',
                 'verbose_name_plural': 'Crawls',
+                'verbose_name': 'Crawl',
+                'ordering': ('created', 'name'),
             },
         ),
         migrations.CreateModel(
@@ -47,8 +49,8 @@ class Migration(migrations.Migration):
                 ('source', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='relation_source', to='commorganization.Target', verbose_name='Source')),
             ],
             options={
-                'verbose_name': 'Crawl relation',
                 'verbose_name_plural': 'Crawl relations',
+                'verbose_name': 'Crawl relation',
             },
         ),
         migrations.CreateModel(
@@ -75,13 +77,14 @@ class Migration(migrations.Migration):
                 ('nb_internal_office', models.IntegerField(default=0, verbose_name='Internal office documents')),
                 ('nb_external_office', models.IntegerField(default=0, verbose_name='External office documents')),
                 ('is_online', models.BooleanField(default=False, verbose_name='Website is online')),
+                ('bad_ssl', models.BooleanField(default=False, verbose_name='Bad SSL certificate')),
                 ('redirection', models.URLField(blank=True, null=True, verbose_name='Redirection')),
                 ('crawl', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='results', to='commcrawler.Crawl', verbose_name='Crawl')),
                 ('target', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='commorganization.Target', verbose_name='Target')),
             ],
             options={
-                'verbose_name': 'Crawl result',
                 'verbose_name_plural': 'Crawl results',
+                'verbose_name': 'Crawl result',
             },
         ),
         migrations.CreateModel(
@@ -91,8 +94,8 @@ class Migration(migrations.Migration):
                 ('domain', models.CharField(max_length=100, unique=True, validators=[django.contrib.sites.models._simple_domain_name_validator], verbose_name='Domain name')),
             ],
             options={
-                'verbose_name': 'Excluded domain',
                 'verbose_name_plural': 'Excluded domains',
+                'verbose_name': 'Excluded domain',
             },
         ),
         migrations.AlterUniqueTogether(
diff --git a/commcrawler/migrations/0002_crawlresult_bad_ssl.py b/commcrawler/migrations/0002_crawlresult_bad_ssl.py
deleted file mode 100644
index 7597876..0000000
--- a/commcrawler/migrations/0002_crawlresult_bad_ssl.py
+++ /dev/null
@@ -1,20 +0,0 @@
-# -*- coding: utf-8 -*-
-# Generated by Django 1.11 on 2019-08-09 13:38
-from __future__ import unicode_literals
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('commcrawler', '0001_initial'),
-    ]
-
-    operations = [
-        migrations.AddField(
-            model_name='crawlresult',
-            name='bad_ssl',
-            field=models.BooleanField(default=False, verbose_name='Bad SSL certificate'),
-        ),
-    ]
diff --git a/commcrawler/migrations/0003_auto_20190809_1607.py b/commcrawler/migrations/0003_auto_20190809_1607.py
deleted file mode 100644
index 3018fc2..0000000
--- a/commcrawler/migrations/0003_auto_20190809_1607.py
+++ /dev/null
@@ -1,25 +0,0 @@
-# -*- coding: utf-8 -*-
-# Generated by Django 1.11 on 2019-08-09 14:07
-from __future__ import unicode_literals
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('commcrawler', '0002_crawlresult_bad_ssl'),
-    ]
-
-    operations = [
-        migrations.AddField(
-            model_name='crawl',
-            name='pre_crawl_ended',
-            field=models.DateTimeField(blank=True, null=True, verbose_name='Pre-crawl end'),
-        ),
-        migrations.AlterField(
-            model_name='crawl',
-            name='status',
-            field=models.CharField(choices=[('C', 'Created'), ('A', 'Planned'), ('W', 'Pre-crawl in progress'), ('P', 'Crawl in progress'), ('M', 'Match link in progress'), ('F', 'Finished')], default='C', max_length=1, verbose_name='Status'),
-        ),
-    ]
diff --git a/commcrawler/migrations/0004_crawl_time_out.py b/commcrawler/migrations/0004_crawl_time_out.py
deleted file mode 100644
index e7dae3a..0000000
--- a/commcrawler/migrations/0004_crawl_time_out.py
+++ /dev/null
@@ -1,20 +0,0 @@
-# -*- coding: utf-8 -*-
-# Generated by Django 1.11 on 2019-08-13 10:15
-from __future__ import unicode_literals
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('commcrawler', '0003_auto_20190809_1607'),
-    ]
-
-    operations = [
-        migrations.AddField(
-            model_name='crawl',
-            name='time_out',
-            field=models.PositiveIntegerField(default=10, help_text='0 for no delay', verbose_name='Maximum delay for crawling a target (minutes)'),
-        ),
-    ]