diff --git a/last_commit.txt b/last_commit.txt index 3229e69025..6ec8b0a385 100644 --- a/last_commit.txt +++ b/last_commit.txt @@ -1,17 +1,20 @@ -Repository: plone.behavior +Repository: plone.app.discussion -Branch: refs/heads/master -Date: 2025-01-09T15:08:21+01:00 -Author: Gil Forcada Codinachs (gforcada) -Commit: https://github.com/plone/plone.behavior/commit/76e9772823dbed8a5901b43ad509a1fd112bcde5 +Branch: refs/heads/main +Date: 2025-01-14T08:27:46+01:00 +Author: ale-rt (ale-rt) +Commit: https://github.com/plone/plone.app.discussion/commit/977d3ce3b1b6ee6cd488efa4b74b659dc40d5e5e -fix(ci): master branch is gone +Do not depend on plone.api -In plone/meta repository +Refs. #188 +Similar to #194 Files changed: -M .github/workflows/meta.yml +A news/188.bugfix.rst +M plone/app/discussion/upgrades.py +M setup.py -b'diff --git a/.github/workflows/meta.yml b/.github/workflows/meta.yml\nindex 4748f0f..a7f25e0 100644\n--- a/.github/workflows/meta.yml\n+++ b/.github/workflows/meta.yml\n@@ -15,14 +15,14 @@ on:\n \n jobs:\n qa:\n- uses: plone/meta/.github/workflows/qa.yml@master\n+ uses: plone/meta/.github/workflows/qa.yml@main\n test:\n- uses: plone/meta/.github/workflows/test.yml@master\n+ uses: plone/meta/.github/workflows/test.yml@main\n coverage:\n- uses: plone/meta/.github/workflows/coverage.yml@master\n+ uses: plone/meta/.github/workflows/coverage.yml@main\n dependencies:\n- uses: plone/meta/.github/workflows/dependencies.yml@master\n+ uses: plone/meta/.github/workflows/dependencies.yml@main\n release-ready:\n- uses: plone/meta/.github/workflows/release_ready.yml@master\n+ uses: plone/meta/.github/workflows/release_ready.yml@main\n circular:\n- uses: plone/meta/.github/workflows/circular.yml@master\n+ uses: plone/meta/.github/workflows/circular.yml@main\n' +b'diff --git a/news/188.bugfix.rst b/news/188.bugfix.rst\nnew file mode 100644\nindex 00000000..30f44736\n--- /dev/null\n+++ b/news/188.bugfix.rst\n@@ -0,0 +1 @@\n+Do not depend on ``plone.api``. [ale-rt]\ndiff --git a/plone/app/discussion/upgrades.py b/plone/app/discussion/upgrades.py\nindex b63a666b..cab45926 100644\n--- a/plone/app/discussion/upgrades.py\n+++ b/plone/app/discussion/upgrades.py\n@@ -1,7 +1,6 @@\n from .interfaces import IDiscussionSettings\n from .setuphandlers import add_discussion_behavior_to_default_types\n from datetime import timezone\n-from plone import api\n from plone.registry.interfaces import IRegistry\n from Products.CMFCore.utils import getToolByName\n from Products.ZCatalog.ProgressHandler import ZLogHandler\n@@ -92,7 +91,7 @@ def extend_review_workflow(context):\n \n def set_timezone_on_dates(context):\n """Ensure timezone data is stored against all creation/modified dates"""\n- pc = api.portal.get_tool("portal_catalog")\n+ pc = getToolByName(context, "portal_catalog")\n creations = 0\n modifieds = 0\n logger.info("Setting timezone information on comment dates")\ndiff --git a/setup.py b/setup.py\nindex f4c4869d..558c1c69 100644\n--- a/setup.py\n+++ b/setup.py\n@@ -44,7 +44,6 @@\n "Products.GenericSetup",\n "Products.ZCatalog",\n "Products.statusmessages",\n- "plone.api",\n "plone.app.event",\n "plone.registry",\n "plone.resource",\n'