Fix DeprecationWarnings.

.github/workflows/tests.yml

@@ -6,39 +6,24 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        python-version: ["3.12", "3.11", "3.10", "3.9", "3.8"]
-        plone-version: ["6.0", "5.2"]
+        python-version: ["3.13", "3.12", "3.11", "3.10", "3.9"]
+        plone-version: ["6.1", "6.0"]
         exclude:
-          - python-version: 3.12
-            plone-version: 5.2
-          - python-version: 3.11
-            plone-version: 5.2
-          - python-version: 3.10
-            plone-version: 5.2
           - python-version: 3.9
-            plone-version: 5.2
+            plone-version: 6.1
     steps:
       # git checkout
       - uses: actions/checkout@v2
 
       # python setup
       - name: Set up Python ${{ matrix.python-version }}
-        uses: actions/setup-python@v4
+        uses: actions/setup-python@v5
         with:
           python-version: ${{ matrix.python-version }}
           cache: "pip"
-
-      # python cache
-      - uses: actions/cache@v1
-        with:
-          path: ~/.cache/pip
-          key: ${{ runner.os }}-pip-${{ hashFiles('**/requirements.txt') }}
-          restore-keys: |
-            ${{ runner.os }}-pip-
+          cache-dependency-path: "**/requirements.txt"
 
       # python install
-      - run: pip install virtualenv
-      - run: pip install wheel
       - name: pip install
         run: pip install -r requirements-${{ matrix.plone-version }}.txt
 

.meta.toml

@@ -14,4 +14,4 @@ jobs = [
     ]
 
 [pyproject]
-dependencies_ignores = "['plone.app.redirector']"
+dependencies_ignores = "['plone.app.layout', 'plone.app.redirector', 'plone.base', 'Products.CMFPlone']"

.pre-commit-config.yaml

@@ -66,7 +66,7 @@ repos:
     hooks:
     -   id: pyroma
 -   repo: https://github.com/mgedmin/check-python-versions
-    rev: "0.22.0"
+    rev: "0.22.1"
     hooks:
     -   id: check-python-versions
         args: ['--only', 'setup.py,pyproject.toml']

Makefile

@@ -32,29 +32,6 @@ bin/buildout: bin/pip
 bin/python bin/pip:
 	python$(version) -m venv . || virtualenv --python=python$(version) .
 
-py2:
-	virtualenv --python=python2 .
-	bin/pip install --upgrade pip
-	bin/pip install -r requirements.txt
-
-.PHONY: Build Plone 5.2 with Python 2
-build-plone-5.2-py: py2  ## Build Plone 5.2 with Python 2
-	bin/pip install --upgrade pip
-	bin/pip install -r requirements.txt
-	bin/buildout -c plone-5.2.x.cfg
-
-.PHONY: Build Plone 5.2
-build-plone-5.2: .installed.cfg  ## Build Plone 5.2
-	bin/pip install --upgrade pip
-	bin/pip install -r requirements.txt
-	bin/buildout -c plone-5.2.x.cfg
-
-.PHONY: Build Plone 5.2 Performance
-build-plone-5.2-performance: .installed.cfg  ## Build Plone 5.2
-	bin/pip install --upgrade pip
-	bin/pip install -r requirements.txt
-	bin/buildout -c plone-5.2.x-performance.cfg
-
 build-plone-6.0:  ## Build Plone 6.0
 	python$(version) -m venv .
 	bin/pip install --upgrade pip

README.rst

@@ -180,7 +180,7 @@ Named services can be registered by providing a 'name' attribute in the service
   <plone:service
     method="GET"
     accept="application/json"
-    for="Products.CMFPlone.interfaces.IPloneSiteRoot"
+    for="plone.base.interfaces.IPloneSiteRoot"
     factory=".service.Search"
     name="search"
     permission="zope2.View"
@@ -256,7 +256,7 @@ defines a policy for the site root.
 .. code-block:: XML
 
   <plone:CORSPolicy
-    for="Products.CMFPlone.interfaces.IPloneSiteRoot"
+    for="plone.base.interfaces.IPloneSiteRoot"
     layer="myproduct.interfaces.IMyBrowserLayer"
     allow_origin="*"
     allow_methods="GET"
@@ -315,6 +315,8 @@ and then running "bin/buildout"
 Plone/Python Support
 --------------------
 
+plone.rest 5.x.x supports Plone 6.x on Python 3.9 and newer.
+
 plone.rest 4.x.x supports Plone 5.2 and 6.x on Python 3.8 and newer.
 
 plone.rest 3.x.x supports Plone 5.2 on Python 2.7 and 3.6 to 3.8 and Plone 6.0 on Python 3.8 to 3.11.

news/178.internal

@@ -1 +1 @@
-Update Plone to 6.0.9 and 5.2.14 in buildout. Also removes buildout of unsupported Plone versions. @wesleybl
+Update Plone to 6.0.14 and 6.1.0b2 for testing. Also removes buildout of unsupported Plone versions. @wesleybl, @davisagli

