diff --git a/last_commit.txt b/last_commit.txt index cbc82d2947..2ba97d2f9d 100644 --- a/last_commit.txt +++ b/last_commit.txt @@ -1,24 +1,36 @@ -Repository: plone.restapi +Repository: plone.testing -Branch: refs/heads/main -Date: 2023-11-26T17:17:43-08:00 -Author: Víctor Fernández de Alba (sneridagh) -Commit: https://github.com/plone/plone.restapi/commit/d5b83a67b5a894b7985c67e6c2ae0c9eb1034fd6 +Branch: refs/heads/master +Date: 2023-11-26T16:23:56-08:00 +Author: David Glick (davisagli) +Commit: https://github.com/plone/plone.testing/commit/9527530a46211dc6a5777e8805a373f13125a61a -Remove wrong `preview_image_link` addition from blocks (de)serializers (#1737) +Remove hard dependency on five.localsitemanager -* Remove wrong `preview_image_link` addition from blocks (de)serializers - -* Changelog - -* Remove last one +Files changed: +A news/86.bugfix +M pyproject.toml +M setup.py + +b'diff --git a/news/86.bugfix b/news/86.bugfix\nnew file mode 100644\nindex 0000000..0a66616\n--- /dev/null\n+++ b/news/86.bugfix\n@@ -0,0 +1 @@\n+Remove incorrect hard dependency on five.localsitemanager. @davisagli\ndiff --git a/pyproject.toml b/pyproject.toml\nindex e0decf5..4b01704 100644\n--- a/pyproject.toml\n+++ b/pyproject.toml\n@@ -116,7 +116,7 @@ Zope = [\n \'Products.CMFCore\', \'Products.CMFDynamicViewFTI\',\n ]\n python-dateutil = [\'dateutil\']\n-ignore-packages = [\'ZServer\', \'StringIO\', \'urllib2\']\n+ignore-packages = [\'ZServer\', \'StringIO\', \'five.localsitemanager\', \'urllib2\']\n \n ##\n # Add extra configuration options in .meta.toml:\ndiff --git a/setup.py b/setup.py\nindex 4346cc9..3fa4fb4 100644\n--- a/setup.py\n+++ b/setup.py\n@@ -10,7 +10,6 @@\n install_requires = [\n "setuptools",\n "zope.testing >= 3.8",\n- "five.localsitemanager",\n ]\n \n tests_require = [\n' + +Repository: plone.testing + + +Branch: refs/heads/master +Date: 2023-11-27T22:57:39-08:00 +Author: David Glick (davisagli) +Commit: https://github.com/plone/plone.testing/commit/a462152e7709efc4363f72eaf086fd1607657eeb + +Merge pull request #87 from plone/fix-lsm-dep + +Remove hard dependency on five.localsitemanager Files changed: -A news/1737.bugfix -M src/plone/restapi/blocks_linkintegrity.py -M src/plone/restapi/deserializer/blocks.py -M src/plone/restapi/serializer/blocks.py +A news/86.bugfix +M pyproject.toml +M setup.py -b'diff --git a/news/1737.bugfix b/news/1737.bugfix\nnew file mode 100644\nindex 0000000000..a4953486ab\n--- /dev/null\n+++ b/news/1737.bugfix\n@@ -0,0 +1,2 @@\n+Remove wrong `preview_image_link` addition from blocks (de)serializers\n+[sneridagh]\ndiff --git a/src/plone/restapi/blocks_linkintegrity.py b/src/plone/restapi/blocks_linkintegrity.py\nindex 5a907baa67..754f5c256b 100644\n--- a/src/plone/restapi/blocks_linkintegrity.py\n+++ b/src/plone/restapi/blocks_linkintegrity.py\n@@ -110,7 +110,7 @@ def __call__(self, block):\n Returns a list of internal links\n """\n links = []\n- for field in ["url", "href", "preview_image", "preview_image_link"]:\n+ for field in ["url", "href", "preview_image"]:\n value = block.get(field, "")\n for url in get_urls_from_value(value):\n links.append(url)\ndiff --git a/src/plone/restapi/deserializer/blocks.py b/src/plone/restapi/deserializer/blocks.py\nindex 655805903f..59e26a807c 100644\n--- a/src/plone/restapi/deserializer/blocks.py\n+++ b/src/plone/restapi/deserializer/blocks.py\n@@ -55,7 +55,7 @@ class ResolveUIDDeserializerBase:\n \n order = 1\n block_type = None\n- fields = ["url", "href", "preview_image", "preview_image_link"]\n+ fields = ["url", "href", "preview_image"]\n disabled = os.environ.get("disable_transform_resolveuid", False)\n \n def __init__(self, context, request):\ndiff --git a/src/plone/restapi/serializer/blocks.py b/src/plone/restapi/serializer/blocks.py\nindex 76669b7092..e255ff7449 100644\n--- a/src/plone/restapi/serializer/blocks.py\n+++ b/src/plone/restapi/serializer/blocks.py\n@@ -40,7 +40,7 @@ def __call__(self):\n class ResolveUIDSerializerBase:\n order = 1\n block_type = None\n- fields = ["url", "href", "preview_image", "preview_image_link"]\n+ fields = ["url", "href", "preview_image"]\n disabled = os.environ.get("disable_transform_resolveuid", False)\n \n def __init__(self, context, request):\n' +b'diff --git a/news/86.bugfix b/news/86.bugfix\nnew file mode 100644\nindex 0000000..0a66616\n--- /dev/null\n+++ b/news/86.bugfix\n@@ -0,0 +1 @@\n+Remove incorrect hard dependency on five.localsitemanager. @davisagli\ndiff --git a/pyproject.toml b/pyproject.toml\nindex e0decf5..4b01704 100644\n--- a/pyproject.toml\n+++ b/pyproject.toml\n@@ -116,7 +116,7 @@ Zope = [\n \'Products.CMFCore\', \'Products.CMFDynamicViewFTI\',\n ]\n python-dateutil = [\'dateutil\']\n-ignore-packages = [\'ZServer\', \'StringIO\', \'urllib2\']\n+ignore-packages = [\'ZServer\', \'StringIO\', \'five.localsitemanager\', \'urllib2\']\n \n ##\n # Add extra configuration options in .meta.toml:\ndiff --git a/setup.py b/setup.py\nindex 4346cc9..3fa4fb4 100644\n--- a/setup.py\n+++ b/setup.py\n@@ -10,7 +10,6 @@\n install_requires = [\n "setuptools",\n "zope.testing >= 3.8",\n- "five.localsitemanager",\n ]\n \n tests_require = [\n'