diff options
| author | Étienne Loks <etienne.loks@iggdrasil.net> | 2019-08-08 13:17:43 +0200 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@iggdrasil.net> | 2019-08-08 13:17:43 +0200 |
| commit | ed9f173ac5a5e5af7670dfd7f783942e80bdf770 (patch) | |
| tree | d0d1107084206e7b0d19431baf9304637b2f2901 /commcrawler | |
| parent | d93445a8037190a060ad022eab56d4da57bcae76 (diff) | |
| download | Comm-on-net-ed9f173ac5a5e5af7670dfd7f783942e80bdf770.tar.bz2 Comm-on-net-ed9f173ac5a5e5af7670dfd7f783942e80bdf770.zip | |
Merge migrations
Diffstat (limited to 'commcrawler')
| -rw-r--r-- | commcrawler/migrations/0001_initial.py | 6 | ||||
| -rw-r--r-- | commcrawler/migrations/0002_auto_20190808_1315.py | 20 |
2 files changed, 3 insertions, 23 deletions
diff --git a/commcrawler/migrations/0001_initial.py b/commcrawler/migrations/0001_initial.py index 26cdd2d..807fdb7 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-07 01:17 +# Generated by Django 1.11 on 2019-08-08 11:17 from __future__ import unicode_literals import datetime @@ -30,9 +30,9 @@ class Migration(migrations.Migration): ('targets', models.ManyToManyField(blank=True, to='commorganization.Target')), ], options={ + 'ordering': ('created', 'name'), 'verbose_name_plural': 'Crawls', 'verbose_name': 'Crawl', - 'ordering': ('created', 'name'), }, ), migrations.CreateModel( @@ -66,7 +66,7 @@ class Migration(migrations.Migration): ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), ('started', models.DateTimeField(default=datetime.datetime.now, verbose_name='Start date')), ('duration', models.DurationField(blank=True, null=True, verbose_name='Duration')), - ('status', models.CharField(choices=[('P', 'In progress'), ('F', 'Finished')], default='P', max_length=1, verbose_name='Status')), + ('status', models.CharField(choices=[('P', 'In progress'), ('T', 'Time out'), ('F', 'Finished')], default='P', max_length=1, verbose_name='Status')), ('crawl_result', django.contrib.postgres.fields.jsonb.JSONField(default=list, verbose_name='Crawl result')), ('nb_external_link', models.IntegerField(default=0, verbose_name='Number of external links')), ('nb_internal_link', models.IntegerField(default=0, verbose_name='Number of internal links')), diff --git a/commcrawler/migrations/0002_auto_20190808_1315.py b/commcrawler/migrations/0002_auto_20190808_1315.py deleted file mode 100644 index 1e2bd7c..0000000 --- a/commcrawler/migrations/0002_auto_20190808_1315.py +++ /dev/null @@ -1,20 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.11 on 2019-08-08 11:15 -from __future__ import unicode_literals - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('commcrawler', '0001_initial'), - ] - - operations = [ - migrations.AlterField( - model_name='crawlresult', - name='status', - field=models.CharField(choices=[('P', 'In progress'), ('T', 'Time out'), ('F', 'Finished')], default='P', max_length=1, verbose_name='Status'), - ), - ] |