feat: Upgrade to Django 2.2 (#1416)

* Upgrade Django to 2.0

* Include namespace in admin urls

* Specify on_delete for models

* Remove level attempt model

* Fix test names

* Add test for on_delete

* Specify Django 2.0

* Use user attributes instead of function

* Try specifying Django 2.0 in Cypress

* Try installing local branches of other repos in cypress

* Dummy commit

* Simplify admin urls + Black

* Fix urls + fix tests

* Install local branches on Travis

* Install Django in Cypress

* Remove old unused view

* Update to Django 2.2 and upgrade dependencies

* Update actions to install local branches

* Install RR before portal

* Improve model tests

* Add test worksheet to other games

.github/workflows/ci.yml

@@ -21,6 +21,9 @@ jobs:
       run: |
         pip install pipenv
         pipenv install --dev --system
+        pip install -U git+https://github.com/ocadotechnology/rapid-router@django_2_0_test
+        pip install -U git+https://github.com/ocadotechnology/codeforlife-portal@django_2_upgrade
+        pip install -U "git+https://github.com/ocadotechnology/codeforlife-portal@django_2_upgrade#egg=cfl-common&subdirectory=cfl_common"
         cd game_frontend
         yarn --frozen-lockfile
     - name: Run Javascript tests

.github/workflows/cypress.yml

@@ -18,6 +18,9 @@ jobs:
         run: |
           pip install pipenv
           pipenv install --dev --system
+          pip install -U git+https://github.com/ocadotechnology/rapid-router@django_2_0_test
+          pip install -U git+https://github.com/ocadotechnology/codeforlife-portal@django_2_upgrade
+          pip install -U "git+https://github.com/ocadotechnology/codeforlife-portal@django_2_upgrade#egg=cfl-common&subdirectory=cfl_common"
           cd game_frontend
           yarn install
       - name: Build project and run server

.travis.yml

@@ -37,6 +37,9 @@ jobs:
         - nvm use 12
       install:
         - pipenv install --dev --system
+        - pip install --upgrade git+https://github.com/ocadotechnology/codeforlife-portal@django_2_0_test
+        - pip install --upgrade git+https://github.com/ocadotechnology/rapid-router@django_2_0_test
+        - pip install --upgrade "git+https://github.com/ocadotechnology/codeforlife-portal@django_2_0_test#egg=cfl-common&subdirectory=cfl_common"
         - pushd game_frontend
         - yarn --frozen-lockfile
         - node djangoBundler.js

Pipfile

@@ -5,9 +5,9 @@ name = "pypi"
 
 [dev-packages]
 pytest = "*"
-pytest-django = ">=3.7.0, <3.8.0"
+pytest-django = "==4.1.0"
 pytest-pythonpath = "*"
-codeforlife-portal = "*"
+#codeforlife-portal = "*"
 pytest-cov = "*"
 
 [packages]

aimmo-game/tests/test_simulation/mock_communicator.py

@@ -26,9 +26,6 @@ def __init__(self):
     async def get_game_metadata(self):
         return self.data
 
-    def mark_game_complete(self):
-        return {}
-
     def patch_game(self, data):
         return data
 

aimmo/migrations/0001_initial.py

@@ -22,7 +22,12 @@ class Migration(migrations.Migration):
                         primary_key=True,
                     ),
                 ),
-                ("player", models.ForeignKey(to=settings.AUTH_USER_MODEL)),
+                (
+                    "player",
+                    models.ForeignKey(
+                        to=settings.AUTH_USER_MODEL, on_delete=models.CASCADE
+                    ),
+                ),
             ],
         ),
         migrations.CreateModel(
@@ -38,7 +43,12 @@ class Migration(migrations.Migration):
                     ),
                 ),
                 ("code", models.TextField()),
-                ("user", models.OneToOneField(to=settings.AUTH_USER_MODEL)),
+                (
+                    "user",
+                    models.OneToOneField(
+                        to=settings.AUTH_USER_MODEL, on_delete=models.CASCADE
+                    ),
+                ),
             ],
         ),
     ]

aimmo/migrations/0003_auto_20160802_1418.py

@@ -101,17 +101,22 @@ class Migration(migrations.Migration):
                         related_name="owned_games",
                         to=settings.AUTH_USER_MODEL,
                         null=True,
