Merge branch 'feature/django_upgrade' of https://github.com/CenterFor…

…OpenScience/osf.io into signals-citation-styles

* 'feature/django_upgrade' of https://github.com/CenterForOpenScience/osf.io:
  move createcachetable to post migrate signal (CenterForOpenScience#9944)

# Conflicts:
#	osf/apps.py
#	osf/migrations/__init__.py

osf/apps.py

@@ -2,7 +2,7 @@
 
 from django.apps import AppConfig as BaseAppConfig
 from django.db.models.signals import post_migrate
-from osf.migrations import update_permission_groups, update_citation_styles
+from osf.migrations import update_permission_groups, create_cache_table, update_citation_styles
 
 
 class AppConfig(BaseAppConfig):
@@ -20,3 +20,7 @@ def ready(self):
             update_citation_styles,
             dispatch_uid='osf.apps.update_citation_styles'
         )
+        post_migrate.connect(
+            create_cache_table,
+            dispatch_uid='osf.apps.create_cache_table'
+        )

osf/migrations/0156_create_cache_table.py

@@ -1,23 +1,11 @@
 # -*- coding: utf-8 -*-
 from __future__ import unicode_literals
 from django.db import migrations
-from django.conf import settings
 
 
 class Migration(migrations.Migration):
     dependencies = [
         ('osf', '0155_merge_20190115_1437'),
     ]
     operations = [
-        migrations.RunSQL([
-            """
-            CREATE TABLE "{}" (
-                "cache_key" varchar(255) NOT NULL PRIMARY KEY,
-                "value" text NOT NULL,
-                "expires" timestamp with time zone NOT NULL
-            );
-            """.format(settings.CACHES[settings.STORAGE_USAGE_CACHE_NAME]['LOCATION'])
-        ], [
-            """DROP TABLE "{}"; """.format(settings.CACHES[settings.STORAGE_USAGE_CACHE_NAME]['LOCATION'])
-        ])
     ]

osf/migrations/__init__.py

@@ -9,6 +9,8 @@
 import logging
 from django.apps import apps
 from django.db.utils import ProgrammingError
+from django.core.management import call_command
+from api.base import settings
 
 logger = logging.getLogger(__file__)
 from django.db import transaction
@@ -235,3 +237,8 @@ def update_citation_styles(sender, verbosity=0, **kwargs):
     if getattr(sender, 'label', None) == 'osf':
         if 'pytest' not in sys.modules:
             ensure_citation_styles()
+
+
+def create_cache_table(sender, verbosity=0, **kwargs):
+    if getattr(sender, 'label', None) == 'osf':
+        call_command('createcachetable', tablename=settings.CACHES[settings.STORAGE_USAGE_CACHE_NAME]['LOCATION'])