From 084223d1cd63a784377ffb29cf155611971b5681 Mon Sep 17 00:00:00 2001 From: Nikolas Nyby Date: Wed, 25 Oct 2023 12:05:48 -0400 Subject: [PATCH] Migrate to ctlsettings --- requirements.txt | 7 ++----- writlarge/s3utils.py | 19 ------------------- writlarge/templates/base.html | 6 ++---- 3 files changed, 4 insertions(+), 28 deletions(-) delete mode 100644 writlarge/s3utils.py diff --git a/requirements.txt b/requirements.txt index 35ab06bd..91219423 100644 --- 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 deleted file mode 100644 index f7bf8f04..00000000 --- a/writlarge/s3utils.py +++ /dev/null @@ -1,19 +0,0 @@ -# flake8: noqa -from django.core.files.storage import get_storage_class -from storages.backends.s3boto import S3BotoStorage - - -class CachedS3BotoStorage(S3BotoStorage): - def __init__(self, *args, **kwargs): - super(CachedS3BotoStorage, self).__init__(*args, **kwargs) - self.local_storage = get_storage_class( - 'compressor.storage.CompressorFileStorage')() - - def save(self, name, content): - name = super(CachedS3BotoStorage, self).save(name, content) - self.local_storage._save(name, content) - return name - - -CompressorS3BotoStorage = lambda: CachedS3BotoStorage(location='media') -MediaRootS3BotoStorage = lambda: S3BotoStorage(location='media') diff --git a/writlarge/templates/base.html b/writlarge/templates/base.html index eb346f3c..2922d735 100644 --- a/writlarge/templates/base.html +++ b/writlarge/templates/base.html @@ -1,4 +1,4 @@ -{% load compress bootstrap4 %} +{% load bootstrap4 %} @@ -22,9 +22,7 @@ - {% compress css %} - - {% endcompress %} + {% block css %} {% endblock %}