Merge 4c4225b into d46c06b

.travis.yml

@@ -1,50 +1,50 @@
-sudo: false
+sudo: true
+dist: xenial
 
 language: python
 
 python:
   - "2.7"
-  - "3.4"
   - "3.5"
   - "3.6"
+  - "3.7"
 
 env:
   - MODE=flake8
   - MODE=flake8-strict
   - MODE=docs
   - DJANGO_VERSION=dj111
-  - DJANGO_VERSION=dj20
   - DJANGO_VERSION=dj21
+  - DJANGO_VERSION=dj22
   - DJANGO_VERSION=djdev
 
 matrix:
   allow_failures:
     - env: DJANGO_VERSION=djdev
     - env: MODE=flake8-strict
   exclude:
-    - python: "3.4"
-      env: MODE=flake8
-    - python: "3.4"
-      env: MODE=flake8-strict
-    - python: "3.4"
-      env: DJANGO_VERSION=djdev
-    - python: "3.4"
-      env: DJANGO_VERSION=dj21
     - python: "2.7"
       env: DJANGO_VERSION=djdev
-    - python: "2.7"
-      env: DJANGO_VERSION=dj20
     - python: "2.7"
       env: DJANGO_VERSION=dj21
+    - python: "2.7"
+      env: DJANGO_VERSION=dj22
+    - python: "3.5"
+      env: DJANGO_VERSION=djdev
+
+before_install:
+  - sudo apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 762E3157
 
 addons:
   apt:
     packages:
     - binutils
     - libproj-dev
     - gdal-bin
+    - libsqlite3-mod-spatialite
+    - libsqlite3-0
     - spatialite-bin
-    - libspatialite-dev
+    - libspatialite7
 
 cache:
   directories:
@@ -62,6 +62,10 @@ install:
 after_success:
     - coveralls
 
+# get some apt package info
+before_script:
+    - sudo apt show libsqlite3-0 libspatialite7 libsqlite3-mod-spatialite spatialite-bin
+
 # command to run tests
 script:
     - coverage erase

tests/alphanumeric/migrations/0001_initial.py

@@ -0,0 +1,24 @@
+# Generated by Django 2.2.1 on 2019-05-28 22:26
+
+from django.db import migrations, models
+import tastypie.utils.timezone
+
+
+class Migration(migrations.Migration):
+
+    initial = True
+
+    dependencies = [
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='Product',
+            fields=[
+                ('artnr', models.CharField(max_length=8, primary_key=True, serialize=False)),
+                ('name', models.CharField(blank=True, default='', max_length=32)),
+                ('created', models.DateTimeField(default=tastypie.utils.timezone.now)),
+                ('updated', models.DateTimeField(default=tastypie.utils.timezone.now)),
+            ],
+        ),
+    ]

tests/authorization/migrations/0001_initial.py

@@ -0,0 +1,40 @@
+# Generated by Django 2.2.1 on 2019-05-28 22:27
+
+from django.conf import settings
+from django.db import migrations, models
+import django.db.models.deletion
+import tastypie.utils.timezone
+
+
+class Migration(migrations.Migration):
+
+    initial = True
+
+    dependencies = [
+        ('sites', '0002_alter_domain_unique'),
+        migrations.swappable_dependency(settings.AUTH_USER_MODEL),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='AuthorProfile',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('short_bio', models.CharField(blank=True, default='', max_length=255)),
+                ('bio', models.TextField(blank=True, default='')),
+                ('sites', models.ManyToManyField(related_name='author_profiles', to='sites.Site')),
+                ('user', models.OneToOneField(on_delete=django.db.models.deletion.CASCADE, related_name='author_profile', to=settings.AUTH_USER_MODEL)),
+            ],
+        ),
+        migrations.CreateModel(
+            name='Article',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('title', models.CharField(max_length=255)),
+                ('slug', models.SlugField(blank=True)),
+                ('content', models.TextField(blank=True, default='')),
+                ('added_on', models.DateTimeField(default=tastypie.utils.timezone.now)),
+                ('authors', models.ManyToManyField(related_name='articles', to='authorization.AuthorProfile')),
+            ],
+        ),
+    ]

tests/basic/migrations/0001_initial.py

@@ -0,0 +1,48 @@
+# Generated by Django 2.2.1 on 2019-05-28 22:27
+
+from django.conf import settings
+from django.db import migrations, models
+import django.db.models.deletion
+import tastypie.utils.timezone
+
+
+class Migration(migrations.Migration):
+
+    initial = True
+
+    dependencies = [
+        migrations.swappable_dependency(settings.AUTH_USER_MODEL),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='SlugBasedNote',
+            fields=[
+                ('slug', models.SlugField(primary_key=True, serialize=False)),
+                ('title', models.CharField(max_length=255)),
+                ('content', models.TextField()),
+                ('is_active', models.BooleanField(default=True)),
+            ],
+        ),
+        migrations.CreateModel(
+            name='Note',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('title', models.CharField(max_length=255)),
+                ('slug', models.SlugField()),
+                ('content', models.TextField()),
+                ('is_active', models.BooleanField(default=True)),
+                ('created', models.DateTimeField(default=tastypie.utils.timezone.now)),
+                ('updated', models.DateTimeField(default=tastypie.utils.timezone.now)),
+                ('user', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='notes', to=settings.AUTH_USER_MODEL)),
+            ],
+        ),
+        migrations.CreateModel(
+            name='AnnotatedNote',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('annotations', models.TextField()),
+                ('note', models.OneToOneField(on_delete=django.db.models.deletion.CASCADE, related_name='annotated', to='basic.Note')),
+            ],
+        ),
+    ]

