CI: Adjust tested Django versions

.gitlab-ci.yml

@@ -11,18 +11,6 @@ before_script:
     - python3.6 -m venv $HOME/tox
     - $HOME/tox/bin/pip install tox
 
-py27-django18-jsonfield0:
-    stage: test
-    script: $HOME/tox/bin/tox -e 'py27-django18-jsonfield0'
-
-py27-django18-jsonfield1:
-    stage: test
-    script: $HOME/tox/bin/tox -e 'py27-django18-jsonfield1'
-
-py27-django18-jsonfield2:
-    stage: test
-    script: $HOME/tox/bin/tox -e 'py27-django18-jsonfield2'
-
 py27-django110-jsonfield0:
     stage: test
     script: $HOME/tox/bin/tox -e 'py27-django110-jsonfield0'
@@ -47,18 +35,6 @@ py27-django111-jsonfield2:
     stage: test
     script: $HOME/tox/bin/tox -e 'py27-django111-jsonfield2'
 
-py36-django18-jsonfield0:
-    stage: test
-    script: $HOME/tox/bin/tox -e 'py36-django18-jsonfield0'
-
-py36-django18-jsonfield1:
-    stage: test
-    script: $HOME/tox/bin/tox -e 'py36-django18-jsonfield1'
-
-py36-django18-jsonfield2:
-    stage: test
-    script: $HOME/tox/bin/tox -e 'py36-django18-jsonfield2'
-
 py36-django110-jsonfield0:
     stage: test
     script: $HOME/tox/bin/tox -e 'py36-django110-jsonfield0'
@@ -83,3 +59,15 @@ py36-django111-jsonfield2:
     stage: test
     script: $HOME/tox/bin/tox -e 'py36-django111-jsonfield2'
 
+py36-django20-jsonfield0:
+    stage: test
+    script: $HOME/tox/bin/tox -e 'py36-django20-jsonfield0'
+
+py36-django20-jsonfield1:
+    stage: test
+    script: $HOME/tox/bin/tox -e 'py36-django20-jsonfield1'
+
+py36-django20-jsonfield2:
+    stage: test
+    script: $HOME/tox/bin/tox -e 'py36-django20-jsonfield2'
+

tests/models.py

@@ -15,7 +15,7 @@ class TestModel(models.Model):
     char_field = models.CharField(max_length=16)
     int_field = models.IntegerField()
     bool_field = models.BooleanField()
-    foreign_key = models.ForeignKey(RelatedTestModel)
+    foreign_key = models.ForeignKey(RelatedTestModel, on_delete=models.CASCADE)
     date_time_field = models.DateTimeField(auto_now_add=True)
     # The `created` field will be excluded from the journal for testing
     created = models.DateTimeField(auto_now_add=True, editable=False)

tox.ini

 [tox]
-envlist = py{27,36}-django{18,110,111}-jsonfield{0,1,2}
+envlist = py{27}-django{110,111}-jsonfield{0,1,2},
+          py{36}-django{110,111,20}-jsonfield{0,1,2},
 
 [testenv]
 commands = {envpython} runtests.py
@@ -7,9 +8,10 @@ deps =
     jsonfield0: jsonfield < 1
     jsonfield1: jsonfield >= 1, < 2
     jsonfield2: jsonfield >= 2
-    django18: Django >= 1.8, < 1.9
     django110: Django >= 1.10, < 1.11
     django111: Django >= 1.11, < 2
+    django20: Django >= 2, < 2.1
+
 
 [testenv:py36]
 basepython=/usr/bin/python3.6