news/4090.breaking

@@ -0,0 +1 @@
+Drop support for Plone 5.2 and Python 3.8. @davisagli

news/4090.bugfix

@@ -0,0 +1 @@
+Fix DeprecationWarnings. [maurits]

plone-6.0.x.cfg

@@ -1,4 +1,4 @@
 [buildout]
 extends =
-    https://dist.plone.org/release/6.0.9/versions.cfg
+    https://dist.plone.org/release/6.0.14/versions.cfg
     base.cfg

plone-6.1.x.cfg

@@ -0,0 +1,4 @@
+[buildout]
+extends =
+    https://dist.plone.org/release/6.1.0b2/versions.cfg
+    base.cfg

pyproject.toml

@@ -116,7 +116,7 @@ Zope = [
   'Products.CMFCore', 'Products.CMFDynamicViewFTI',
 ]
 python-dateutil = ['dateutil']
-ignore-packages = ['plone.app.redirector']
+ignore-packages = ['plone.app.layout', 'plone.app.redirector', 'plone.base', 'Products.CMFPlone']
 
 ##
 # Add extra configuration options in .meta.toml:

requirements-6.0.txt

@@ -1 +1 @@
--r https://dist.plone.org/release/6.0.9/requirements.txt
+-r https://dist.plone.org/release/6.0.14/requirements.txt

requirements-6.1.txt

@@ -0,0 +1 @@
+-r https://dist.plone.org/release/6.1.0b2/requirements.txt

requirements.txt

@@ -1 +1 @@
--r requirements-6.0.txt
+-r requirements-6.1.txt

setup.py

@@ -8,7 +8,7 @@ def read(*rnames):
     return open(os.path.join(os.path.dirname(__file__), *rnames)).read()
 
 
-version = "4.1.4.dev0"
+version = "5.0.0.dev0"
 
 long_description = read("README.rst") + "\n\n" + read("CHANGES.rst") + "\n\n"
 
@@ -24,11 +24,11 @@ def read(*rnames):
         "Development Status :: 5 - Production/Stable",
         "Environment :: Web Environment",
         "Framework :: Plone",
-        "Framework :: Plone :: 5.2",
         "Framework :: Plone :: 6.0",
+        "Framework :: Plone :: 6.1",
         "Framework :: Plone :: Core",
         "Framework :: Zope2",
-        "Framework :: Zope :: 4",
+        "Framework :: Zope :: 5",
         "License :: OSI Approved :: GNU General Public License (GPL)",
         "Operating System :: OS Independent",
         "Programming Language :: Python",
@@ -37,6 +37,7 @@ def read(*rnames):
         "Programming Language :: Python :: 3.10",
         "Programming Language :: Python :: 3.11",
         "Programming Language :: Python :: 3.12",
+        "Programming Language :: Python :: 3.13",
         "Programming Language :: Python :: 3 :: Only",
         "Topic :: Software Development :: Libraries :: Python Modules",
     ],
@@ -57,14 +58,12 @@ def read(*rnames):
             "requests",
             "BTrees",
             "plone.app.contenttypes[test]",
-            "plone.app.layout",
             "plone.app.redirector",
             "plone.app.textfield",
             "plone.namedfile",
             "plone.testing",
             "z3c.relationfield",
             "zope.intid",
-            "plone.base",
         ]
     ),
     install_requires=[

src/plone/rest/patches.py

@@ -12,30 +12,3 @@ def __before_publishing_traverse__(self, arg1, arg2=None):
         return
 
     return self._old___before_publishing_traverse__(arg1, arg2)
-
-
-PERMANENT_REDIRECT = {308: "Permanent Redirect"}
-
-
-def patch_zpublisher_status_codes(scope, unused_original, unused_replacement):
-    """Add '308 Permanent Redirect' to the list of status codes the ZPublisher
-    knows about. Otherwise setStatus() will turn it into a 500.
-
-    This is needed for up to and including Plone 5.1.
-    """
-    status_reasons = getattr(scope, "status_reasons", {})
-    if 308 in status_reasons:
-        # Already present in zExceptions >= 3.2 / Zope >= 4.0a1 / Plone 5.2
-        return
-
-    # Patch the forward mapping (code -> reason)
-    status_reasons.update(PERMANENT_REDIRECT)
-
-    # Update the reverse mapping
-    status_codes = getattr(scope, "status_codes", {})
-    key, val = PERMANENT_REDIRECT.items()[0]
-
-    status_codes["".join(val.split(" ")).lower()] = key
-    status_codes[val.lower()] = key
-    status_codes[key] = key
-    status_codes[str(key)] = key

src/plone/rest/patches.zcml

@@ -14,14 +14,4 @@
       preserveOriginal="true"
       />
 
-  <monkey:patch
-      original="status_codes"
-      replacement=".patches.PERMANENT_REDIRECT"
-      module="ZPublisher.HTTPResponse"
-      handler=".patches.patch_zpublisher_status_codes"
-      description="Teach ZPublisher about status 308"
-      ignoreOriginal="True"
-      preconditions="Zope2-=4.0a1"
-      />
-
 </configure>

src/plone/rest/testing.py

@@ -3,7 +3,7 @@
 from plone.app.testing import IntegrationTesting
 from plone.app.testing import PloneSandboxLayer
 from plone.rest.service import Service
-from plone.testing import z2
+from plone.testing import zope
 from zope.configuration import xmlconfig
 
 
@@ -22,7 +22,8 @@ def setUpZope(self, app, configurationContext):
     bases=(PLONE_REST_FIXTURE,), name="PloneRestLayer:Integration"
 )
 PLONE_REST_FUNCTIONAL_TESTING = FunctionalTesting(
-    bases=(PLONE_REST_FIXTURE, z2.ZSERVER_FIXTURE), name="PloneRestLayer:Functional"
+    bases=(PLONE_REST_FIXTURE, zope.WSGI_SERVER_FIXTURE),
+    name="PloneRestLayer:Functional",
 )
 
 

