From 4706446e2f90452dd31d3164b60b037ce2d2e069 Mon Sep 17 00:00:00 2001 From: Vince Veselosky Date: Sun, 7 May 2023 16:58:54 -0400 Subject: [PATCH] Bump GenericSite version --- requirements-dev.txt | 2 +- requirements.in | 2 +- requirements.txt | 2 +- storyville/settings.py | 53 +++++------------------------------------- 4 files changed, 9 insertions(+), 50 deletions(-) diff --git a/requirements-dev.txt b/requirements-dev.txt index 29dd02d..44a19d9 100644 --- a/requirements-dev.txt +++ b/requirements-dev.txt @@ -54,7 +54,7 @@ django-environ==0.10.0 # via -r requirements.in django-extensions==3.2.1 # via -r requirements.in -django-genericsite @ https://github.com/veselosky/django-genericsite/releases/download/release-0.1.2/django_genericsite-0.1.2-py3-none-any.whl +django-genericsite @ https://github.com/veselosky/django-genericsite/releases/download/release-0.1.3/django_genericsite-0.1.3-py3-none-any.whl # via -r requirements.in django-rich==1.5.0 # via -r requirements.in diff --git a/requirements.in b/requirements.in index 795b0df..09b290f 100644 --- a/requirements.in +++ b/requirements.in @@ -1,7 +1,7 @@ django >= 4.2, < 5.0 django-environ >= 0.10.0 django-extensions >= 3.2.1 -django-genericsite @ https://github.com/veselosky/django-genericsite/releases/download/release-0.1.2/django_genericsite-0.1.2-py3-none-any.whl +django-genericsite @ https://github.com/veselosky/django-genericsite/releases/download/release-0.1.3/django_genericsite-0.1.3-py3-none-any.whl django-rich >= 1.5.0 docutils >= 0.19 pillow >= 9.5.0 diff --git a/requirements.txt b/requirements.txt index 7728759..0bf4b36 100644 --- a/requirements.txt +++ b/requirements.txt @@ -25,7 +25,7 @@ django-environ==0.10.0 # via -r requirements.in django-extensions==3.2.1 # via -r requirements.in -django-genericsite @ https://github.com/veselosky/django-genericsite/releases/download/release-0.1.2/django_genericsite-0.1.2-py3-none-any.whl +django-genericsite @ https://github.com/veselosky/django-genericsite/releases/download/release-0.1.3/django_genericsite-0.1.3-py3-none-any.whl # via -r requirements.in django-rich==1.5.0 # via -r requirements.in diff --git a/storyville/settings.py b/storyville/settings.py index d374b8b..58b7a6c 100644 --- a/storyville/settings.py +++ b/storyville/settings.py @@ -14,6 +14,7 @@ from pathlib import Path import environ +import genericsite.apps PROJECT = __name__.split(".")[0] # Build paths inside the project like this: BASE_DIR / 'subdir'. @@ -26,29 +27,10 @@ WSGI_APPLICATION = f"{PROJECT}.wsgi.application" ROOT_URLCONF = f"{PROJECT}.urls" -INSTALLED_APPS = [ - # Add your custom apps here: - "genericsite", - # 3rd party apps used by GenericSite - "django_bootstrap_icons", - "easy_thumbnails", - "taggit", - "tinymce", +INSTALLED_APPS = genericsite.apps.plus( # Third party apps: "django_extensions", - # Core Django apps below custom so we can override their templates - "django.contrib.admin", - "django.contrib.admindocs", - "django.contrib.auth", - "django.contrib.contenttypes", - "django.contrib.sessions", - "django.contrib.messages", - "django.contrib.redirects", - "django.contrib.sites", - "django.contrib.staticfiles", - "genericsite.adminoverride", -] - +) MIDDLEWARE = [ # https://docs.djangoproject.com/en/4.2/ref/middleware/#django.middleware.security.SecurityMiddleware @@ -218,34 +200,11 @@ # SECTION 2: App configuration. ####################################################################################### -THUMBNAIL_PROCESSORS = ( - "easy_thumbnails.processors.colorspace", - "easy_thumbnails.processors.autocrop", - "easy_thumbnails.processors.scale_and_crop", - "easy_thumbnails.processors.filters", -) -THUMBNAIL_WIDGET_OPTIONS = {"size": (160, 90)} +THUMBNAIL_PROCESSORS = genericsite.apps.THUMBNAIL_PROCESSORS +THUMBNAIL_WIDGET_OPTIONS = genericsite.apps.THUMBNAIL_WIDGET_OPTIONS THUMBNAIL_DEBUG = DEBUG -TINYMCE_DEFAULT_CONFIG = { - "height": "320px", - "width": "960px", - "menubar": "edit view insert format tools table help", - "pagebreak_separator": "", - "plugins": "advlist autoresize charmap code codesample help hr image imagetools " - "link lists media pagebreak paste searchreplace table toc visualblocks " - "visualchars wordcount", - "toolbar": "undo redo | bold italic strikethrough | styleselect | removeformat | " - "numlist bullist indent outdent | image pagebreak | code", - "image_advtab": True, - "image_caption": True, - "image_class_list": [ - {"title": "Responsive", "value": "img-fluid"}, - {"title": "Left", "value": "float-left"}, - {"title": "Right", "value": "float-right"}, - ], - "image_list": "/images/recent.json", -} +TINYMCE_DEFAULT_CONFIG = genericsite.apps.TINYMCE_CONFIG ####################################################################################### # SECTION 3: DEVELOPMENT: If running in a dev environment, loosen restrictions