Merge pull request #9543 from jredrejo/015_for_kdp

Changes in 0.15.x to use kolibri with external plugins

kolibri/core/bookmarks/migrations/0001_initial.py

@@ -15,7 +15,7 @@ class Migration(migrations.Migration):
 
     dependencies = [
         ("kolibriauth", "0019_collection_no_mptt"),
-        migrations.swappable_dependency(settings.AUTH_USER_MODEL),
+        migrations.swappable_dependency("kolibriauth.FacilityUser"),
     ]
 
     operations = [
@@ -57,7 +57,7 @@ class Migration(migrations.Migration):
                     "user",
                     models.ForeignKey(
                         on_delete=django.db.models.deletion.CASCADE,
-                        to=settings.AUTH_USER_MODEL,
+                        to="kolibriauth.FacilityUser",
                     ),
                 ),
             ],

kolibri/core/device/migrations/0003_contentcachekey.py

@@ -2,21 +2,32 @@
 # Generated by Django 1.11.10 on 2018-09-05 17:20
 from __future__ import unicode_literals
 
+import sqlite3
 import time
 
 from django.db import migrations
 from django.db import models
+from django.db import transaction
+from django.db.utils import OperationalError
+from django.db.utils import ProgrammingError
 
 
 def create_content_cache_key(apps, schema_editor):
     from kolibri.core.device.models import ContentCacheKey
 
-    ContentCacheKey.update_cache_key()
+    try:
+        with transaction.atomic():
+            ContentCacheKey.update_cache_key()
+    except (OperationalError, ProgrammingError, sqlite3.OperationalError):
+        # let's not run this on a database cache
+        # that might not have been created yet
+        pass
 
 
 class Migration(migrations.Migration):
 
     dependencies = [("device", "0002_devicesettings_default_facility")]
+    atomic = False
 
     operations = [
         migrations.CreateModel(

kolibri/core/device/migrations/0012_syncqueue.py

@@ -15,7 +15,7 @@
 class Migration(migrations.Migration):
 
     dependencies = [
-        migrations.swappable_dependency(settings.AUTH_USER_MODEL),
+        migrations.swappable_dependency("kolibriauth.FacilityUser"),
         ("device", "0011_devicesettings_subset_of_users_device"),
     ]
 
@@ -36,7 +36,7 @@ class Migration(migrations.Migration):
                     "user",
                     models.ForeignKey(
                         on_delete=django.db.models.deletion.CASCADE,
-                        to=settings.AUTH_USER_MODEL,
+                        to="kolibriauth.FacilityUser",
                     ),
                 ),
             ],

kolibri/core/device/migrations/0013_usersyncstatus.py

@@ -12,7 +12,7 @@ class Migration(migrations.Migration):
 
     dependencies = [
         ("morango", "0016_store_deserialization_error"),
-        migrations.swappable_dependency(settings.AUTH_USER_MODEL),
+        migrations.swappable_dependency("kolibriauth.FacilityUser"),
         ("device", "0012_syncqueue"),
     ]
 
@@ -43,7 +43,7 @@ class Migration(migrations.Migration):
                     "user",
                     models.ForeignKey(
                         on_delete=django.db.models.deletion.CASCADE,
-                        to=settings.AUTH_USER_MODEL,
+                        to="kolibriauth.FacilityUser",
                     ),
                 ),
             ],

kolibri/core/exams/migrations/0005_individualsyncableexam.py

@@ -15,7 +15,7 @@ class Migration(migrations.Migration):
 
     dependencies = [
         ("kolibriauth", "0019_collection_no_mptt"),
-        migrations.swappable_dependency(settings.AUTH_USER_MODEL),
+        migrations.swappable_dependency("kolibriauth.FacilityUser"),
         ("exams", "0004_exam_add_dates_opened_created_and_archived"),
     ]
 
@@ -58,7 +58,7 @@ class Migration(migrations.Migration):
                     "user",
                     models.ForeignKey(
                         on_delete=django.db.models.deletion.CASCADE,
-                        to=settings.AUTH_USER_MODEL,
+                        to="kolibriauth.FacilityUser",
                     ),
                 ),
             ],