src/plone/rest/testing.zcml

@@ -54,42 +54,42 @@
   <plone:service
       method="GET"
       factory=".demo.Get"
-      for="Products.CMFPlone.interfaces.IPloneSiteRoot"
+      for="plone.base.interfaces.IPloneSiteRoot"
       permission="zope2.View"
       />
 
   <plone:service
       method="POST"
       factory=".demo.Post"
-      for="Products.CMFPlone.interfaces.IPloneSiteRoot"
+      for="plone.base.interfaces.IPloneSiteRoot"
       permission="cmf.AddPortalContent"
       />
 
   <plone:service
       method="PUT"
       factory=".demo.Put"
-      for="Products.CMFPlone.interfaces.IPloneSiteRoot"
+      for="plone.base.interfaces.IPloneSiteRoot"
       permission="cmf.ModifyPortalContent"
       />
 
   <plone:service
       method="DELETE"
       factory=".demo.Delete"
-      for="Products.CMFPlone.interfaces.IPloneSiteRoot"
+      for="plone.base.interfaces.IPloneSiteRoot"
       permission="zope2.DeleteObjects"
       />
 
   <plone:service
       method="PATCH"
       factory=".demo.Patch"
-      for="Products.CMFPlone.interfaces.IPloneSiteRoot"
+      for="plone.base.interfaces.IPloneSiteRoot"
       permission="cmf.ModifyPortalContent"
       />
 
   <plone:service
       method="OPTIONS"
       factory=".demo.Options"
-      for="Products.CMFPlone.interfaces.IPloneSiteRoot"
+      for="plone.base.interfaces.IPloneSiteRoot"
       permission="zope2.View"
       />
 

src/plone/rest/tests/test_traversal.py

@@ -1,9 +1,9 @@
 from base64 import b64encode
-from plone.app.layout.navigation.interfaces import INavigationRoot
 from plone.app.testing import setRoles
 from plone.app.testing import SITE_OWNER_NAME
 from plone.app.testing import SITE_OWNER_PASSWORD
 from plone.app.testing import TEST_USER_ID
+from plone.base.interfaces import INavigationRoot
 from plone.rest.service import Service
 from plone.rest.testing import PLONE_REST_INTEGRATION_TESTING
 from Products.SiteAccess.VirtualHostMonster import VirtualHostMonster

tox.ini

@@ -100,7 +100,7 @@ set_env =
 ##
 deps =
     zope.testrunner
-    -c https://dist.plone.org/release/6.0-dev/constraints.txt
+    -c https://dist.plone.org/release/6.1-dev/constraints.txt
 
 ##
 # Specify additional deps in .meta.toml:
@@ -143,7 +143,7 @@ set_env =
 deps =
     coverage
     zope.testrunner
-    -c https://dist.plone.org/release/6.0-dev/constraints.txt
+    -c https://dist.plone.org/release/6.1-dev/constraints.txt
 
 commands =
     coverage run --branch --source plone.rest {envbindir}/zope-testrunner --quiet --all --test-path={toxinidir}/src -s plone.rest {posargs}
@@ -160,7 +160,7 @@ deps =
     twine
     build
     towncrier
-    -c https://dist.plone.org/release/6.0-dev/constraints.txt
+    -c https://dist.plone.org/release/6.1-dev/constraints.txt
 
 commands =
     # fake version to not have to install the package
@@ -188,7 +188,7 @@ allowlist_externals =
 deps =
     pipdeptree
     pipforester
-    -c https://dist.plone.org/release/6.0-dev/constraints.txt
+    -c https://dist.plone.org/release/6.1-dev/constraints.txt
 
 commands =
     # Generate the full dependency tree