Merge pull request #400 from uw-it-aca/develop

Develop
uw-it-aca · Oct 16, 2023 · f791749 · f791749
2 parents 3959749 + 91773b5
commit f791749
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 12 deletions.
diff --git a/docker/settings.py b/docker/settings.py
@@ -58,19 +58,28 @@
     GRADEPAGE_ADMIN_GROUP = 'u_test_group'
     CURRENT_DATETIME_OVERRIDE = '2013-06-17 10:00:00'
     PAST_TERMS_VIEWABLE = 1
-    DEFAULT_FILE_STORAGE = 'django.core.files.storage.FileSystemStorage'
     MEDIA_ROOT = os.getenv('IMPORT_DATA_ROOT', '/app/csv')
 else:
     GRADEPAGE_SUPPORT_GROUP = os.getenv('SUPPORT_GROUP', 'u_acadev_gradepage_support')
     GRADEPAGE_ADMIN_GROUP = os.getenv('ADMIN_GROUP', 'u_acadev_gradepage_admins')
     RESTCLIENTS_DAO_CACHE_CLASS = 'course_grader.cache.RestClientsCache'
     PAST_TERMS_VIEWABLE = 4
-    DEFAULT_FILE_STORAGE = 'storages.backends.gcloud.GoogleCloudStorage'
-    GS_PROJECT_ID = os.getenv('STORAGE_PROJECT_ID', '')
-    GS_BUCKET_NAME = os.getenv('STORAGE_BUCKET_NAME', '')
-    GS_LOCATION = os.path.join(os.getenv('IMPORT_DATA_ROOT', ''))
-    GS_CREDENTIALS = service_account.Credentials.from_service_account_file(
-        '/gcs/credentials.json')
+    STORAGES = {
+        'default': {
+            'BACKEND': 'storages.backends.gcloud.GoogleCloudStorage',
+            'OPTIONS': {
+                'project_id': os.getenv('STORAGE_PROJECT_ID', ''),
+                'bucket_name': os.getenv('STORAGE_BUCKET_NAME', ''),
+                'location': os.path.join(os.getenv('STORAGE_DATA_ROOT', '')),
+                'credentials': service_account.Credentials.from_service_account_file(
+                    '/gcs/credentials.json'),
+            }
+        },
+        'staticfiles': {
+            'BACKEND': 'django.contrib.staticfiles.storage.StaticFilesStorage',
+        },
+    }
+    CSRF_TRUSTED_ORIGINS = ['https://' + os.getenv('CLUSTER_CNAME')]
 
 ALLOW_GRADE_SUBMISSION_OVERRIDE = (os.getenv('ENV', 'localdev') != 'prod')
 USERSERVICE_VALIDATION_MODULE = 'course_grader.dao.person.is_netid'

diff --git a/setup.py b/setup.py
@@ -21,13 +21,13 @@
     packages=['course_grader'],
     include_package_data=True,
     install_requires = [
-        'Django~=3.2',
+        'Django~=4.2',
         'django-compressor',
         'django-user-agents',
         'django-userservice~=3.2',
-        'django-storages[google]>=1.10',
+        'django-storages[google]',
         'uw-memcached-clients~=1.0',
-        'UW-RestClients-Core~=1.3',
+        'UW-RestClients-Core~=1.4',
         'UW-RestClients-SWS~=2.3',
         'UW-RestClients-PWS~=2.1',
         'UW-RestClients-Canvas~=1.2',
@@ -36,7 +36,7 @@
         'UW-Grade-Conversion-Calculator~=1.4',
         'Django-Safe-EmailBackend~=1.2',
         'Django-SupportTools~=3.6',
-        'Django-Persistent-Message~=1.1',
+        'Django-Persistent-Message~=1.3',
         'UW-Django-SAML2~=1.7',
         'chardet~=4.0',
     ],
@@ -53,6 +53,5 @@
         'License :: OSI Approved :: Apache Software License',
         'Operating System :: OS Independent',
         'Programming Language :: Python',
-        'Programming Language :: Python :: 3.8',
     ],
 )