install new dependency

RedTurtle · Apr 10, 2024 · a9bb8f3 · a9bb8f3
1 parent 11bfc1c
commit a9bb8f3
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/src/redturtle/volto/testing.py b/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)

diff --git a/src/redturtle/volto/upgrades.py b/src/redturtle/volto/upgrades.py
@@ -9,10 +9,6 @@
 from uuid import uuid4
 from zope.schema import getFields
 
-<<<<<<< Updated upstream
-
-=======
->>>>>>> Stashed changes
 try:
     from plone.base.utils import get_installer
 except Exception:
@@ -512,6 +508,7 @@ def to_4305(context):
     if not installer.is_product_installed("collective.volto.gdprcookie"):
         installer.install_(product_id="collective.volto.gdprcookie")
 
+
 def to_4306(context):
     portal = api.portal.get()
     installer = get_installer(portal, portal.REQUEST)