Merge pull request #177 from matematikk-mooc/staging

Staging
matematikk-mooc · Feb 28, 2024 · eec3877 · eec3877
2 parents 754c102 + c4cca7d
commit eec3877
Show file tree

Hide file tree

Showing 19 changed files with 2 additions and 305 deletions.
diff --git a/start_web_app.sh b/start_web_app.sh
@@ -3,7 +3,7 @@
 set -e
 source venv/bin/activate
 python manage.py migrate
-python manage.py migrate enrollment_activity
+python manage.py remove_stale_contenttypes --include-stale-apps --noinput
 python manage.py import_school_teacher_counts_from_csv
 python manage.py import_county_teacher_counts_from_csv
 if [ "$PULL_MEMBER_COUNTS_FROM_CANVAS_ON_STARTUP" = "True" ]

diff --git a/statistics_api/canvas_users/__init__.py b/statistics_api/canvas_users/__init__.py
diff --git a/statistics_api/canvas_users/migrations/0001_initial.py b/statistics_api/canvas_users/migrations/0001_initial.py
diff --git a/statistics_api/canvas_users/migrations/0002_auto_20220926_1323.py b/statistics_api/canvas_users/migrations/0002_auto_20220926_1323.py
diff --git a/statistics_api/canvas_users/migrations/0003_delete_canvasuser.py b/statistics_api/canvas_users/migrations/0003_delete_canvasuser.py
diff --git a/statistics_api/canvas_users/migrations/__init__.py b/statistics_api/canvas_users/migrations/__init__.py
diff --git a/statistics_api/canvas_users/models.py b/statistics_api/canvas_users/models.py
diff --git a/statistics_api/quizzes/__init__.py b/statistics_api/quizzes/__init__.py
diff --git a/statistics_api/quizzes/migrations/0001_initial.py b/statistics_api/quizzes/migrations/0001_initial.py
diff --git a/statistics_api/quizzes/migrations/0002_remove_submissionstatistics_canvas_id.py b/statistics_api/quizzes/migrations/0002_remove_submissionstatistics_canvas_id.py
diff --git a/statistics_api/quizzes/migrations/0003_quizstatistics_title.py b/statistics_api/quizzes/migrations/0003_quizstatistics_title.py
diff --git a/statistics_api/quizzes/migrations/0004_answerusergroup.py b/statistics_api/quizzes/migrations/0004_answerusergroup.py
diff --git a/statistics_api/quizzes/migrations/0005_openanswerresponse.py b/statistics_api/quizzes/migrations/0005_openanswerresponse.py
diff --git a/statistics_api/quizzes/migrations/0006_openanswerresponse_submission_time.py b/statistics_api/quizzes/migrations/0006_openanswerresponse_submission_time.py
diff --git a/statistics_api/quizzes/migrations/0007_alter_openanswerresponse_answer.py b/statistics_api/quizzes/migrations/0007_alter_openanswerresponse_answer.py
diff --git a/statistics_api/quizzes/migrations/0008_auto_20240214_1325.py b/statistics_api/quizzes/migrations/0008_auto_20240214_1325.py
diff --git a/statistics_api/quizzes/migrations/__init__.py b/statistics_api/quizzes/migrations/__init__.py
diff --git a/statistics_api/quizzes/models.py b/statistics_api/quizzes/models.py
diff --git a/statistics_api/settings.py b/statistics_api/settings.py
@@ -47,9 +47,7 @@
     'statistics_api.apps.StatisticsApiConfig',
     'statistics_api.enrollment_activity',
     'statistics_api.history',
-    'statistics_api.quizzes',
     'statistics_api.matomo',
-    'statistics_api.canvas_users',
     'statistics_api.canvas_modules',
     'statistics_api.total_students',
 ]
@@ -96,7 +94,7 @@
 WSGI_APPLICATION = 'statistics_api.wsgi.application'
 TEST_RUNNER = 'statistics_api.tests.override_test_runner.MyTestRunner'
 
-# Database 
+# Database
 # https://docs.djangoproject.com/en/1.11/ref/settings/#databases
 DATABASES = {
     'default': {