From fe2d4bfb03550db91f5d6707eec6397fba60674c Mon Sep 17 00:00:00 2001 From: Andrea Cecchi Date: Mon, 21 Oct 2024 14:53:34 +0200 Subject: [PATCH 1/2] Fix tests: do not import collective.volto.cookieconsent --- CHANGES.rst | 3 ++- base.cfg | 8 +------- src/design/plone/policy/testing.py | 3 --- 3 files changed, 3 insertions(+), 11 deletions(-) diff --git a/CHANGES.rst b/CHANGES.rst index 5e1e632..cc628b1 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -6,7 +6,8 @@ Changelog - Fix a test for translations [mamico] - +- Fix tests: do not import collective.volto.cookieconsent. + [cekk] 5.0.11 (2024-09-05) ------------------- diff --git a/base.cfg b/base.cfg index 082ed10..1904596 100644 --- a/base.cfg +++ b/base.cfg @@ -127,10 +127,4 @@ eggs = createcoverage design.plone.policy = [sources] -# collective.volto.dropdownmenu = git https://github.com/collective/collective.volto.dropdownmenu.git pushurl=git@github.com:collective/collective.volto.dropdownmenu.git -# collective.volto.secondarymenu = git https://github.com/collective/collective.volto.secondarymenu.git pushurl=git@github.com:collective/collective.volto.secondarymenu.git branch=main -# collective.volto.subsites = git https://github.com/collective/collective.volto.subsites.git pushurl=git@github.com:collective/collective.volto.subsites.git branch=main -design.plone.contenttypes = git https://github.com/RedTurtle/design.plone.contenttypes.git pushurl=git@github.com:RedTurtle/design.plone.contenttypes.git -# plone.restapi = git https://github.com/plone/plone.restapi.git pushurl=git@github.com:plone/plone.restapi.git -# redturtle.volto = git https://github.com/RedTurtle/redturtle.volto.git pushurl=git@github.com:RedTurtle/redturtle.volto.git branch=vocab_permission -# redturtle.voltoplugin.editablefooter = git https://github.com/RedTurtle/redturtle.voltoplugin.editablefooter.git pushurl=git@github.com:RedTurtle/redturtle.voltoplugin.editablefooter.git branch=main +# design.plone.contenttypes = git https://github.com/RedTurtle/design.plone.contenttypes.git pushurl=git@github.com:RedTurtle/design.plone.contenttypes.git diff --git a/src/design/plone/policy/testing.py b/src/design/plone/policy/testing.py index d5644dc..fee5398 100644 --- a/src/design/plone/policy/testing.py +++ b/src/design/plone/policy/testing.py @@ -2,7 +2,6 @@ import collective.feedback import collective.MockMailHost import collective.taxonomy -import collective.volto.cookieconsent import collective.volto.dropdownmenu import collective.volto.formsupport import collective.volto.secondarymenu @@ -43,7 +42,6 @@ def setUpZope(self, app, configurationContext): self.loadZCML(package=design.plone.policy) self.loadZCML(package=collective.feedback) self.loadZCML(package=collective.volto.formsupport) - self.loadZCML(package=collective.volto.cookieconsent) self.loadZCML(package=collective.volto.dropdownmenu) self.loadZCML(package=collective.volto.secondarymenu) self.loadZCML(package=collective.volto.socialsettings) @@ -125,7 +123,6 @@ def setUpZope(self, app, configurationContext): self.loadZCML(package=design.plone.policy) self.loadZCML(package=collective.feedback) self.loadZCML(package=collective.volto.formsupport) - self.loadZCML(package=collective.volto.cookieconsent) self.loadZCML(package=collective.volto.dropdownmenu) self.loadZCML(package=collective.volto.secondarymenu) self.loadZCML(package=collective.volto.socialsettings) From 56f24b6dc5618773abfe54aa7c492b4dfd2ed717 Mon Sep 17 00:00:00 2001 From: Andrea Cecchi Date: Mon, 21 Oct 2024 14:54:44 +0200 Subject: [PATCH 2/2] fix dependency --- base.cfg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/base.cfg b/base.cfg index 1904596..5836633 100644 --- a/base.cfg +++ b/base.cfg @@ -127,4 +127,4 @@ eggs = createcoverage design.plone.policy = [sources] -# design.plone.contenttypes = git https://github.com/RedTurtle/design.plone.contenttypes.git pushurl=git@github.com:RedTurtle/design.plone.contenttypes.git +design.plone.contenttypes = git https://github.com/RedTurtle/design.plone.contenttypes.git pushurl=git@github.com:RedTurtle/design.plone.contenttypes.git