+                        on_delete=models.SET_NULL,
                     ),
                 ),
             ],
         ),
         migrations.AddField(
-            model_name="avatar", name="game", field=models.ForeignKey(to="aimmo.Game")
+            model_name="avatar",
+            name="game",
+            field=models.ForeignKey(to="aimmo.Game", on_delete=models.CASCADE),
         ),
         migrations.AddField(
             model_name="avatar",
             name="owner",
-            field=models.ForeignKey(to=settings.AUTH_USER_MODEL),
+            field=models.ForeignKey(
+                to=settings.AUTH_USER_MODEL, on_delete=models.CASCADE
+            ),
         ),
         migrations.AlterUniqueTogether(
             name="avatar", unique_together=set([("owner", "game")])

aimmo/migrations/0005_auto_20160808_1545.py

@@ -50,6 +50,7 @@ class Migration(migrations.Migration):
                 blank=True,
                 to=settings.AUTH_USER_MODEL,
                 null=True,
+                on_delete=models.SET_NULL,
             ),
         ),
         migrations.AlterField(
@@ -60,17 +61,20 @@ class Migration(migrations.Migration):
                 blank=True,
                 to=settings.AUTH_USER_MODEL,
                 null=True,
+                on_delete=models.SET_NULL,
             ),
         ),
         migrations.AddField(
             model_name="levelattempt",
             name="game",
-            field=models.OneToOneField(to="aimmo.Game"),
+            field=models.OneToOneField(to="aimmo.Game", on_delete=models.CASCADE),
         ),
         migrations.AddField(
             model_name="levelattempt",
             name="user",
-            field=models.ForeignKey(to=settings.AUTH_USER_MODEL),
+            field=models.ForeignKey(
+                to=settings.AUTH_USER_MODEL, on_delete=models.CASCADE
+            ),
         ),
         migrations.AlterUniqueTogether(
             name="levelattempt", unique_together=set([("level_number", "user")])

aimmo/migrations/0012_auto_20200302_1310.py

@@ -7,22 +7,26 @@
 
 class Migration(migrations.Migration):
     dependencies = [
-        ('aimmo', '0011_reset_game_tokens'),
+        ("aimmo", "0011_reset_game_tokens"),
     ]
 
     operations = [
         migrations.AlterField(
-            model_name='game',
-            name='generator',
+            model_name="game",
+            name="generator",
             field=models.CharField(
-                choices=[('Main', 'Open World'), ('Level1', 'Level 1')], default='Main',
-                max_length=20),
+                choices=[("Main", "Open World"), ("Level1", "Level 1")],
+                default="Main",
+                max_length=20,
+            ),
         ),
         migrations.AlterField(
-            model_name='game',
-            name='status',
+            model_name="game",
+            name="status",
             field=models.CharField(
-                choices=[('r', 'running'), ('s', 'stopped'), ('p', 'paused')],
-                default='r', max_length=1),
+                choices=[("r", "running"), ("s", "stopped"), ("p", "paused")],
+                default="r",
+                max_length=1,
+            ),
         ),
     ]

aimmo/migrations/0014_add_worksheet_model.py

@@ -8,17 +8,37 @@
 class Migration(migrations.Migration):
 
     dependencies = [
-        ('aimmo', '0013_alter_game_can_play'),
+        ("aimmo", "0013_alter_game_can_play"),
     ]
 
     operations = [
         migrations.CreateModel(
-            name='Worksheet',
+            name="Worksheet",
             fields=[
-                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('name', models.CharField(max_length=100)),
-                ('era', models.PositiveSmallIntegerField(choices=[(1, 'future'), (2, 'ancient'), (3, 'modern day'), (4, 'prehistoric'), (5, 'broken future')], default=1)),
-                ('starter_code', models.TextField()),
+                (
+                    "id",
+                    models.AutoField(
+                        auto_created=True,
+                        primary_key=True,
+                        serialize=False,
+                        verbose_name="ID",
+                    ),
+                ),
+                ("name", models.CharField(max_length=100)),
+                (
+                    "era",
+                    models.PositiveSmallIntegerField(
+                        choices=[
+                            (1, "future"),
+                            (2, "ancient"),
+                            (3, "modern day"),
+                            (4, "prehistoric"),
+                            (5, "broken future"),
+                        ],
+                        default=1,
+                    ),
+                ),
+                ("starter_code", models.TextField()),
             ],
         ),
     ]

