Migrate to ctlsettings

ccnmtl · Oct 25, 2023 · d3ffac8 · d3ffac8
1 parent 5fad646
commit d3ffac8
Show file tree

Hide file tree

Showing 8 changed files with 11 additions and 47 deletions.
diff --git a/requirements.txt b/requirements.txt
@@ -52,15 +52,12 @@ boto3>=1.12.0,<1.29.0
 python-dateutil==2.8.2
 
 python-cas==1.6.0
-git+https://github.com/django-cas-ng/django-cas-ng.git
+django-cas-ng==5.0.1
 django-indexer==0.3.0
 django-templatetag-sugar==1.0
 django-paging==0.2.5
 django-annoying==0.10.6
 django-appconf==1.0.5
-rcssmin==1.1.0  # django-compressor
-rjsmin==1.2.0  # django-compressor
-django-compressor>=3.1,<5.0
 django-statsd-mozilla==0.4.0
 raven==6.10.0
 sentry-sdk==1.32.0
@@ -77,7 +74,7 @@ gunicorn==21.2.0
 django-storages==1.13.2
 djangorestframework==3.14.0
 
-ccnmtlsettings==1.9.5
+ctlsettings==0.2.0
 
 django-reversion==5.0.1
 text_unidecode==1.3

diff --git a/writlarge/s3utils.py b/writlarge/s3utils.py
diff --git a/writlarge/settings_compose.py b/writlarge/settings_compose.py
@@ -1,6 +1,6 @@
 # flake8: noqa
 from settings_shared import *
-from ccnmtlsettings.compose import common
+from ctlsettings.compose import common
 
 locals().update(
     common(

diff --git a/writlarge/settings_docker.py b/writlarge/settings_docker.py
@@ -1,6 +1,6 @@
 # flake8: noqa
 from settings_shared import *
-from ccnmtlsettings.docker import common
+from ctlsettings.docker import common
 import os
 
 locals().update(

diff --git a/writlarge/settings_production.py b/writlarge/settings_production.py
@@ -1,7 +1,7 @@
 import sys
 from django.conf import settings
 from writlarge.settings_shared import *  # noqa: F403
-from ccnmtlsettings.production import common
+from ctlsettings.production import common
 import sentry_sdk
 from sentry_sdk.integrations.django import DjangoIntegration
 
@@ -11,6 +11,7 @@
         base=base,  # noqa: F405
         STATIC_ROOT=STATIC_ROOT,  # noqa: F405
         INSTALLED_APPS=INSTALLED_APPS,  # noqa: F405
+        s3prefix="ccnmtl",
     ))
 
 CSRF_COOKIE_SECURE = True

diff --git a/writlarge/settings_shared.py b/writlarge/settings_shared.py
@@ -3,28 +3,14 @@
 import os.path
 import platform
 import sys
-from ccnmtlsettings.shared import common
+from ctlsettings.shared import common
 
 
 project = 'writlarge'
 base = os.path.dirname(__file__)
 
 locals().update(common(project=project, base=base))
 
-CAS_SERVER_URL = 'https://cas.columbia.edu/cas/'
-CAS_VERSION = '3'
-CAS_ADMIN_REDIRECT = False
-CAS_MAP_AFFILIATIONS = True
-
-# Translate CUIT's CAS user attributes to the Django user model.
-# https://cuit.columbia.edu/content/cas-3-ticket-validation-response
-CAS_APPLY_ATTRIBUTES_TO_USER = True
-CAS_RENAME_ATTRIBUTES = {
-    'givenName': 'first_name',
-    'lastName': 'last_name',
-    'mail': 'email',
-}
-
 if hasattr(platform, "linux_distribution") and \
         platform.linux_distribution()[0] == 'Ubuntu':
     if platform.linux_distribution()[1] == '18.04':

diff --git a/writlarge/settings_staging.py b/writlarge/settings_staging.py
@@ -1,7 +1,7 @@
 import sys
 from django.conf import settings
 from writlarge.settings_shared import *  # noqa: F403
-from ccnmtlsettings.staging import common
+from ctlsettings.staging import common
 import sentry_sdk
 from sentry_sdk.integrations.django import DjangoIntegration
 
@@ -11,6 +11,7 @@
         base=base,  # noqa: F405
         STATIC_ROOT=STATIC_ROOT,  # noqa: F405
         INSTALLED_APPS=INSTALLED_APPS,  # noqa: F405
+        s3prefix="ccnmtl",
     ))
 
 DATABASES = {

diff --git a/writlarge/templates/base.html b/writlarge/templates/base.html
@@ -1,4 +1,4 @@
-{% load compress bootstrap4 %}
+{% load bootstrap4 %}
 <!DOCTYPE html>
 <html lang="en">
 <head>
@@ -22,9 +22,7 @@
    <!-- Backup Google font, Questrial -->
     <link href="https://fonts.googleapis.com/css?family=Didact+Gothic" rel="stylesheet">
 
-    {% compress css %}
-        <link href="{{STATIC_URL}}css/main.css" rel="stylesheet">
-    {% endcompress %}
+    <link href="{{STATIC_URL}}css/main.css" rel="stylesheet">
 
     {% block css %}
     {% endblock %}