kolibri/core/exams/migrations/0006_nullable_creator_assigned_by.py

@@ -22,7 +22,7 @@ class Migration(migrations.Migration):
                 null=True,
                 on_delete=django.db.models.deletion.CASCADE,
                 related_name="exams",
-                to=settings.AUTH_USER_MODEL,
+                to="kolibriauth.FacilityUser",
             ),
         ),
         migrations.AlterField(
@@ -32,7 +32,7 @@ class Migration(migrations.Migration):
                 null=True,
                 on_delete=django.db.models.deletion.CASCADE,
                 related_name="assigned_exams",
-                to=settings.AUTH_USER_MODEL,
+                to="kolibriauth.FacilityUser",
             ),
         ),
     ]

kolibri/core/lessons/migrations/0003_individualsyncablelesson.py

@@ -15,7 +15,7 @@ class Migration(migrations.Migration):
 
     dependencies = [
         ("kolibriauth", "0019_collection_no_mptt"),
-        migrations.swappable_dependency(settings.AUTH_USER_MODEL),
+        migrations.swappable_dependency("kolibriauth.FacilityUser"),
         ("lessons", "0002_auto_20180221_1115"),
     ]
 
@@ -58,7 +58,7 @@ class Migration(migrations.Migration):
                     "user",
                     models.ForeignKey(
                         on_delete=django.db.models.deletion.CASCADE,
-                        to=settings.AUTH_USER_MODEL,
+                        to="kolibriauth.FacilityUser",
                     ),
                 ),
             ],

kolibri/core/lessons/migrations/0004_nullable_created_by_assigned_by.py

@@ -22,7 +22,7 @@ class Migration(migrations.Migration):
                 null=True,
                 on_delete=django.db.models.deletion.CASCADE,
                 related_name="lessons_created",
-                to=settings.AUTH_USER_MODEL,
+                to="kolibriauth.FacilityUser",
             ),
         ),
         migrations.AlterField(
@@ -32,7 +32,7 @@ class Migration(migrations.Migration):
                 null=True,
                 on_delete=django.db.models.deletion.CASCADE,
                 related_name="assigned_lessons",
-                to=settings.AUTH_USER_MODEL,
+                to="kolibriauth.FacilityUser",
             ),
         ),
     ]

kolibri/utils/main.py

@@ -25,6 +25,7 @@
 from kolibri.core.upgrade import matches_version
 from kolibri.core.upgrade import run_upgrades
 from kolibri.core.utils.cache import process_cache
+from kolibri.deployment.default.cache import CACHES
 from kolibri.deployment.default.sqlite_db_names import ADDITIONAL_SQLITE_DATABASES
 from kolibri.plugins.utils import autoremove_unavailable_plugins
 from kolibri.plugins.utils import check_plugin_config_file_location
@@ -224,18 +225,19 @@ def _upgrades_before_django_setup(updated, version):
 
 
 def _post_django_initialization():
-    if OPTIONS["Cache"]["CACHE_BACKEND"] != "redis":
-        try:
-            process_cache.cull()
-        except SQLite3DatabaseError:
-            shutil.rmtree(process_cache.directory, ignore_errors=True)
-            os.mkdir(process_cache.directory)
-            process_cache._cache = FanoutCache(
-                process_cache.directory,
-                settings.CACHES["process_cache"]["SHARDS"],
-                settings.CACHES["process_cache"]["TIMEOUT"],
-                **settings.CACHES["process_cache"]["OPTIONS"]
-            )
+    if "process_cache" in CACHES:  # usually it means not using redis
+        if "DatabaseCache" not in CACHES["process_cache"]["BACKEND"]:
+            try:
+                process_cache.cull()
+            except SQLite3DatabaseError:
+                shutil.rmtree(process_cache.directory, ignore_errors=True)
+                os.mkdir(process_cache.directory)
+                process_cache._cache = FanoutCache(
+                    process_cache.directory,
+                    settings.CACHES["process_cache"]["SHARDS"],
+                    settings.CACHES["process_cache"]["TIMEOUT"],
+                    **settings.CACHES["process_cache"]["OPTIONS"]
+                )
 
 
 def _upgrades_after_django_setup(updated, version):