aimmo/migrations/0015_game_worksheet.py

@@ -9,13 +9,18 @@
 class Migration(migrations.Migration):
 
     dependencies = [
-        ('aimmo', '0014_add_worksheet_model'),
+        ("aimmo", "0014_add_worksheet_model"),
     ]
 
     operations = [
         migrations.AddField(
-            model_name='game',
-            name='worksheet',
-            field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='aimmo.Worksheet'),
+            model_name="game",
+            name="worksheet",
+            field=models.ForeignKey(
+                blank=True,
+                null=True,
+                on_delete=django.db.models.deletion.PROTECT,
+                to="aimmo.Worksheet",
+            ),
         ),
     ]

aimmo/migrations/0016_game_class.py

@@ -9,14 +9,20 @@
 class Migration(migrations.Migration):
 
     dependencies = [
-        ('common', '0001_initial'),
-        ('aimmo', '0015_game_worksheet'),
+        ("common", "0001_initial"),
+        ("aimmo", "0015_game_worksheet"),
     ]
 
     operations = [
         migrations.AddField(
-            model_name='game',
-            name='game_class',
-            field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='games_for_class', to='common.Class'),
+            model_name="game",
+            name="game_class",
+            field=models.ForeignKey(
+                blank=True,
+                null=True,
+                on_delete=django.db.models.deletion.CASCADE,
+                related_name="games_for_class",
+                to="common.Class",
+            ),
         ),
     ]

aimmo/migrations/0019_game_has_worksheet_and_class.py

@@ -9,23 +9,32 @@
 class Migration(migrations.Migration):
 
     dependencies = [
-        ('common', '0001_initial'),
-        ('aimmo', '0018_set_worksheet_2_as_default_for_games'),
+        ("common", "0001_initial"),
+        ("aimmo", "0018_set_worksheet_2_as_default_for_games"),
     ]
 
     operations = [
         migrations.AlterField(
-            model_name='game',
-            name='game_class',
-            field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='games_for_class', to='common.Class', verbose_name='Class'),
+            model_name="game",
+            name="game_class",
+            field=models.ForeignKey(
+                blank=True,
+                null=True,
+                on_delete=django.db.models.deletion.CASCADE,
+                related_name="games_for_class",
+                to="common.Class",
+                verbose_name="Class",
+            ),
         ),
         migrations.AlterField(
-            model_name='game',
-            name='worksheet',
-            field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='aimmo.Worksheet'),
+            model_name="game",
+            name="worksheet",
+            field=models.ForeignKey(
+                on_delete=django.db.models.deletion.PROTECT, to="aimmo.Worksheet"
+            ),
         ),
         migrations.AlterUniqueTogether(
-            name='game',
-            unique_together=set([('game_class', 'worksheet')]),
+            name="game",
+            unique_together=set([("game_class", "worksheet")]),
         ),
     ]

aimmo/migrations/0021_add_pdf_names_to_worksheet.py

@@ -8,18 +8,18 @@
 class Migration(migrations.Migration):
 
     dependencies = [
-        ('aimmo', '0020_add_info_to_worksheet'),
+        ("aimmo", "0020_add_info_to_worksheet"),
     ]
 
     operations = [
         migrations.AddField(
-            model_name='worksheet',
-            name='student_pdf_name',
+            model_name="worksheet",
+            name="student_pdf_name",
             field=models.CharField(blank=True, max_length=255),
         ),
         migrations.AddField(
-            model_name='worksheet',
-            name='teacher_pdf_name',
+            model_name="worksheet",
+            name="teacher_pdf_name",
             field=models.CharField(blank=True, max_length=255),
         ),
     ]

aimmo/migrations/0023_remove_level_attempt.py

@@ -0,0 +1,28 @@
+# Generated by Django 2.0 on 2020-10-28 17:30
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('aimmo', '0022_allow_games_to_have_no_name'),
+    ]
+
+    operations = [
+        migrations.AlterUniqueTogether(
+            name='levelattempt',
+            unique_together=set(),
+        ),
+        migrations.RemoveField(
+            model_name='levelattempt',
+            name='game',
+        ),
+        migrations.RemoveField(
+            model_name='levelattempt',
+            name='user',
+        ),
+        migrations.DeleteModel(
+            name='LevelAttempt',
+        ),
+    ]