Update plone.restapi to 9.6.0 (#94)

* Update plone.restapi to 9.6.0

* Use the newer plone.restapi version for ci buildout

* Versions release

* buildout

* buildout

* Remove monkeypatch 💀

* Formatting

* Isort

* Update changelog

CHANGES.rst

@@ -4,8 +4,8 @@ Changelog
 5.4.5 (unreleased)
 ------------------
 
-- Nothing changed yet.
-
+- Update plone.restapi requirement to 9.6.0 version.
+  [folix-01]
 
 5.4.4 (2024-02-20)
 ------------------

setup.py

@@ -59,7 +59,7 @@
         "collective.purgebyid",
         "kitconcept.seo>=2.0.0",
         "plone.volto>=4.0.0",
-        "plone.restapi>=8.36.0",
+        "plone.restapi>=9.6.0",
         "Products.PortalTransforms>=3.2.0",
     ],
     extras_require={

src/redturtle/volto/__init__.py

@@ -2,15 +2,13 @@
 """Init and utils."""
 from plone.app.content.browser.vocabulary import PERMISSIONS
 from plone.folder.nogopip import GopipIndex
-from plone.restapi.serializer import utils
 from Products.ZCatalog.Catalog import Catalog
 from redturtle.volto.catalogplan import Catalog_sorted_search_indexes
 from zope.i18nmessageid import MessageFactory
 from ZTUtils.Lazy import LazyCat
 from ZTUtils.Lazy import LazyMap
 
 import logging
-import re
 
 
 logger = logging.getLogger(__name__)
@@ -77,6 +75,3 @@ def Catalog_sortResults(
 logger.info("install monkey patch for Products.ZCatalog.Catalog.Catalog.sortResults")
 Catalog._orig_sortResults = Catalog.sortResults
 Catalog.sortResults = Catalog_sortResults
-
-# patch plone.restapi regexp to catch also other
-utils.RESOLVEUID_RE = re.compile("^(?:|.*/)resolve[Uu]id/([^/]*)/?(.*)$")

test_plone52.cfg

@@ -14,7 +14,7 @@ plone.app.versioningbehavior = 1.4.6
 plone.app.vocabularies = 4.3.0
 plone.patternslib = 1.1.1
 plone.rest = 2.0.0
-plone.restapi = 8.42.0
+plone.restapi = >=9.6.0
 plone.volto = 4.0.0
 pycountry = 19.8.18
 collective.purgebyid = 1.1.1
@@ -31,11 +31,3 @@ pyflakes = 2.3.1
 createcoverage = 1.5
 mccabe = 0.6.1
 plone.recipe.codeanalysis = 3.0.1
-
-
-# Added by buildout at 2023-03-11 19:27:39.625210
-kitconcept.seo = 2.0.1
-
-# Required by:
-# redturtle.volto==4.1.4.dev0
-collective.volto.cookieconsent = 1.1.1

test_plone60.cfg

@@ -5,8 +5,6 @@ extends =
     https://raw.githubusercontent.com/collective/buildout.plonetest/master/qa.cfg
     base.cfg
 
-update-versions-file = test_plone60.cfg
-
 [versions]
 
 # Added by buildout at 2023-03-10 11:55:21.122842
@@ -19,57 +17,4 @@ plone.recipe.codeanalysis = 3.0.1
 pycodestyle = 2.10.0
 pyflakes = 3.0.1
 plone.stringinterp = 2.0.0
-
-# Added by buildout at 2023-03-11 19:16:55.437411
-bleach = 6.0.0
-build = 0.1.0
-coverage = 7.2.1
-i18ndude = 5.5.0
-keyring = 23.13.1
-kitconcept.seo = 2.0.1
-markdown-it-py = 2.2.0
-mdurl = 0.1.2
-pep517 = 0.9.1
-pkginfo = 1.9.6
-readme-renderer = 37.3
-requests-toolbelt = 0.10.1
-rfc3986 = 2.0.0
-rich = 13.3.2
-twine = 4.0.2
-zest.releaser = 7.3.0
-
-# Required by:
-# plone.recipe.codeanalysis==3.0.1
-check-manifest = 0.49
-
-# Required by:
-# redturtle.volto==4.1.4.dev0
-collective.purgebyid = 1.2.1
-
-# Required by:
-# redturtle.volto==4.1.4.dev0
-collective.volto.cookieconsent = 1.1.1
-
-# Required by:
-# zest.releaser==7.3.0
-colorama = 0.4.6
-
-# Required by:
-# keyring==23.13.1
-jaraco.classes = 3.2.3
-
-# Required by:
-# jaraco.classes==3.2.3
-more-itertools = 9.1.0
-
-# Required by:
-# check-manifest==0.49
-tomli = 2.0.1
-
-# Required by:
-# bleach==6.0.0
-webencodings = 0.5.1
-
-# Required by:
-# kitconcept.seo==2.0.1
-z3c.jbot = 1.1.1
+plone.restapi = >=9.6.0