diff options
| author | Étienne Loks <etienne.loks@iggdrasil.net> | 2019-08-09 15:04:25 +0200 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@iggdrasil.net> | 2019-08-09 15:04:25 +0200 |
| commit | 34317f3c96ff46ff9483c8c2a2d8c947d9b563ea (patch) | |
| tree | 5220d6350a2c39dfc9c06c03227b395ffe1740ac /commcrawler | |
| parent | 918fba03bc48971e25ddc7aa2ee79d08bf0dbd26 (diff) | |
| download | Comm-on-net-34317f3c96ff46ff9483c8c2a2d8c947d9b563ea.tar.bz2 Comm-on-net-34317f3c96ff46ff9483c8c2a2d8c947d9b563ea.zip | |
Merge migrations
Diffstat (limited to 'commcrawler')
| -rw-r--r-- | commcrawler/migrations/0001_initial.py | 26 | ||||
| -rw-r--r-- | commcrawler/migrations/0002_auto_20190809_1502.py | 22 |
2 files changed, 5 insertions, 43 deletions
diff --git a/commcrawler/migrations/0001_initial.py b/commcrawler/migrations/0001_initial.py index 3240494..4712e3d 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 11:22 +# Generated by Django 1.11 on 2019-08-09 13:04 from __future__ import unicode_literals import datetime @@ -32,20 +32,9 @@ class Migration(migrations.Migration): ('targets', models.ManyToManyField(blank=True, to='commorganization.Target')), ], options={ - 'verbose_name_plural': 'Crawls', 'ordering': ('created', 'name'), 'verbose_name': 'Crawl', - }, - ), - migrations.CreateModel( - name='CrawlLink', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('link', models.URLField(verbose_name='Link')), - ], - options={ - 'verbose_name_plural': 'Crawl links', - 'verbose_name': 'Crawl link', + 'verbose_name_plural': 'Crawls', }, ), migrations.CreateModel( @@ -58,8 +47,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_plural': 'Crawl relations', 'verbose_name': 'Crawl relation', + 'verbose_name_plural': 'Crawl relations', }, ), migrations.CreateModel( @@ -91,8 +80,8 @@ class Migration(migrations.Migration): ('target', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='commorganization.Target', verbose_name='Target')), ], options={ - 'verbose_name_plural': 'Crawl results', 'verbose_name': 'Crawl result', + 'verbose_name_plural': 'Crawl results', }, ), migrations.CreateModel( @@ -102,15 +91,10 @@ 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_plural': 'Excluded domains', 'verbose_name': 'Excluded domain', + 'verbose_name_plural': 'Excluded domains', }, ), - migrations.AddField( - model_name='crawllink', - name='result', - field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='commcrawler.CrawlResult', verbose_name='Result'), - ), migrations.AlterUniqueTogether( name='crawlresult', unique_together=set([('crawl', 'target')]), diff --git a/commcrawler/migrations/0002_auto_20190809_1502.py b/commcrawler/migrations/0002_auto_20190809_1502.py deleted file mode 100644 index 6141d9f..0000000 --- a/commcrawler/migrations/0002_auto_20190809_1502.py +++ /dev/null @@ -1,22 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.11 on 2019-08-09 13:02 -from __future__ import unicode_literals - -from django.db import migrations - - -class Migration(migrations.Migration): - - dependencies = [ - ('commcrawler', '0001_initial'), - ] - - operations = [ - migrations.RemoveField( - model_name='crawllink', - name='result', - ), - migrations.DeleteModel( - name='CrawlLink', - ), - ] |