Merge pull request #162 from plone/rename-dist

Rename `default` distribution to `volto`

Makefile

@@ -36,7 +36,7 @@ ifeq ($(PYTHON_VERSION_OK),0)
 endif
 
 # Set distributions still in development
-DISTRIBUTIONS="default"
+DISTRIBUTIONS="volto"
 
 all: build
 

mx.ini

@@ -6,7 +6,7 @@
 [settings]
 main-package = -e .[test]
 version-overrides =
-    plone.volto==5.0.0a1.dev0
+    plone.volto==5.0.0b2.dev0
 
 [plone.distribution]
 url = https://github.com/plone/plone.distribution.git

news/161.bugfix

@@ -0,0 +1 @@
+Rename `default` distribution to `volto`. @davisagli

src/plone/volto/distributions.zcml

@@ -6,10 +6,10 @@
     >
 
   <plone:distribution
-      name="default"
-      title="Plone Site"
+      name="volto"
+      title="Plone Site (Volto)"
       description="A Plone Site to be used with a Volto frontend"
-      directory="distributions/default"
+      directory="distributions/volto"
       post_handler="plone.distribution.handler.post_handler"
       />
 

src/plone/volto/profiles/default/metadata.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <metadata>
-  <version>1017</version>
+  <version>1018</version>
   <dependencies>
     <dependency>profile-plone.restapi:blocks</dependency>
   </dependencies>

src/plone/volto/testing.py

@@ -32,7 +32,7 @@
 
 class BaseFixture(PloneDistributionFixture):
     PACKAGE_NAME = "plone.volto"
-    SITES = (("default", ANSWERS),)
+    SITES = (("volto", ANSWERS),)
     _distribution_products = (
         ("plone.app.contenttypes", {"loadZCML": True}),
         ("plone.app.caching", {"loadZCML": True}),

src/plone/volto/upgrades.py

@@ -1,6 +1,7 @@
 from copy import deepcopy
 from OFS.interfaces import IOrderedContainer
 from plone import api
+from plone.base.interfaces import IPloneSiteRoot
 from plone.registry import field
 from plone.registry.interfaces import IRegistry
 from plone.registry.record import Record
@@ -143,3 +144,15 @@ def add_block_types_index(context):
         if index % 250 == 0:
             logger.info(f"Reindexed {index}/{total} objects")
             transaction.commit()
+
+
+def rename_distribution(context):
+    from plone.distribution.api.distribution import get_creation_report
+
+    portal = getUtility(IPloneSiteRoot)
+    report = get_creation_report(portal)
+    if report is not None:
+        if report.name == "default":
+            report.name = "volto"
+        if report.answers.get("distribution") == "default":
+            report.answers["distribution"] = "volto"

src/plone/volto/upgrades.zcml

@@ -75,4 +75,15 @@
         />
   </genericsetup:upgradeSteps>
 
+  <genericsetup:upgradeSteps
+      profile="plone.volto:default"
+      source="1017"
+      destination="1018"
+      >
+    <genericsetup:upgradeStep
+        title="Rename default distribution to volto"
+        handler=".upgrades.rename_distribution"
+        />
+  </genericsetup:upgradeSteps>
+
 </configure>

tests/conftest.py

@@ -40,7 +40,7 @@
 @pytest.fixture
 def distribution_name() -> str:
     """Distribution name."""
-    return "default"
+    return "volto"
 
 
 @pytest.fixture

tests/distribution/test_registration.py

@@ -20,7 +20,7 @@ def test_distribution_class(self):
     @pytest.mark.parametrize(
         "attr,expected",
         [
-            ["title", "Plone Site"],
+            ["title", "Plone Site (Volto)"],
             [
                 "description",
                 "A Plone Site to be used with a Volto frontend",

tests/setup/test_setup_install.py

@@ -16,7 +16,7 @@ def test_browserlayer(self, browser_layers):
 
     def test_latest_version(self, profile_last_version):
         """Test latest version of default profile."""
-        assert profile_last_version(f"{PACKAGE_NAME}:default") == "1017"
+        assert profile_last_version(f"{PACKAGE_NAME}:default") == "1018"
 
     @pytest.mark.parametrize(
         "portal_type,behavior",