diff --git a/last_commit.txt b/last_commit.txt index 10713d1d37..ad3098701c 100644 --- a/last_commit.txt +++ b/last_commit.txt @@ -2,57 +2,65 @@ Repository: plone.volto Branch: refs/heads/main -Date: 2024-12-11T10:01:37-08:00 +Date: 2024-12-11T10:21:14-08:00 Author: David Glick (davisagli) -Commit: https://github.com/plone/plone.volto/commit/3af904226a2298702d205187e31288968c4c60bc +Commit: https://github.com/plone/plone.volto/commit/4de2f36ad220413c89d5e068f3bae26967b5def1 -Remove unnecessary zcml conditions +plone.app.multilingual is not a hard dependency Files changed: -M src/plone/volto/behaviors/configure.zcml -M src/plone/volto/browser/configure.zcml -M src/plone/volto/configure.zcml -M src/plone/volto/dependencies.zcml -M src/plone/volto/overrides.zcml -M src/plone/volto/patches.zcml +M setup.py -b'diff --git a/src/plone/volto/behaviors/configure.zcml b/src/plone/volto/behaviors/configure.zcml\nindex 47f096e..f98b9c8 100644\n--- a/src/plone/volto/behaviors/configure.zcml\n+++ b/src/plone/volto/behaviors/configure.zcml\n@@ -1,7 +1,6 @@\n \n \n@@ -17,15 +16,13 @@\n provides=".preview.IPreview"\n />\n \n- \n- \n- \n- \n+ \n+ \n \n \n \n \n \n \n@@ -39,7 +37,6 @@\n class=".migrate_richtext.MigrateRichTextToVoltoBlocks"\n template="migrate_richtext.pt"\n permission="cmf.ManagePortal"\n- zcml:condition="have plone-60"\n />\n \n \n \n \n@@ -59,7 +55,6 @@\n template="voltobackendwarning.pt"\n permission="zope2.View"\n layer="plone.volto.interfaces.IPloneVoltoCoreLayer"\n- zcml:condition="have plone-60"\n />\n \n \ndiff --git a/src/plone/volto/configure.zcml b/src/plone/volto/configure.zcml\nindex 73392f4..f2875b3 100644\n--- a/src/plone/volto/configure.zcml\n+++ b/src/plone/volto/configure.zcml\n@@ -5,7 +5,6 @@\n xmlns:i18n="http://namespaces.zope.org/i18n"\n xmlns:monkey="http://namespaces.plone.org/monkey"\n xmlns:plone="http://namespaces.plone.org/plone"\n- xmlns:zcml="http://namespaces.zope.org/zcml"\n i18n_domain="plone.volto"\n >\n \ndiff --git a/src/plone/volto/dependencies.zcml b/src/plone/volto/dependencies.zcml\nindex 3b4fc84..fce6a2b 100644\n--- a/src/plone/volto/dependencies.zcml\n+++ b/src/plone/volto/dependencies.zcml\n@@ -1,7 +1,4 @@\n-\n+\n \n \n+\n \n \n \n@@ -20,7 +19,6 @@\n class="Products.CMFPlone.browser.login.password_reset.PasswordResetToolView"\n docstringWarning="True"\n description="Patch password reset tool construct URL to cater for different frontend domain"\n- zcml:condition="have plone-52"\n />\n \n \n' +b'diff --git a/setup.py b/setup.py\nindex 8264775..d6a548d 100644\n--- a/setup.py\n+++ b/setup.py\n@@ -44,7 +44,6 @@\n "collective.monkeypatcher",\n "plone.api",\n "plone.app.caching",\n- "plone.app.multilingual",\n "plone.distribution",\n "plone.restapi>=8.41.0",\n "Products.CMFPlone",\n@@ -55,6 +54,7 @@\n "responses",\n "plone.app.discussion",\n "plone.app.iterate",\n+ "plone.app.multilingual",\n "plone.app.robotframework",\n "plone.app.testing",\n "plone.app.upgrade",\n' Repository: plone.volto Branch: refs/heads/main -Date: 2024-12-11T10:02:44-08:00 +Date: 2024-12-11T10:22:43-08:00 Author: David Glick (davisagli) -Commit: https://github.com/plone/plone.volto/commit/0d9fe86c62dcdc9f557d14e6a15b79e1d5035d47 +Commit: https://github.com/plone/plone.volto/commit/29b2cea2579482f8e7730b981876b6fce6796f97 changelog Files changed: -A news/167.internal +A news/168.bugfix -b'diff --git a/news/167.internal b/news/167.internal\nnew file mode 100644\nindex 0000000..f842954\n--- /dev/null\n+++ b/news/167.internal\n@@ -0,0 +1 @@\n+Remove unused ZCML conditions. @davisagli\n' +b'diff --git a/news/168.bugfix b/news/168.bugfix\nnew file mode 100644\nindex 0000000..6d76592\n--- /dev/null\n+++ b/news/168.bugfix\n@@ -0,0 +1 @@\n+Fix plone.app.multilingual dependency to be a dependency for tests only. @davisagli\n' Repository: plone.volto Branch: refs/heads/main -Date: 2024-12-11T10:53:43-08:00 +Date: 2024-12-11T10:24:45-08:00 Author: David Glick (davisagli) -Commit: https://github.com/plone/plone.volto/commit/32d4a5740fd0821a65973a3a332d092e4211f144 +Commit: https://github.com/plone/plone.volto/commit/af295193ef1c88367938b84b59839ec88e0fe30b -Merge pull request #167 from plone/cleanup-zcml-conditions +fix dependency checker + +Files changed: +M .meta.toml +M pyproject.toml + +b'diff --git a/.meta.toml b/.meta.toml\nindex a54195b..dce91ce 100644\n--- a/.meta.toml\n+++ b/.meta.toml\n@@ -13,7 +13,7 @@ extra_lines = """\n [pyproject]\n codespell_skip = "*.min.js,*lock.yaml"\n codespell_ignores = "vew"\n-dependencies_ignores = "[\'collective.folderishtypes\', \'plone.app.caching\', \'requests\', \'responses\', \'zest.releaser\', \'zestreleaser.towncrier\']"\n+dependencies_ignores = "[\'collective.folderishtypes\', \'plone.app.caching\', \'plone.app.multilingual\', \'requests\', \'responses\', \'zest.releaser\', \'zestreleaser.towncrier\']"\n dependencies_mappings = [\n "\'Products.CMFPlone\' = [\'Acquisition\', \'BTrees\', \'Missing\', \'OFS\', \'plone.app.contenttypes\', \'plone.app.layout\', \'plone.app.linkintegrity\', \'plone.app.redirector\', \'plone.app.registry\', \'plone.app.textfield\', \'plone.app.vocabularies\', \'plone.app.z3cform\', \'plone.autoform\', \'plone.base\', \'plone.behavior\', \'plone.dexterity\', \'plone.indexer\', \'plone.namedfile\', \'plone.protect\', \'plone.registry\', \'plone.rfc822\', \'plone.schema\', \'plone.supermodel\', \'Products.BTreeFolder2\', \'Products.CMFCore\', \'Products.Five\', \'Products.GenericSetup\', \'Products.SiteErrorLog\', \'transaction\', \'z3c.form\', \'z3c.relationfield\', \'zope.component\', \'zope.i18n\', \'zope.i18nmessageid\', \'zope.interface\', \'zope.lifecycleevent\', \'zope.publisher\', \'zope.schema\', \'Zope\']",\n "\'plone.restapi\' = [\'plone.rest\']",\ndiff --git a/pyproject.toml b/pyproject.toml\nindex 69fdae5..876dadc 100644\n--- a/pyproject.toml\n+++ b/pyproject.toml\n@@ -124,7 +124,7 @@ python-dateutil = [\'dateutil\']\n pytest-plone = [\'pytest\', \'zope.pytestlayer\', \'plone.testing\', \'plone.app.testing\']\n \'Products.CMFPlone\' = [\'Acquisition\', \'BTrees\', \'Missing\', \'OFS\', \'plone.app.contenttypes\', \'plone.app.layout\', \'plone.app.linkintegrity\', \'plone.app.redirector\', \'plone.app.registry\', \'plone.app.textfield\', \'plone.app.vocabularies\', \'plone.app.z3cform\', \'plone.autoform\', \'plone.base\', \'plone.behavior\', \'plone.dexterity\', \'plone.indexer\', \'plone.namedfile\', \'plone.protect\', \'plone.registry\', \'plone.rfc822\', \'plone.schema\', \'plone.supermodel\', \'Products.BTreeFolder2\', \'Products.CMFCore\', \'Products.Five\', \'Products.GenericSetup\', \'Products.SiteErrorLog\', \'transaction\', \'z3c.form\', \'z3c.relationfield\', \'zope.component\', \'zope.i18n\', \'zope.i18nmessageid\', \'zope.interface\', \'zope.lifecycleevent\', \'zope.publisher\', \'zope.schema\', \'Zope\']\n \'plone.restapi\' = [\'plone.rest\']\n-ignore-packages = [\'collective.folderishtypes\', \'plone.app.caching\', \'requests\', \'responses\', \'scripts.utils\', \'zest.releaser\', \'zestreleaser.towncrier\']\n+ignore-packages = [\'collective.folderishtypes\', \'plone.app.caching\', \'plone.app.multilingual\', \'requests\', \'responses\', \'scripts.utils\', \'zest.releaser\', \'zestreleaser.towncrier\']\n \n ##\n # Add extra configuration options in .meta.toml:\n' + +Repository: plone.volto -Remove unnecessary zcml conditions + +Branch: refs/heads/main +Date: 2024-12-11T11:28:59-08:00 +Author: David Glick (davisagli) +Commit: https://github.com/plone/plone.volto/commit/92a7a262590c86def9ff8f8946b34e412089ab80 + +Merge pull request #168 from plone/fix-multilingual-dependency + +plone.app.multilingual is not a hard dependency Files changed: -A news/167.internal -M src/plone/volto/behaviors/configure.zcml -M src/plone/volto/browser/configure.zcml -M src/plone/volto/configure.zcml -M src/plone/volto/dependencies.zcml -M src/plone/volto/overrides.zcml -M src/plone/volto/patches.zcml - -b'diff --git a/news/167.internal b/news/167.internal\nnew file mode 100644\nindex 0000000..f842954\n--- /dev/null\n+++ b/news/167.internal\n@@ -0,0 +1 @@\n+Remove unused ZCML conditions. @davisagli\ndiff --git a/src/plone/volto/behaviors/configure.zcml b/src/plone/volto/behaviors/configure.zcml\nindex 4e46f6a..fdb4df6 100644\n--- a/src/plone/volto/behaviors/configure.zcml\n+++ b/src/plone/volto/behaviors/configure.zcml\n@@ -1,7 +1,6 @@\n \n \n@@ -17,15 +16,13 @@\n provides=".preview.IPreview"\n />\n \n- \n- \n- \n- \n+ \n+ \n \n \n \n \n \n \n@@ -39,7 +37,6 @@\n class=".migrate_richtext.MigrateRichTextToVoltoBlocks"\n template="migrate_richtext.pt"\n permission="cmf.ManagePortal"\n- zcml:condition="have plone-60"\n />\n \n \n \n \n@@ -59,7 +55,6 @@\n template="voltobackendwarning.pt"\n permission="zope2.View"\n layer="plone.volto.interfaces.IPloneVoltoCoreLayer"\n- zcml:condition="have plone-60"\n />\n \n \ndiff --git a/src/plone/volto/configure.zcml b/src/plone/volto/configure.zcml\nindex 73392f4..f2875b3 100644\n--- a/src/plone/volto/configure.zcml\n+++ b/src/plone/volto/configure.zcml\n@@ -5,7 +5,6 @@\n xmlns:i18n="http://namespaces.zope.org/i18n"\n xmlns:monkey="http://namespaces.plone.org/monkey"\n xmlns:plone="http://namespaces.plone.org/plone"\n- xmlns:zcml="http://namespaces.zope.org/zcml"\n i18n_domain="plone.volto"\n >\n \ndiff --git a/src/plone/volto/dependencies.zcml b/src/plone/volto/dependencies.zcml\nindex 3b4fc84..fce6a2b 100644\n--- a/src/plone/volto/dependencies.zcml\n+++ b/src/plone/volto/dependencies.zcml\n@@ -1,7 +1,4 @@\n-\n+\n \n \n+\n \n \n \n@@ -20,7 +19,6 @@\n class="Products.CMFPlone.browser.login.password_reset.PasswordResetToolView"\n docstringWarning="True"\n description="Patch password reset tool construct URL to cater for different frontend domain"\n- zcml:condition="have plone-52"\n />\n \n \n' +A news/168.bugfix +M .meta.toml +M pyproject.toml +M setup.py + +b'diff --git a/.meta.toml b/.meta.toml\nindex a54195b..dce91ce 100644\n--- a/.meta.toml\n+++ b/.meta.toml\n@@ -13,7 +13,7 @@ extra_lines = """\n [pyproject]\n codespell_skip = "*.min.js,*lock.yaml"\n codespell_ignores = "vew"\n-dependencies_ignores = "[\'collective.folderishtypes\', \'plone.app.caching\', \'requests\', \'responses\', \'zest.releaser\', \'zestreleaser.towncrier\']"\n+dependencies_ignores = "[\'collective.folderishtypes\', \'plone.app.caching\', \'plone.app.multilingual\', \'requests\', \'responses\', \'zest.releaser\', \'zestreleaser.towncrier\']"\n dependencies_mappings = [\n "\'Products.CMFPlone\' = [\'Acquisition\', \'BTrees\', \'Missing\', \'OFS\', \'plone.app.contenttypes\', \'plone.app.layout\', \'plone.app.linkintegrity\', \'plone.app.redirector\', \'plone.app.registry\', \'plone.app.textfield\', \'plone.app.vocabularies\', \'plone.app.z3cform\', \'plone.autoform\', \'plone.base\', \'plone.behavior\', \'plone.dexterity\', \'plone.indexer\', \'plone.namedfile\', \'plone.protect\', \'plone.registry\', \'plone.rfc822\', \'plone.schema\', \'plone.supermodel\', \'Products.BTreeFolder2\', \'Products.CMFCore\', \'Products.Five\', \'Products.GenericSetup\', \'Products.SiteErrorLog\', \'transaction\', \'z3c.form\', \'z3c.relationfield\', \'zope.component\', \'zope.i18n\', \'zope.i18nmessageid\', \'zope.interface\', \'zope.lifecycleevent\', \'zope.publisher\', \'zope.schema\', \'Zope\']",\n "\'plone.restapi\' = [\'plone.rest\']",\ndiff --git a/news/168.bugfix b/news/168.bugfix\nnew file mode 100644\nindex 0000000..6d76592\n--- /dev/null\n+++ b/news/168.bugfix\n@@ -0,0 +1 @@\n+Fix plone.app.multilingual dependency to be a dependency for tests only. @davisagli\ndiff --git a/pyproject.toml b/pyproject.toml\nindex 69fdae5..876dadc 100644\n--- a/pyproject.toml\n+++ b/pyproject.toml\n@@ -124,7 +124,7 @@ python-dateutil = [\'dateutil\']\n pytest-plone = [\'pytest\', \'zope.pytestlayer\', \'plone.testing\', \'plone.app.testing\']\n \'Products.CMFPlone\' = [\'Acquisition\', \'BTrees\', \'Missing\', \'OFS\', \'plone.app.contenttypes\', \'plone.app.layout\', \'plone.app.linkintegrity\', \'plone.app.redirector\', \'plone.app.registry\', \'plone.app.textfield\', \'plone.app.vocabularies\', \'plone.app.z3cform\', \'plone.autoform\', \'plone.base\', \'plone.behavior\', \'plone.dexterity\', \'plone.indexer\', \'plone.namedfile\', \'plone.protect\', \'plone.registry\', \'plone.rfc822\', \'plone.schema\', \'plone.supermodel\', \'Products.BTreeFolder2\', \'Products.CMFCore\', \'Products.Five\', \'Products.GenericSetup\', \'Products.SiteErrorLog\', \'transaction\', \'z3c.form\', \'z3c.relationfield\', \'zope.component\', \'zope.i18n\', \'zope.i18nmessageid\', \'zope.interface\', \'zope.lifecycleevent\', \'zope.publisher\', \'zope.schema\', \'Zope\']\n \'plone.restapi\' = [\'plone.rest\']\n-ignore-packages = [\'collective.folderishtypes\', \'plone.app.caching\', \'requests\', \'responses\', \'scripts.utils\', \'zest.releaser\', \'zestreleaser.towncrier\']\n+ignore-packages = [\'collective.folderishtypes\', \'plone.app.caching\', \'plone.app.multilingual\', \'requests\', \'responses\', \'scripts.utils\', \'zest.releaser\', \'zestreleaser.towncrier\']\n \n ##\n # Add extra configuration options in .meta.toml:\ndiff --git a/setup.py b/setup.py\nindex 8264775..d6a548d 100644\n--- a/setup.py\n+++ b/setup.py\n@@ -44,7 +44,6 @@\n "collective.monkeypatcher",\n "plone.api",\n "plone.app.caching",\n- "plone.app.multilingual",\n "plone.distribution",\n "plone.restapi>=8.41.0",\n "Products.CMFPlone",\n@@ -55,6 +54,7 @@\n "responses",\n "plone.app.discussion",\n "plone.app.iterate",\n+ "plone.app.multilingual",\n "plone.app.robotframework",\n "plone.app.testing",\n "plone.app.upgrade",\n'