Plone52 (#61)

* revert plone 52 support

* revert plone52 support

* isort / remove circular import detection

.github/workflows/legacy.yml

@@ -0,0 +1,32 @@
+name: Legacy tests
+
+on: [push]
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        python: ["3.8"]
+        plone: ["52"]
+    steps:
+      - uses: actions/checkout@v4
+      - name: Cache eggs
+        uses: actions/cache@v4
+        with:
+          path: eggs
+          key: ${{ runner.OS }}-build-python${{ matrix.python }}-${{ matrix.plone }}
+      - name: Set up Python ${{ matrix.python }}
+        uses: actions/setup-python@v5
+        with:
+          python-version: ${{ matrix.python }}
+      - name: Install dependencies
+        run: |
+          pip install -r requirements.txt -c constraints_plone${{ matrix.plone }}.txt
+          cp test_plone${{ matrix.plone }}.cfg buildout.cfg
+      - name: Install buildout
+        run: |
+          buildout -N -t 3 code-analysis:return-status-codes=True
+      - name: Run tests
+        run: |
+            bin/test

.github/workflows/meta.yml

@@ -34,8 +34,8 @@ jobs:
     uses: plone/meta/.github/workflows/dependencies.yml@main
   release_ready:
     uses: plone/meta/.github/workflows/release_ready.yml@main
-  circular:
-    uses: plone/meta/.github/workflows/circular.yml@main
+#  circular:
+#    uses: plone/meta/.github/workflows/circular.yml@main
 
 ##
 # To modify the list of default jobs being created add in .meta.toml:

pyproject.toml

@@ -86,9 +86,12 @@ python-dateutil = ['dateutil']
 'souper.plone' = ['souper', 'repoze.catalog']
 # extra packages
 ignore-packages = [
+  # these are packages defined in extras_require
   'collective.honeypot', 'plone.formwidget.hcaptcha', 'plone.formwidget.recaptcha',
   'collective.volto.blocksfield', 'collective.z3cform.norobots',
   'plone.app.iterate',
+  # XXX: This is a temporary fix for make the package usable with Plone  5.2 and 6.0
+  'plone.base', 'Products.CMFPlone',
 ]
 
 ##

setup.py

@@ -61,8 +61,9 @@
         "plone.i18n",
         "plone.memoize",
         "plone.protect",
+        "plone.registry",
         "plone.restapi>=8.36.0",
-        "plone.base",
+        "plone.schema",
         "Products.GenericSetup",
         "Products.PortalTransforms",
         "souper.plone",

src/collective/volto/formsupport/restapi/serializer/blocks.py

@@ -1,7 +1,13 @@
 from collective.volto.formsupport.interfaces import ICaptchaSupport
 from collective.volto.formsupport.interfaces import ICollectiveVoltoFormsupportLayer
 from plone import api
-from plone.base.interfaces import IPloneSiteRoot
+
+
+try:
+    from plone.base.interfaces import IPloneSiteRoot
+except ImportError:
+    from Products.CMFPlone.interfaces import IPloneSiteRoot
+
 from plone.restapi.behaviors import IBlocks
 from plone.restapi.interfaces import IBlockFieldSerializationTransformer
 from zope.component import adapter

src/collective/volto/formsupport/restapi/services/submit_form/post.py

@@ -10,7 +10,13 @@
 from email.message import EmailMessage
 from io import BytesIO
 from plone import api
-from plone.base.interfaces.controlpanel import IMailSchema
+
+
+try:
+    from plone.base.interfaces.controlpanel import IMailSchema
+except ImportError:
+    from Products.CMFPlone.interfaces.controlpanel import IMailSchema
+
 from plone.protect.interfaces import IDisableCSRFProtection
 from plone.registry.interfaces import IRegistry
 from plone.restapi.deserializer import json_body

src/collective/volto/formsupport/setuphandlers.py

@@ -1,4 +1,8 @@
-from plone.base.interfaces import INonInstallable
+try:
+    from plone.base.interfaces import INonInstallable
+except ImportError:
+    # plone 5.2
+    from Products.CMFPlone.interfaces import INonInstallable
 from zope.interface import implementer
 
 

src/collective/volto/formsupport/tests/test_setup.py

@@ -13,7 +13,7 @@
 try:
     from plone.base.utils import get_installer
 except ImportError:
-    get_installer = None
+    from Products.CMFPlone.utils import get_installer
 
 
 class TestSetup(unittest.TestCase):
@@ -24,10 +24,7 @@ class TestSetup(unittest.TestCase):
     def setUp(self):
         """Custom shared utility setup for tests."""
         self.portal = self.layer["portal"]
-        if get_installer:
-            self.installer = get_installer(self.portal, self.layer["request"])
-        else:
-            self.installer = api.portal.get_tool("portal_quickinstaller")
+        self.installer = get_installer(self.portal, self.layer["request"])
 
     def test_product_installed(self):
         """Test if collective.volto.formsupport is installed."""

test_plone52.cfg

@@ -60,3 +60,9 @@ collective.z3cform.norobots = 2.0
 
 # Added by buildout at 2023-09-18 12:59:01.353135
 collective.honeypot = 2.1
+
+# Added by buildout at 2024-06-30 04:55:46.545837
+
+# Required by:
+# collective.volto.formsupport==3.0.3.dev0
+pyotp = 2.9.0