Merge pull request #2032 from ccnmtl/INFRA-2456-ctlsettings

ccnmtlsettings --> ctlsettings
ccnmtl · Oct 17, 2023 · d93eb05 · d93eb05
2 parents 901276e + b7481f8
commit d93eb05
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 22 deletions.
diff --git a/pump/settings_production.py b/pump/settings_production.py
@@ -1,7 +1,7 @@
 import os
 from django.conf import settings
 from pump.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
 
@@ -15,6 +15,7 @@
         STATIC_ROOT=STATIC_ROOT,  # noqa: F405
         INSTALLED_APPS=INSTALLED_APPS,  # noqa: F405
         cloudfront="d1dxl1g40sjqc0",
+        s3prefix='ccnmtl'
     ))
 
 try:

diff --git a/pump/settings_shared.py b/pump/settings_shared.py
@@ -2,7 +2,7 @@
 # Django settings for pump project.
 import os.path
 import sys
-from ccnmtlsettings.shared import common
+from ctlsettings.shared import common
 
 project = 'pump'
 base = os.path.dirname(__file__)
@@ -16,20 +16,16 @@
 
 MIDDLEWARE += [
     'django.middleware.csrf.CsrfViewMiddleware',
-    'django_cas_ng.middleware.CASMiddleware'
 ]
 
 INSTALLED_APPS += [
-    'django_cas_ng',
     'bootstrap3',
     'bootstrapform',
     'django_extensions',
     'pump.main',
     'behave_django',
 ]
 
-INSTALLED_APPS.remove('djangowind') # noqa
-
 AUTHENTICATION_BACKENDS = [
     'django.contrib.auth.backends.ModelBackend',
     'django_cas_ng.backends.CASBackend'
@@ -48,10 +44,6 @@
             }
         }
 
-CAS_SERVER_URL = 'https://cas.columbia.edu/cas/'
-CAS_VERSION = '3'
-CAS_ADMIN_REDIRECT = False
-
 TEMPLATES = [
     {
         'BACKEND': 'django.template.backends.django.DjangoTemplates',

diff --git a/pump/settings_staging.py b/pump/settings_staging.py
@@ -1,7 +1,7 @@
 import os
 from django.conf import settings
 from pump.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
 
@@ -15,6 +15,7 @@
         STATIC_ROOT=STATIC_ROOT,  # noqa: F405
         INSTALLED_APPS=INSTALLED_APPS,  # noqa: F405
         cloudfront="dp909d54wadkp",
+        s3prefix='ccnmtl',
     ))
 
 try:

diff --git a/pump/templates/base.html b/pump/templates/base.html
@@ -1,5 +1,4 @@
 {% load bootstrap3 %}
-{% load compress %}
 <!DOCTYPE html>
 <html lang="en">
 <head>
@@ -17,9 +16,7 @@
 
 {% bootstrap_css %}
 
-{% compress css %}
-    <link href="{{STATIC_URL}}css/main.css" rel="stylesheet">
-{% endcompress %}
+  <link href="{{STATIC_URL}}css/main.css" rel="stylesheet">
 	<link rel="shortcut icon" href="{{STATIC_URL}}img/favicon.ico" type="image/x-icon" />
 	{% block css %}{% endblock %}
   <script src="{{STATIC_URL}}js/jquery-3.2.1.min.js"></script>

diff --git a/requirements.txt b/requirements.txt
@@ -66,18 +66,14 @@ parse==1.19.0
 behave==1.2.6
 splinter==0.19.0
 contextlib2==21.6.0
-rcssmin==1.1.0
-rjsmin==1.2.0
 pytz==2023.3
 
 django-appconf==1.0.5
-django-compressor>=3.1,<5.0
 django-statsd-mozilla==0.4.0
 sentry-sdk==1.32.0
 django-bootstrap3==23.4
 django-bootstrap-form==3.4
 django-debug-toolbar==4.2.0
-django-waffle==4.0.0
 
 django-smoketest==1.2.0
 django-extensions==3.2.0
@@ -89,11 +85,10 @@ django-impersonate==1.9.1
 django-markwhat==1.6.2
 gunicorn==21.2.0
 django-storages==1.13.2
-django-cacheds3storage==0.3.0
 behave-django==1.4.0
 django-smtp-ssl==1.0
 
-ccnmtlsettings==1.9.0
+ctlsettings==0.2.0
 
 pbr==5.11.0
 PyYAML>=3.10.0 # MIT
@@ -102,5 +97,5 @@ bandit==1.7.1
 
 entrypoints==0.4
 python-cas==1.6.0
-requirements/src/django_cas_ng-4.2.2ctl-py2.py3-none-any.whl
+django-cas-ng==5.0.0
 asgiref==3.7.1
diff --git a/requirements/src/django_cas_ng-4.2.2ctl-py2.py3-none-any.whl b/requirements/src/django_cas_ng-4.2.2ctl-py2.py3-none-any.whl