Us31872 introduce contactblock (#81)

* add dependency to collective.volto.contactsblock

Author: luca-bellenghi

CHANGES.rst

@@ -4,6 +4,8 @@ Changelog
 5.0.17 (unreleased)
 -------------------
 
+- Install contactsblocks.
+  [lucabel]
 - formsupport 3.3.0 compatibility.
   [mamico]
 

setup.py

@@ -64,6 +64,7 @@
         "redturtle.faq",
         "redturtle.rssservice",
         "iw.rejectanonymous",
+        "collective.volto.contactsblock>=1.0.1",
     ],
     extras_require={
         "test": [

src/design/plone/policy/profiles/default/metadata.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <metadata>
-  <version>3103</version>
+  <version>3104</version>
   <dependencies>
     <dependency>profile-plone.restapi:default</dependency>
     <dependency>profile-design.plone.contenttypes:default</dependency>
@@ -15,5 +15,6 @@
     <dependency>profile-collective.volto.slimheader:default</dependency>
     <dependency>profile-redturtle.faq:default</dependency>
     <dependency>profile-collective.feedback:default</dependency>
+    <dependency>profile-collective.volto.contactsblock:default</dependency>
   </dependencies>
 </metadata>

src/design/plone/policy/testing.py

@@ -1,7 +1,18 @@
 # -*- coding: utf-8 -*-
+from design.plone.contenttypes.testing import DesignPloneContenttypesLayer
+from design.plone.contenttypes.testing import DesignPloneContenttypesRestApiLayer
+from plone.app.contenttypes.testing import PLONE_APP_CONTENTTYPES_FIXTURE
+from plone.app.robotframework.testing import REMOTE_LIBRARY_BUNDLE_FIXTURE
+from plone.app.testing import applyProfile
+from plone.app.testing import FunctionalTesting
+from plone.app.testing import IntegrationTesting
+from plone.testing import z2
+from zope.globalrequest import setRequest
+
 import collective.feedback
 import collective.MockMailHost
 import collective.taxonomy
+import collective.volto.contactsblock
 import collective.volto.dropdownmenu
 import collective.volto.formsupport
 import collective.volto.secondarymenu
@@ -16,15 +27,6 @@
 import redturtle.faq
 import redturtle.voltoplugin.editablefooter
 import souper.plone
-from design.plone.contenttypes.testing import (
-    DesignPloneContenttypesLayer,
-    DesignPloneContenttypesRestApiLayer,
-)
-from plone.app.contenttypes.testing import PLONE_APP_CONTENTTYPES_FIXTURE
-from plone.app.robotframework.testing import REMOTE_LIBRARY_BUNDLE_FIXTURE
-from plone.app.testing import FunctionalTesting, IntegrationTesting, applyProfile
-from plone.testing import z2
-from zope.globalrequest import setRequest
 
 
 class FauxRequest(dict):
@@ -53,6 +55,7 @@ def setUpZope(self, app, configurationContext):
         self.loadZCML(package=plone.app.contentlisting)
         self.loadZCML(package=souper.plone)
         self.loadZCML(package=redturtle.faq)
+        self.loadZCML(package=collective.volto.contactsblock)
 
     def setUpPloneSite(self, portal):
         super().setUpPloneSite(portal)
@@ -136,6 +139,7 @@ def setUpZope(self, app, configurationContext):
         self.loadZCML(package=redturtle.faq)
         self.loadZCML(package=souper.plone)
         self.loadZCML(package=redturtle.faq)
+        self.loadZCML(package=collective.volto.contactsblock)
 
     def setUpPloneSite(self, portal):
         super().setUpPloneSite(portal)

src/design/plone/policy/tests/test_initial_structure.py

@@ -115,4 +115,6 @@ def test_enabled_blocks_contents_have_defaults(self):
             object_provides="plone.restapi.behaviors.IBlocks"
         )
         for brain in brains:
-            self.check_initial_blocks(brain.getObject())
+            obj = brain.getObject()
+            if obj != self.portal:
+                self.check_initial_blocks(obj)

src/design/plone/policy/upgrades.py

@@ -433,3 +433,9 @@ def to_3101(context):
 
                             if blocks_layout:
                                 item.blocks_layout = blocks_layout
+
+
+def install_contactsblock(context):
+    """Install collective.volto.contactsblock."""
+    installOrReinstallProduct(api.portal.get(), "collective.volto.contactsblock")
+    logger.info("Installed collective.volto.contactsblock")

src/design/plone/policy/upgrades.zcml

@@ -211,4 +211,14 @@
         handler=".setuphandlers.disable_searchable_types"
         />
   </genericsetup:upgradeSteps>
+  <genericsetup:upgradeSteps
+      profile="design.plone.policy:default"
+      source="3103"
+      destination="3104"
+      >
+    <genericsetup:upgradeStep
+        title="Install collective.volto.contactsblock"
+        handler=".upgrades.install_contactsblock"
+        />
+  </genericsetup:upgradeSteps>
 </configure>

test_plone60.cfg

@@ -9,3 +9,87 @@ extends =
 update-versions-file = test_plone60.cfg
 
 [versions]
+# to remove when released
+collective.volto.formsupport = 3.2.2
+
+# Added by buildout at 2021-12-29 11:05:41.321569
+flake8 = 6.0.0
+flake8-coding = 1.3.2
+flake8-debugger = 4.1.2
+flake8-print = 5.0.0
+mccabe = 0.7.0
+plone.recipe.codeanalysis = 3.0.1
+pyflakes = 3.0.1
+zpretty = 3.0.1
+
+# Required by:
+# flake8-debugger==3.2.1
+# flake8-print==3.1.4
+pycodestyle = 2.10.0
+
+# Added by buildout at 2023-01-12 09:16:52.328614
+bleach = 5.0.1
+build = 0.9.0
+commonmark = 0.9.1
+i18ndude = 5.3.4
+keyring = 23.11.0
+pep517 = 0.13.0
+pkginfo = 1.8.3
+readme-renderer = 37.3
+requests-toolbelt = 0.10.1
+rfc3986 = 2.0.0
+rich = 13.3.1
+pygments = 2.14.0
+twine = 4.0.1
+zest.releaser = 7.3.0
+
+# Required by:
+# plone.recipe.codeanalysis==3.0.1
+check-manifest = 0.48
+
+# Required by:
+# zest.releaser==7.2.0
+colorama = 0.4.6
+
+# Required by:
+# keyring==23.11.0
+jaraco.classes = 3.2.3
+
+# Required by:
+# jaraco.classes==3.2.3
+more-itertools = 9.0.0
+
+# Required by:
+# check-manifest==0.48
+tomli = 2.0.1
+
+# Required by:
+# bleach==5.0.1
+webencodings = 0.5.1
+
+dataclasses = 0.8
+
+# Added by buildout at 2023-02-20 14:52:32.917956
+backports.functools-lru-cache = 1.6.4
+markdown-it-py = 2.1.0
+mdurl = 0.1.2
+pkgutil-resolve-name = 1.3.10
+
+# Required by:
+# PasteDeploy==3.0.1
+# plone.restapi==8.33.3
+importlib-metadata = 5.2.0
+
+# Added by buildout at 2023-03-01 12:57:48.164146
+coverage = 7.0.5
+createcoverage = 1.5
+
+# temporary version
+collective.taxonomy = 3.1.5
+collective.volto.blocksfield = 2.2.0
+
+# Added by buildout at 2025-10-02 15:40:54.191154
+collective-volto-contactsblock = 1.0.0
+
+# Added by buildout at 2025-10-02 15:42:50.220819
+collective-volto-contactsblock = 1.0.1