From b3d12da4300b7645f43d68826f207fbb5c797012 Mon Sep 17 00:00:00 2001 From: Evan Petersen Date: Fri, 1 Dec 2023 14:55:33 -0500 Subject: [PATCH] Update from ccnmtlsettings to ctlsettings --- carr/settings_production.py | 3 ++- carr/settings_shared.py | 28 +++++----------------------- carr/settings_staging.py | 3 ++- carr/templates/base.html | 3 --- package-lock.json | 1 + requirements.txt | 7 ++----- 6 files changed, 12 insertions(+), 33 deletions(-) diff --git a/carr/settings_production.py b/carr/settings_production.py index 7230bd39..be7c3afc 100644 --- a/carr/settings_production.py +++ b/carr/settings_production.py @@ -1,5 +1,5 @@ from carr.settings_shared import * # noqa F403 -from ccnmtlsettings.production import common +from ctlsettings.production import common from django.conf import settings import sentry_sdk from sentry_sdk.integrations.django import DjangoIntegration @@ -10,6 +10,7 @@ base=base, # noqa: F405 INSTALLED_APPS=INSTALLED_APPS, # noqa: F405 STATIC_ROOT=STATIC_ROOT, # noqa: F405 + s3prefix='ccnmtl', )) CACHES = { diff --git a/carr/settings_shared.py b/carr/settings_shared.py index 083d8b9b..d7d6382f 100644 --- a/carr/settings_shared.py +++ b/carr/settings_shared.py @@ -6,10 +6,10 @@ import sys from datetime import timedelta -from ccnmtlsettings.shared import common +from ctlsettings.shared import common project = 'carr' base = os.path.dirname(__file__) -locals().update(common(project=project, base=base)) +locals().update(common(project=project, base=base,)) CACHES = { 'default': { @@ -32,27 +32,12 @@ 'carr.someutils.AuthRequirementMiddleware', 'djangohelpers.middleware.HttpDeleteMiddleware', 'carr.middleware.SiteIdMiddleware', - 'django.middleware.csrf.CsrfViewMiddleware' + 'django.middleware.csrf.CsrfViewMiddleware', ] -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', -} - INSTALLED_APPS += [ # noqa 'carr.activity_bruise_recon', 'carr.activity_taking_action', - 'django_cas_ng', 'pageblocks', 'pagetree', 'carr.carr_main', @@ -60,9 +45,9 @@ 'sorl.thumbnail', 'courseaffils', 'bootstrap3', - 'lti_provider' + 'lti_provider', + 'django_markwhat', ] -INSTALLED_APPS.remove('djangowind') PROJECT_APPS = [ 'carr.carr_main', @@ -113,9 +98,6 @@ SITE_DENTAL = 1 SITE_SOCIAL_WORK = 2 -TEMPLATES[0]['OPTIONS']['context_processors'].remove( # noqa - 'djangowind.context.context_processor') - TEMPLATES[0]['OPTIONS']['context_processors'].append( # noqa 'carr.carr_main.views.context_processor', ) diff --git a/carr/settings_staging.py b/carr/settings_staging.py index f9f74a25..6b623670 100644 --- a/carr/settings_staging.py +++ b/carr/settings_staging.py @@ -1,5 +1,5 @@ from carr.settings_shared import * # noqa F403 -from ccnmtlsettings.staging import common +from ctlsettings.staging import common from django.conf import settings import sentry_sdk from sentry_sdk.integrations.django import DjangoIntegration @@ -10,6 +10,7 @@ base=base, # noqa: F405 STATIC_ROOT=STATIC_ROOT, # noqa: F405 INSTALLED_APPS=INSTALLED_APPS, # noqa: F405 + s3prefix='ccnmtl', )) CACHES = { diff --git a/carr/templates/base.html b/carr/templates/base.html index 714fda6c..56fcd5cd 100644 --- a/carr/templates/base.html +++ b/carr/templates/base.html @@ -1,4 +1,3 @@ -{% load compress %} {% load bootstrap3 %} @@ -8,9 +7,7 @@ CARE: {% block title %}{% endblock %} {% bootstrap_css %} - {% compress css %} - {% endcompress %} {% if IS_SOCIALWORK %} {% else %} diff --git a/package-lock.json b/package-lock.json index 1cfc69a6..498e3577 100644 --- a/package-lock.json +++ b/package-lock.json @@ -5,6 +5,7 @@ "requires": true, "packages": { "": { + "name": "carr", "version": "0.0.0", "license": "BSD-2-Clause", "devDependencies": { diff --git a/requirements.txt b/requirements.txt index bfd1cf20..8893605b 100644 --- a/requirements.txt +++ b/requirements.txt @@ -39,7 +39,7 @@ charset-normalizer==3.3.0 requests==2.31.0 python-cas==1.6.0 -django-cas-ng==5.0.0 +django-cas-ng==5.0.1 requirements/src/sorl-3.3-py2.py3-none-any.whl requirements/src/pagetree-0.7.3-py2.py3-none-any.whl requirements/src/django_pageblocks-0.5.17-py3-none-any.whl @@ -55,7 +55,6 @@ text-unidecode==1.3 Faker==20.1.0 factory_boy==3.3.0 -django-waffle==4.0.0 django-markwhat==1.6.2 django-impersonate==1.9.1 django-ga-context==0.1.0 @@ -64,7 +63,6 @@ django-debug-toolbar==4.2.0 gunicorn==21.2.0 django-appconf==1.0.5 -django-compressor>=3.1,<5.0 django-stagingcontext==0.1.0 certifi==2023.11.17 # sentry-sdk urllib3==2.1.0 # sentry-sdk @@ -77,12 +75,11 @@ botocore>=1.15.0,<1.34.0 python-dateutil==2.8.2 django-storages==1.13.2 -django-cacheds3storage==0.3.0 # memcached pylibmc==1.6.3; sys_platform == 'linux' django-smtp-ssl==1.0 -ccnmtlsettings==1.9.5 +ctlsettings==0.2.0 django-bootstrap3==23.4 pbr==6.0.0