Support for Plone 6.0.10 til 6.0.15

6.1.x not available

Author: gotcha

.github/workflows/tests.yml

@@ -7,7 +7,8 @@ jobs:
       matrix:
         config:
         - ["plone52-py27", "plone/test-with-tox:5.2-2.7"]
-    runs-on: ubuntu-20.04
+        - ["plone52-py38", "plone/test-with-tox:5.2-3.8"]
+    runs-on: ubuntu-22.04
     container:
       image: ${{ matrix.config[1] }}
     name: ${{ matrix.config[0] }}
@@ -21,15 +22,16 @@ jobs:
       matrix:
         config:
         # [Python version, tox env]
-        - ["3.6",   "plone52-py36"]
-        - ["3.7",   "plone52-py37"]
-        - ["3.8",   "plone52-py38"]
-        - ["3.8",   "plone60-py38"]
+        # - ["3.6",   "plone52-py36"]
+        # - ["3.7",   "plone52-py37"]
+        # - ["3.8",   "plone60-py38"]
         - ["3.9",   "plone60-py39"]
         - ["3.10",  "plone60-py310"]
         - ["3.11",  "plone60-py311"]
+        - ["3.12",  "plone60-py312"]
+        - ["3.13",  "plone60-py313"]
     name: ${{ matrix.config[1] }}
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     steps:
     - uses: actions/checkout@v3
     - name: Set up Python

buildout-constraints.txt

@@ -0,0 +1 @@
+setuptools<80.8.0

docs/HISTORY.txt

@@ -4,7 +4,8 @@ Changelog
 5.0.0b5 (unreleased)
 --------------------
 
-- Nothing changed yet.
+- Support for CMFPlone >= 6.0.10 < 6.1 where CSS viewlet implementation has changed.
+  [gotcha]
 
 
 5.0.0b4 (2023-12-21)

requirements-tox.txt

@@ -1,5 +1,3 @@
-# For Buildout related packages, it is easiest to keep them at the same version for all environments.
-# Keep these in sync with base.cfg please:
-zc.buildout==3.0.1
-# setuptools 67 is too strict with versions
-setuptools<67
+horse-with-no-namespace
+zc.buildout
+-c buildout-constraints.txt

setup.py

@@ -35,6 +35,8 @@
         "Programming Language :: Python :: 3.9",
         "Programming Language :: Python :: 3.10",
         "Programming Language :: Python :: 3.11",
+        "Programming Language :: Python :: 3.12",
+        "Programming Language :: Python :: 3.13",
     ],
     keywords='Plone CKeditor WYSIWYG',
     author='Plone Collective (started by Alterway Solutions)',
@@ -46,6 +48,7 @@
     zip_safe=False,
     install_requires=[
         'setuptools',
+        'Products.CMFPlone<6.1',
         'zope.i18nmessageid',
         'collective.quickupload',
         'collective.plonefinder',

sources.cfg

@@ -13,4 +13,4 @@ zope_push = git@github.com:zopefoundation
 
 [sources]
 collective.plonefinder = git ${remotes:collective}/collective.plonefinder.git pushurl=${remotes:collective_push}/collective.plonefinder.git branch=plone5
-collective.quickupload = git ${remotes:collective}/collective.quickupload.git pushurl=${remotes:collective_push}/collective.quickupload.git branch=plone5
+collective.quickupload = git ${remotes:collective}/collective.quickupload.git pushurl=${remotes:collective_push}/collective.quickupload.git branch=master

src/collective/ckeditor/browser/ckeditorview.py

@@ -67,6 +67,8 @@
 
 
 if HAS_PLONE6_RESOURCES:
+    from .cmf_plone_resource import ResourceView
+
     def get_css_urls(view):
         class CKRenderer(webresource.ResourceRenderer):
             # returns list of CSS URLS instead of link tags in HTML
@@ -77,10 +79,8 @@ def render(self):
 
         class CKEditorCSSViewlet(ResourceView):
             def index(self):
-                root_group_css = webresource.ResourceGroup(name="root_css")
-                resolver_css = webresource.ResourceResolver(root_group_css)
                 renderer = CKRenderer(
-                    resolver_css, base_url=self.portal_state.portal_url()
+                    self.resolver_css, base_url=self.portal_state.portal_url()
                 )
                 rendered = renderer.render()
                 return rendered
@@ -91,7 +91,9 @@ def index(self):
             view
         )
         viewlet.update()
-        return viewlet.index()
+        result = viewlet.index()
+        return result
+
 
 if HAS_PLONE5_RESOURCES:
     def get_css_urls(view):