Merge branch 'develop' of github.com:nationalarchives/ds-wagtail into…

… feature/headless
nationalarchives · Jan 3, 2024 · 3e57937 · 3e57937
2 parents d92e9f7 + d36f39c
commit 3e57937
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 6 deletions.
diff --git a/config/settings/base.py b/config/settings/base.py
@@ -11,15 +11,14 @@
 """
 import os
 
-from distutils.sysconfig import get_python_lib
+from sysconfig import get_path
 
 import sentry_sdk
 
 from sentry_sdk.integrations.django import DjangoIntegration
 
-from lib.util import strtobool
-
 from ..versioning import get_git_sha
+from .util import strtobool
 
 # Build paths inside the project like this: os.path.join(BASE_DIR, ...)
 PROJECT_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
@@ -121,7 +120,7 @@
         "DIRS": [
             os.path.join(BASE_DIR, "templates"),
             os.path.join(
-                get_python_lib(), "nationalarchives-frontend-django/templates"
+                get_path("platlib"), "nationalarchives-frontend-django/templates"
             ),
         ],
         "APP_DIRS": True,

diff --git a/config/settings/dev.py b/config/settings/dev.py
@@ -1,9 +1,8 @@
 import logging
 import os
 
-from lib.util import strtobool
-
 from .base import *  # noqa: F401
+from .util import strtobool
 
 # SECURITY WARNING: don't run with debug turned on in production!
 DEBUG = strtobool(os.getenv("DEBUG", "True"))  # noqa: F405

diff --git a/lib/util.py → config/settings/util.py b/lib/util.py → config/settings/util.py