Try #127:

Dockerfile

@@ -15,7 +15,7 @@ RUN set -ex \
     --repository http://dl-cdn.alpinelinux.org/alpine/edge/testing \
     gdal-dev \
     geos-dev \
-    proj4-dev \
+    proj-dev \
     && apk add --no-cache --virtual .build-deps \
     gcc \
     libc-dev \

Makefile

@@ -57,8 +57,9 @@ exec_testk: ## Executes django tests in a running container, keeping the databas
 
 lint: ## Lints python files to pass CI
 	docker-compose exec web black . --exclude /migrations/
-	docker-compose exec web pylint ./api/
-
+	docker-compose exec web pylint --ignore=tests ./api/
+	docker-compose exec web pylint --rcfile=api/tests/pylintrc ./api/tests
+
 bash: ## Create shell in web container
 	docker-compose exec web sh
 

project/api/migrations/0011_auto_20190511_1557.py

@@ -0,0 +1,37 @@
+# Generated by Django 2.2.1 on 2019-05-11 15:57
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('api', '0010_auto_20190430_0334'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='historicalterritorialentity',
+            name='dissolution_date',
+            field=models.DecimalField(decimal_places=1, default=0, max_digits=10),
+            preserve_default=False,
+        ),
+        migrations.AddField(
+            model_name='historicalterritorialentity',
+            name='inception_date',
+            field=models.DecimalField(decimal_places=1, default=0, max_digits=10),
+            preserve_default=False,
+        ),
+        migrations.AddField(
+            model_name='territorialentity',
+            name='dissolution_date',
+            field=models.DecimalField(decimal_places=1, default=0, max_digits=10),
+            preserve_default=False,
+        ),
+        migrations.AddField(
+            model_name='territorialentity',
+            name='inception_date',
+            field=models.DecimalField(decimal_places=1, default=0, max_digits=10),
+            preserve_default=False,
+        ),
+    ]

project/api/migrations/0012_auto_20190511_1812.py

@@ -0,0 +1,25 @@
+# Generated by Django 2.2.1 on 2019-05-11 18:12
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('api', '0011_auto_20190511_1557'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='historicalterritorialentity',
+            name='label',
+            field=models.TextField(default='default', max_length=90),
+            preserve_default=False,
+        ),
+        migrations.AddField(
+            model_name='territorialentity',
+            name='label',
+            field=models.TextField(default='default', max_length=90),
+            preserve_default=False,
+        ),
+    ]

project/api/migrations/0013_auto_20190608_0503.py

@@ -0,0 +1,38 @@
+# Generated by Django 2.2.1 on 2019-06-08 05:03
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('api', '0012_auto_20190511_1812'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='historicalterritorialentity',
+            name='stv_count',
+            field=models.IntegerField(blank=True, default=0, null=True),
+        ),
+        migrations.AddField(
+            model_name='territorialentity',
+            name='predecessor',
+            field=models.ManyToManyField(blank=True, to='api.TerritorialEntity'),
+        ),
+        migrations.AddField(
+            model_name='territorialentity',
+            name='stv_count',
+            field=models.IntegerField(blank=True, default=0, null=True),
+        ),
+        migrations.AlterField(
+            model_name='historicalterritorialentity',
+            name='dissolution_date',
+            field=models.DecimalField(blank=True, decimal_places=1, max_digits=10, null=True),
+        ),
+        migrations.AlterField(
+            model_name='territorialentity',
+            name='dissolution_date',
+            field=models.DecimalField(blank=True, decimal_places=1, max_digits=10, null=True),
+        ),
+    ]

project/api/migrations/0014_auto_20190613_0622.py

@@ -0,0 +1,31 @@
+# Generated by Django 2.2.1 on 2019-06-13 06:22
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('api', '0013_auto_20190608_0503'),
+    ]
+
+    operations = [
+        migrations.RemoveField(
+            model_name='historicalterritorialentity',
+            name='stv_count',
+        ),
+        migrations.RemoveField(
+            model_name='territorialentity',
+            name='stv_count',
+        ),
+        migrations.AlterField(
+            model_name='historicalterritorialentity',
+            name='inception_date',
+            field=models.DecimalField(blank=True, decimal_places=1, max_digits=10, null=True),
+        ),
+        migrations.AlterField(
+            model_name='territorialentity',
+            name='inception_date',
+            field=models.DecimalField(blank=True, decimal_places=1, max_digits=10, null=True),
+        ),
+    ]

project/api/models.py

@@ -33,8 +33,18 @@ class TerritorialEntity(models.Model):
     """
 
     wikidata_id = models.PositiveIntegerField()  # Excluding the Q
+    label = models.TextField(max_length=90)
     color = ColorField()
     admin_level = models.PositiveIntegerField()
+    inception_date = models.DecimalField(
+        decimal_places=1, max_digits=10, blank=True, null=True
+    )
+    dissolution_date = models.DecimalField(
+        decimal_places=1, max_digits=10, blank=True, null=True
+    )
+
+    predecessor = models.ManyToManyField("self", blank=True, symmetrical=False)
+
     relations = models.ManyToManyField(
         "self",
         blank=True,
@@ -44,6 +54,15 @@ class TerritorialEntity(models.Model):
     )
     history = HistoricalRecords()
 
+    def clean(self, *args, **kwargs):  # pylint: disable=W0221
+        if not self.inception_date is None and not self.dissolution_date is None:
+            if self.inception_date > self.dissolution_date:
+                raise ValidationError(
+                    "Inception date cannot be later than dissolution date"
+                )
+
+        super(TerritorialEntity, self).clean(*args, **kwargs)
+
     def get_children(self):
         """
         Returns relations in which this nation is a parent

project/api/serializers.py

@@ -53,6 +53,7 @@ class TerritorialEntitySerializer(ModelSerializer):
     """
 
     stvs = SpacetimeVolumeSerializerNoTerritory(many=True, read_only=True)
+    stv_count = IntegerField(read_only=True)
 
     class Meta:
         model = TerritorialEntity

project/api/tests/__init__.py

@@ -0,0 +1,3 @@
+"""Module that contains tests"""
+from .model_tests import *
+from .api_tests import *