tests/content_gfk/migrations/0001_initial.py

@@ -0,0 +1,49 @@
+# Generated by Django 2.2.1 on 2019-05-28 22:27
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    initial = True
+
+    dependencies = [
+        ('contenttypes', '0002_remove_content_type_name'),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='Definition',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('word', models.CharField(max_length=255)),
+                ('content', models.TextField()),
+            ],
+        ),
+        migrations.CreateModel(
+            name='Note',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('title', models.CharField(max_length=255)),
+                ('content', models.TextField()),
+            ],
+        ),
+        migrations.CreateModel(
+            name='Quote',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('byline', models.CharField(max_length=255)),
+                ('content', models.TextField()),
+            ],
+        ),
+        migrations.CreateModel(
+            name='Rating',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('rating', models.PositiveIntegerField(choices=[(1, 1), (2, 2), (3, 3), (4, 4), (5, 5)], default=3)),
+                ('object_id', models.PositiveIntegerField()),
+                ('content_type', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='contenttypes.ContentType')),
+            ],
+        ),
+    ]

tests/core/migrations/0001_initial.py

@@ -0,0 +1,117 @@
+# Generated by Django 2.2 on 2019-05-27 15:40
+
+import core.models
+from django.conf import settings
+from django.db import migrations, models
+import django.db.models.deletion
+import tastypie.utils.timezone
+import uuid
+
+
+class Migration(migrations.Migration):
+
+    initial = True
+
+    dependencies = [
+        migrations.swappable_dependency(settings.AUTH_USER_MODEL),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='AutoNowNote',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('title', models.CharField(max_length=100)),
+                ('slug', models.SlugField(unique=True)),
+                ('content', models.TextField(blank=True)),
+                ('is_active', models.BooleanField(blank=True, default=True)),
+                ('created', models.DateTimeField(auto_now_add=True, null=True)),
+                ('updated', models.DateTimeField(auto_now=True)),
+            ],
+        ),
+        migrations.CreateModel(
+            name='Counter',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('name', models.CharField(max_length=30)),
+                ('slug', models.SlugField(unique=True)),
+                ('count', models.PositiveIntegerField(default=0)),
+            ],
+        ),
+        migrations.CreateModel(
+            name='DateRecord',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('date', models.DateField()),
+                ('username', models.CharField(max_length=20)),
+                ('message', models.CharField(max_length=20)),
+            ],
+        ),
+        migrations.CreateModel(
+            name='MyDefaultPKModel',
+            fields=[
+                ('id', models.IntegerField(default=core.models.get_next, editable=False, primary_key=True, serialize=False)),
+                ('content', models.TextField(blank=True, default='')),
+            ],
+        ),
+        migrations.CreateModel(
+            name='MyUUIDModel',
+            fields=[
+                ('id', models.UUIDField(default=uuid.uuid4, editable=False, primary_key=True, serialize=False)),
+                ('anotheruuid', models.UUIDField(default=uuid.uuid4)),
+                ('content', models.TextField(blank=True, default='')),
+                ('order', models.IntegerField(blank=True, default=0)),
+            ],
+            options={
+                'ordering': ('order',),
+            },
+        ),
+        migrations.CreateModel(
+            name='Note',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('title', models.CharField(max_length=100, verbose_name='The Title')),
+                ('slug', models.SlugField()),
+                ('content', models.TextField(blank=True)),
+                ('is_active', models.BooleanField(blank=True, default=True)),
+                ('created', models.DateTimeField(default=tastypie.utils.timezone.now)),
+                ('updated', models.DateTimeField(default=tastypie.utils.timezone.now)),
+                ('author', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='notes', to=settings.AUTH_USER_MODEL)),
+            ],
+        ),
+        migrations.CreateModel(
+            name='Subject',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('name', models.CharField(max_length=255)),
+                ('url', models.URLField()),
+                ('created', models.DateTimeField(default=tastypie.utils.timezone.now)),
+                ('notes', models.ManyToManyField(related_name='subjects', to='core.Note')),
+            ],
+        ),
+        migrations.CreateModel(
+            name='MyRelatedUUIDModel',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('content', models.TextField(blank=True, default='')),
+                ('myuuidmodels', models.ManyToManyField(to='core.MyUUIDModel')),
+            ],
+        ),
+        migrations.CreateModel(
+            name='MediaBit',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('title', models.CharField(max_length=32)),
+                ('image', models.FileField(blank=True, null=True, upload_to='bits/')),
+                ('note', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='media_bits', to='core.Note')),
+            ],
+        ),
+        migrations.CreateModel(
+            name='NoteWithEditor',
+            fields=[
+                ('note_ptr', models.OneToOneField(auto_created=True, on_delete=django.db.models.deletion.CASCADE, parent_link=True, primary_key=True, serialize=False, to='core.Note')),
+                ('editor', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='notes_edited', to=settings.AUTH_USER_MODEL)),
+            ],
+            bases=('core.note',),
+        ),
+    ]

tests/core/models.py

@@ -112,8 +112,12 @@ class Meta:
 int_source = count(1)
 
 
+def get_next():
+    return next(int_source)
+
+
 class MyDefaultPKModel(models.Model):
-    id = models.IntegerField(primary_key=True, default=lambda: next(int_source), editable=False)
+    id = models.IntegerField(primary_key=True, default=get_next, editable=False)
     content = models.TextField(blank=True, default='')
 
     class Meta: