From 9294c8c2f1c3a08f71f5d7d879746f12a8310a16 Mon Sep 17 00:00:00 2001 From: Philip Sargent Date: Sun, 24 Oct 2021 19:16:01 +0300 Subject: [PATCH] remove unneeded LIBDIR --- _deploy/wsl/localsettingsWSL.py | 6 ++++-- core/views/statistics.py | 2 ++ 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/_deploy/wsl/localsettingsWSL.py b/_deploy/wsl/localsettingsWSL.py index b75bccc..ac2fa2d 100644 --- a/_deploy/wsl/localsettingsWSL.py +++ b/_deploy/wsl/localsettingsWSL.py @@ -39,8 +39,9 @@ SERVERPORT = '8000' # not needed # --------------------- MEDIA redirections BEGIN --------------------- #REPOS_ROOT_PATH = '/mnt/d/CUCC-Expo/t37/' -REPOS_ROOT_PATH = Path(__file__).parent.parent -LIBDIR = REPOS_ROOT_PATH / 'lib' / 'python3.7' # should be finding this automatically: python --version etc. +REPOS_ROOT_PATH = Path(__file__).parent.parent # We are assuming all 4 repos are siblings. +version = sys.version_info +#LIBDIR = REPOS_ROOT_PATH / 'lib' / 'python{}.{}'.format(version.major, version.minor) # eg python 3.7 TROGGLE_PATH = Path(__file__).parent TEMPLATE_PATH = TROGGLE_PATH / 'templates' @@ -143,6 +144,7 @@ EMAIL_HOST_USER = "django-test@klebos.net" # Philip Sargent really EMAIL_PORT=587 EMAIL_USE_TLS = True DEFAULT_FROM_EMAIL = 'django-test@klebos.net' +EMAIL_SUBJECT_PREFIX = "[troggle]" SURVEX_DATA = REPOS_ROOT_PATH / "loser" DRAWINGS_DATA = REPOS_ROOT_PATH / "drawings" diff --git a/core/views/statistics.py b/core/views/statistics.py index 8f2cc47..f4209c3 100644 --- a/core/views/statistics.py +++ b/core/views/statistics.py @@ -38,6 +38,7 @@ def pathsreport(request): "EXPOWEB" : str( settings.EXPOWEB), "EXPOWEB_URL" : str( settings.EXPOWEB_URL), "FILES" : str( settings.FILES), +# "LIBDIR" : str( settings.LIBDIR), "LOGFILE" : str( settings.LOGFILE), "LOGIN_REDIRECT_URL" : str( settings.LOGIN_REDIRECT_URL), "MEDIA_ROOT" : str( settings.MEDIA_ROOT), @@ -75,6 +76,7 @@ def pathsreport(request): "EXPOWEB" : type(settings.EXPOWEB), "EXPOWEB_URL" : type(settings.EXPOWEB_URL), "FILES" : type(settings.FILES), +# "LIBDIR" : type( settings.LIBDIR), "LOGFILE" : type(settings.LOGFILE), "LOGIN_REDIRECT_URL" : type(settings.LOGIN_REDIRECT_URL), "MEDIA_ROOT" : type(settings.MEDIA_ROOT),