setting up fresh venv

2 files changed, 12 insertions, 18 deletions

diff --git a/_deploy/wsl/localsettingsWSL.py b/_deploy/wsl/localsettingsWSL.py
index 2824125..60d1c56 100644
--- a/_deploy/wsl/localsettingsWSL.py
+++ b/_deploy/wsl/localsettingsWSL.py
@@ -47,7 +47,6 @@ PV = "python" + str(sys.version_info.major) + "." + str(sys.version_info.minor)
 REPOS_ROOT_PATH = Path(__file__).parent.parent
 LIBDIR = REPOS_ROOT_PATH / "lib" / PV
 
-
 TROGGLE_PATH = Path(__file__).parent
 TEMPLATE_PATH = TROGGLE_PATH / "templates"
 MEDIA_ROOT = TROGGLE_PATH / "media"
@@ -56,19 +55,16 @@ JSLIB_ROOT = TROGGLE_PATH / "media" / "jslib"  # used for CaveViewer JS utility
 EXPOFILES = REPOS_ROOT_PATH / "expofiles"
 
 SCANS_ROOT = EXPOFILES / "surveyscans"
-# PHOTOS_ROOT = EXPOFILES / 'photos'
 PHOTOS_ROOT = Path("/mnt/d/EXPO/PHOTOS") 
 PHOTOS_YEAR = "2023"
-
 NOTABLECAVESHREFS = ["290", "291", "264", "258", "204", "359", "76", "107"]
 
-# PYTHON_PATH = os.fspath(PYTHON_PATH)
+
 PYTHON_PATH = REPOS_ROOT_PATH / "troggle"
 LOGFILE = PYTHON_PATH / "troggle.log"
 SQLITEDB = PYTHON_PATH / "troggle.sqlite"
 KMZ_ICONS_PATH = PYTHON_PATH / "kmz_icons"
 
-
 # URL that handles the media served from MEDIA_ROOT. Make sure to use a
 # trailing slash if there is a path component (optional in other cases).
 MEDIA_URL = "/site-media/"
@@ -82,6 +78,7 @@ URL_ROOT = "/"
 MEDIA_URL = Path(URL_ROOT, "/site_media/")
 PHOTOS_URL = Path(URL_ROOT, "/photos/")
 
+
 STATIC_URL = Path(URL_ROOT, "/static/")  # used by Django admin pages. Do not delete.
 JSLIB_URL = Path(URL_ROOT, "/javascript/")  # used for CaveViewer JS utility
 
@@ -99,8 +96,8 @@ SURVEXPORT = "survexport"  # for parsing .3d files and producing .pos files
 DBSQLITE = {
     "default": {
         "ENGINE": "django.db.backends.sqlite3",  # 'postgresql_psycopg2', 'mysql', 'sqlite3' or 'oracle'.
-        #'NAME' : 'troggle.sqlite',
         "NAME": str(SQLITEDB),
+        #        'NAME' : ':memory:',
         "USER": "expo",  # Not used with sqlite3.
         "PASSWORD": "sekrit",  # Not used with sqlite3.
         "HOST": "",  # Set to empty string for localhost. Not used with sqlite3.
@@ -136,19 +133,19 @@ TEMPLATES = [
             "debug": "DEBUG",
             "context_processors": [
                 # django.template.context_processors.csrf, # is always enabled and cannot be removed, sets csrf_token
-                "django.contrib.auth.context_processors.auth", # knowledge of logged-on user & permissions
-                "core.context.troggle_context", # in core/troggle.py - only used in expedition.html
+                "django.contrib.auth.context_processors.auth",  # knowledge of logged-on user & permissions
+                "core.context.troggle_context",  # in core/troggle.py - only used in expedition.html
                 "django.template.context_processors.debug",
                 "django.template.context_processors.i18n",
                 "django.template.context_processors.media",  # includes a variable MEDIA_URL
-                "django.template.context_processors.static", # includes a variable STATIC_URL used by admin pages
+                "django.template.context_processors.static",  # includes a variable STATIC_URL used by admin pages
                 "django.template.context_processors.tz",
-                "django.template.context_processors.request", # must be enabled in DjangoTemplates (TEMPLATES) in order to use the admin navigation sidebar.
+                "django.template.context_processors.request",  # must be enabled in DjangoTemplates (TEMPLATES) in order to use the admin navigation sidebar.
                 "django.contrib.messages.context_processors.messages",
             ],
             "loaders": [
-                "django.template.loaders.filesystem.Loader", # default lcation is troggle/templates/
-                "django.template.loaders.app_directories.Loader", # needed for admin 'app'
+                "django.template.loaders.filesystem.Loader",  # default lcation is troggle/templates/
+                "django.template.loaders.app_directories.Loader",  # needed for admin 'app'
             ],
         },
     },
@@ -167,7 +164,6 @@ DEFAULT_FROM_EMAIL = "django-test@klebos.net"
 
 SURVEX_DATA = REPOS_ROOT_PATH / "loser"
 DRAWINGS_DATA = REPOS_ROOT_PATH / "drawings"
-
 EXPOWEB = REPOS_ROOT_PATH / "expoweb"
 CAVEDESCRIPTIONS = EXPOWEB / "cave_data"
 ENTRANCEDESCRIPTIONS = EXPOWEB / "entrance_data"
@@ -177,12 +173,10 @@ EXPOWEB_URL = ""
 
 sys.path.append(str(REPOS_ROOT_PATH))
 sys.path.append(str(PYTHON_PATH))
+#TINY_MCE_MEDIA_ROOT = STATIC_ROOT + '/tiny_mce/' # not needed while TinyMCE not installed
+#TINY_MCE_MEDIA_URL = STATIC_URL + '/tiny_mce/' # not needed while TinyMCE not installed
 
 # Sanitise these to be strings as Django seems to be particularly sensitive to crashing if they aren't
-# and we have not made the change to pathlib Path type in the other localsettings-* variants yet.
-CAVEDESCRIPTIONS = os.fspath(CAVEDESCRIPTIONS)
-ENTRANCEDESCRIPTIONS = os.fspath(ENTRANCEDESCRIPTIONS)
-
 STATIC_URL = str(STATIC_URL) + "/"
 MEDIA_URL = str(MEDIA_URL) + "/"
 
diff --git a/_deploy/wsl/requirements-p11d42.txt b/_deploy/wsl/requirements-p11d42.txt
index 5f5eed7..7d1992c 100644
--- a/_deploy/wsl/requirements-p11d42.txt
+++ b/_deploy/wsl/requirements-p11d42.txt
@@ -18,4 +18,4 @@ ruff==0.0.245
 soupsieve==2.5
 sqlparse==0.4.0
 Unidecode==1.3.0
-piexif==1.1
+piexif