Merge branch 'main' into dependabot/github_actions/peaceiris/actions-gh-pages-4

Author: jensens

src/mxmake/helpgen.py

@@ -44,7 +44,7 @@ def print_help(makefile: pathlib.Path):
         )
         sys.stdout.write("\n\nTARGETS\n\n")
         for target in domain.targets:
-            sys.stdout.write(f"{idnt*lvl}{target.name}\n")
+            sys.stdout.write(f"{idnt * lvl}{target.name}\n")
             if help_domain:
                 lvl += 1
                 found = True
@@ -65,7 +65,7 @@ def print_help(makefile: pathlib.Path):
             for setting in domain.settings:
                 fqn_setting = f"{domain.fqn}.{setting.name}"
                 sys.stdout.write(
-                    f"{idnt*lvl}{setting.name}={parser.settings.get(fqn_setting) or '<not set>'}\n"
+                    f"{idnt * lvl}{setting.name}={parser.settings.get(fqn_setting) or '<not set>'}\n"
                 )
                 sys.stdout.write(
                     "\n".join(

src/mxmake/templates.py

@@ -353,7 +353,9 @@ def template_variables(self) -> typing.Dict[str, typing.Any]:
             if domain.fqn == "applications.plone":
                 template = dict(
                     name="plone-site",
-                    settings=dict(distribution="volto", extension_ids="plone.volto:default"),
+                    settings=dict(
+                        distribution="volto", extension_ids="plone.volto:default"
+                    ),
                 )
                 mxmake_templates.append(template)
         return dict(mxmake_templates=mxmake_templates, mxmake_env=mxmake_env)
@@ -514,15 +516,17 @@ def template_variables(self):
         site.setdefault("setup_content", False)
         site.setdefault("default_language", "en")
         site.setdefault("portal_timezone", "UTC")
-        site.setdefault("extension_ids", "")
         site.update(**self.settings)
         if "distribution" in site:
             vars["distribution"] = site.pop("distribution")
 
         # handle extension ids
-        site["extension_ids"] = [
-            eid.strip() for eid in site["extension_ids"].split("\n") if eid.strip()
-        ]
+        if site.get("extension_ids", None) is not None:
+            site["extension_ids"] = [
+                eid.strip() for eid in site["extension_ids"].split("\n") if eid.strip()
+            ]
+        else:
+            site["extension_ids"] = []
         return vars
 
 

src/mxmake/tests/test_hook.py

@@ -10,9 +10,7 @@ class TestHook(unittest.TestCase):
     def test_Hook(self, tempdir):
         mxini = tempdir / "mx.ini"
         with mxini.open("w") as fd:
-            fd.write(
-                "[settings]\n" "mxmake-templates = run-tests run-coverage inexistent"
-            )
+            fd.write("[settings]\nmxmake-templates = run-tests run-coverage inexistent")
 
         hook_ = hook.Hook()
         configuration = mxdev.Configuration(mxini, hooks=[hook_])

src/mxmake/tests/test_templates.py

@@ -820,7 +820,8 @@ def test_MxIni(self, tempdir):
                 # VAR = value
 
                 [mxmake-plone-site]
-                distribution = default
+                distribution = volto
+                extension_ids = plone.volto:default
 
                 [mxmake-run-coverage]
                 environment = env
@@ -850,7 +851,7 @@ def test_PloneSite_all_defaults(self, tempdir):
             {
                 "site": {
                     "default_language": "en",
-                    "extension_ids": ["plone.volto:default"],
+                    "extension_ids": [],
                     "portal_timezone": "UTC",
                     "setup_content": False,
                     "site_id": "Plone",
@@ -902,9 +903,6 @@ def asbool(value: str | bool | None) -> bool:
                     "setup_content": "False",
                     "default_language": "en",
                     "portal_timezone": "UTC",
-                    "extension_ids": [
-                        "plone.volto:default",
-                    ],
                     "profile_id": _DEFAULT_PROFILE,
                 }
                 config["setup_content"] = asbool(config["setup_content"])