Merge pull request #108 from RedTurtle/sitesettings_dependency

Add dependency with collective.volto.sitesettings

.gitignore

@@ -10,10 +10,12 @@ coverage.json
 *.py?
 *.swp
 # dirs
+__pycache__
 bin/
 buildout-cache/
 develop-eggs/
 eggs/
+extras/
 htmlcov/
 include/
 lib/

base.cfg

@@ -17,8 +17,11 @@ parts =
     omelette
     robot
     plone-helper-scripts
-develop = .
 
+develop = .
+sources-dir = extras
+auto-checkout = *
+always-checkout = force
 
 [instance]
 recipe = plone.recipe.zope2instance
@@ -117,3 +120,5 @@ scripts =
 # Don't use a released version of redturtle.volto
 redturtle.volto =
 setuptools = 
+
+[sources]

setup.py

@@ -62,6 +62,7 @@
         "plone.volto>=4.0.0",
         "plone.restapi>=9.6.0",
         "Products.PortalTransforms>=3.2.0",
+        "collective.volto.sitesettings",
         "z3c.jbot",
     ],
     extras_require={

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

@@ -1,10 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <metadata>
-  <version>4305</version>
+  <version>4306</version>
   <dependencies>
     <dependency>profile-plone.volto:default</dependency>
     <dependency>profile-plone.app.caching:with-caching-proxy</dependency>
     <dependency>profile-collective.volto.gdprcookie:default</dependency>
     <dependency>profile-kitconcept.seo:default</dependency>
+    <dependency>profile-collective.volto.sitesettings:default</dependency>
   </dependencies>
 </metadata>

src/redturtle/volto/testing.py

@@ -9,6 +9,7 @@
 from plone.testing import z2
 
 import collective.volto.gdprcookie
+import collective.volto.sitesettings
 import kitconcept.seo
 import plone.app.caching
 import plone.restapi
@@ -24,6 +25,7 @@ def setUpZope(self, app, configurationContext):
         # The z3c.autoinclude feature is disabled in the Plone fixture base
         # layer.
         self.loadZCML(package=collective.volto.gdprcookie)
+        self.loadZCML(package=collective.volto.sitesettings)
         self.loadZCML(package=plone.restapi)
         self.loadZCML(package=redturtle.volto)
         self.loadZCML(package=plone.volto)
@@ -67,6 +69,7 @@ def setUpZope(self, app, configurationContext):
         super(RedturtleVoltoRestApiLayer, self).setUpZope(app, configurationContext)
 
         self.loadZCML(package=collective.volto.gdprcookie)
+        self.loadZCML(package=collective.volto.sitesettings)
         self.loadZCML(package=plone.restapi)
         self.loadZCML(package=plone.volto)
         self.loadZCML(package=redturtle.volto)

src/redturtle/volto/upgrades.py

@@ -508,3 +508,10 @@ def to_4305(context):
     installer.uninstall_product(product_id="collective.volto.cookieconsent")
     if not installer.is_product_installed("collective.volto.gdprcookie"):
         installer.install_product(product_id="collective.volto.gdprcookie")
+
+
+def to_4306(context):
+    portal = api.portal.get()
+    installer = get_installer(portal, portal.REQUEST)
+    if not installer.is_product_installed("collective.volto.sitesettings"):
+        installer.install_product(product_id="collective.volto.sitesettings")

src/redturtle/volto/upgrades.zcml

@@ -232,4 +232,12 @@
       destination="4305"
       handler=".upgrades.to_4305"
       />
+  <genericsetup:upgradeStep
+      title="Install new dependency"
+      description=""
+      profile="redturtle.volto:default"
+      source="4305"
+      destination="4306"
+      handler=".upgrades.to_4306"
+      />
 </configure>

test_plone60.cfg

@@ -6,6 +6,7 @@ extends =
     base.cfg
 
 [versions]
+docutils =
 
 # Added by buildout at 2023-03-10 11:55:21.122842
 Products.AdvancedQuery = 4.2.1