enh: run DCOR theme patches during inspect

Author: paulmueller

CHANGELOG

@@ -1,3 +1,6 @@
+1.17.1
+ - enh: run DCOR theme patches during inspect
+ - setup: bump ckanext-dcor_theme to 1.1.0
 1.17.0
  - BREAKING: remove DCOR-colab branding recipe (migrated to ansible)
  - BREAKING: remove DCOR-med branding recipe (migrated to ansible)

dcor_control/cli/inspect.py

@@ -71,7 +71,7 @@ def inspect(assume_yes=False, dcor_site_config_dir=None):
     click.secho("Checking i18n hack...", bold=True)
     cn += inspect_mod.check_dcor_theme_i18n_hack(autocorrect=assume_yes)
 
-    click.secho("Checking DCOR theme css branding...", bold=True)
+    click.secho("Checking DCOR theme css branding and patches...", bold=True)
     cn += inspect_mod.check_dcor_theme_main_css(autocorrect=assume_yes)
 
     if cn:

dcor_control/inspect/config_ckan.py

@@ -88,7 +88,7 @@ def check_dcor_theme_i18n_hack(autocorrect):
 
 
 def check_dcor_theme_main_css(autocorrect):
-    """Generate dcor_main.css
+    """Generate dcor_main.css and patch a few template files
 
      This will run the command::
 
@@ -100,10 +100,10 @@ def check_dcor_theme_main_css(autocorrect):
     # TODO: Check whether the paths created by this script are set up correctly
     if opt != "dcor_theme_main/dcor_theme_main":
         if autocorrect:
-            print("Applying DCOR theme main css")
+            print("Applying DCOR theme main css and templating patches")
             replace_main = True
         else:
-            replace_main = common.ask("DCOR theme dcor_main.css is not setup")
+            replace_main = common.ask("DCOR theme CSS and patches not set-up")
         if replace_main:
             # apply hack
             ckan_cmd = f"ckan -c {ckan_ini} dcor-theme-main-css-branding"
@@ -113,6 +113,10 @@ def check_dcor_theme_main_css(autocorrect):
                 key="ckan.theme",
                 value="dcor_theme_main/dcor_theme_main",
                 autocorrect=True)
+            # apply patches
+            ckan_cmd_2 = f"ckan -c {ckan_ini} dcor-patch-ckan-templates"
+            sp.check_output(ckan_cmd_2, shell=True)
+
     return did_something
 
 

pyproject.toml

@@ -36,7 +36,7 @@ dependencies = [
     "ckanext-dc_view>=0.12.0",
     "ckanext-dcor_depot>=0.17.0",
     "ckanext-dcor_schemas>=0.22.0",
-    "ckanext-dcor_theme>=0.12.0",
+    "ckanext-dcor_theme>=1.1.0",
     "dcor_shared>=1.0.2",
     "importlib_resources",
     "numpy>=1.21",  # CVE-2021-33430