Merge branch 'main' into blocktypes

jnptk · jnptk · commit d16b58836fc5 · 2026-01-30T11:14:11.000+01:00
diff --git a/.github/workflows/test-matrix.yml b/.github/workflows/test-matrix.yml
@@ -21,23 +21,29 @@ jobs:
         # [Python version, visual name, tox env]
         - ["3.13", "6.2 on py3.13", "py313-plone62"]
         - ["3.10", "6.2 on py3.10", "py310-plone62"]
-        - ["3.13", "6.1 on py3.13", "py313-plone61"]
-        - ["3.10", "6.1 on py3.10", "py310-plone61"]
 
     runs-on: ${{ matrix.os[1] }}
     if: github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name != github.event.pull_request.base.repo.full_name
     name: ${{ matrix.config[1] }}
     steps:
-    - uses: actions/checkout@v5
+    - uses: actions/checkout@v6
       with:
         persist-credentials: false
     - name: Set up Python
       uses: actions/setup-python@v6
       with:
         python-version: ${{ matrix.config[0] }}
         allow-prereleases: true
+
+##
+# Add extra configuration options in .meta.toml:
+#  [github]
+#  extra_lines_after_os_dependencies = """
+#  _your own configuration lines_
+#  """
+##
     - name: Pip cache
-      uses: actions/cache@v4
+      uses: actions/cache@v5
       with:
         path: ~/.cache/pip
         key: ${{ runner.os }}-pip-${{ matrix.config[0] }}-${{ hashFiles('setup.*', 'tox.ini') }}
@@ -55,3 +61,12 @@ jobs:
         if [ `tox list --no-desc -f init|wc -l` = 1 ]; then tox -e init;else true; fi
     - name: Test
       run: tox -e ${{ matrix.config[2] }}
+
+
+##
+# Add extra configuration options in .meta.toml:
+#  [github]
+#  extra_lines = """
+#  _your own configuration lines_
+#  """
+##
diff --git a/.meta.toml b/.meta.toml
@@ -3,7 +3,7 @@
 # See the inline comments on how to expand/tweak this configuration file
 [meta]
 template = "default"
-commit-id = "2.0.1.dev0"
+commit-id = "2.2.2"
 
 [gitignore]
 extra_lines = """
@@ -24,4 +24,4 @@ test_runner = "pytest"
 test_path = "/tests"
 use_mxdev = true
 test_deps_additional = ""
-test_matrix = { "6.2" = ["3.13", "3.12", "3.11", "3.10"], "6.1" = ["3.13", "3.12", "3.11", "3.10"] }
+test_matrix = {"6.2" = ["*"]}
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -7,16 +7,16 @@ ci:
 
 repos:
 -   repo: https://github.com/asottile/pyupgrade
-    rev: v3.20.0
+    rev: v3.21.0
     hooks:
     -   id: pyupgrade
         args: [--py38-plus]
 -   repo: https://github.com/pycqa/isort
-    rev: 6.0.1
+    rev: 7.0.0
     hooks:
     -   id: isort
--   repo: https://github.com/psf/black
-    rev: 25.1.0
+-   repo: https://github.com/psf/black-pre-commit-mirror
+    rev: 25.9.0
     hooks:
     -   id: black
 -   repo: https://github.com/collective/zpretty
@@ -58,15 +58,15 @@ repos:
 #  """
 ##
 -   repo: https://github.com/mgedmin/check-manifest
-    rev: "0.50"
+    rev: "0.51"
     hooks:
     -   id: check-manifest
 -   repo: https://github.com/regebro/pyroma
     rev: "5.0"
     hooks:
     -   id: pyroma
 -   repo: https://github.com/mgedmin/check-python-versions
-    rev: "0.22.1"
+    rev: "0.23.0"
     hooks:
     -   id: check-python-versions
         args: ['--only', 'setup.py,pyproject.toml']
diff --git a/CHANGES.md b/CHANGES.md
@@ -9,6 +9,29 @@
 
 <!-- towncrier release notes start -->
 
+## 6.0.0a1 (2026-01-13)
+
+
+### Breaking changes:
+
+- Replace ``pkg_resources`` namespace with PEP 420 native namespace.
+  Support only Plone 6.2 and Python 3.10+. #3928
+
+
+### New features:
+
+- Add larger scales to `plone.allowed_sizes` for new sites. This helps avoid the
+  need to serve the original image which can be very large. @davisagli
+
+  - `2k` is large enough for a default-width image on a high-density display.
+  - `4k` is large enough for a full-width images on high-density viewports up to 2000 pixels wide. 
+
+
+### Bug fixes:
+
+- Support collective.html2blocks to convert HTML to Volto blocks as a replacement for blocks-conversion-tool.
+  @pbauer #201
+
 ## 5.2.2 (2025-10-01)
 
 
diff --git a/news/207.bugfix b/news/207.bugfix
@@ -0,0 +1 @@
+Add getRemoteUrl to summary field serializer. @jackahl
diff --git a/setup.py b/setup.py
@@ -1,4 +1,3 @@
-from setuptools import find_packages
 from setuptools import setup
 
 
@@ -13,15 +12,15 @@
 
 setup(
     name="plone.volto",
-    version="5.2.3.dev0",
+    version="6.0.0a2.dev0",
     description="Volto integration add-on for Plone",
     long_description=long_description,
     long_description_content_type="text/markdown",
     classifiers=[
         "Development Status :: 5 - Production/Stable",
         "Environment :: Web Environment",
         "Framework :: Plone",
-        "Framework :: Plone :: 6.1",
+        "Framework :: Plone :: 6.2",
         "Programming Language :: Python",
         "Programming Language :: Python :: 3.10",
         "Programming Language :: Python :: 3.11",
@@ -34,9 +33,6 @@
     author_email="tisto@plone.org",
     url="https://github.com/plone/plone.volto",
     license="GPL version 2",
-    packages=find_packages("src"),
-    namespace_packages=["plone"],
-    package_dir={"": "src"},
     include_package_data=True,
     zip_safe=False,
     python_requires=">=3.10",
@@ -48,7 +44,6 @@
         "plone.distribution",
         "plone.restapi>=8.41.0",
         "Products.CMFPlone",
-        "setuptools",
     ],
     extras_require={
         "test": [
diff --git a/src/plone/__init__.py b/src/plone/__init__.py
diff --git a/src/plone/volto/browser/migrate_richtext.py b/src/plone/volto/browser/migrate_richtext.py
@@ -149,7 +149,9 @@ def get_blocks_from_richtext(
     r = requests.post(service_url, headers=headers, json=payload)
     r.raise_for_status()
     slate_data = r.json()
-    slate_data = slate_data["data"]
+    # blocks-conversion-tool vs. collective.html2blocks
+    if isinstance(slate_data, dict) and "data" in slate_data:
+        slate_data = slate_data["data"]
     blocks = {}
     uuids = []
     # generate slate blocks
diff --git a/src/plone/volto/profiles/default/metadata.xml b/src/plone/volto/profiles/default/metadata.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <metadata>
-  <version>1020</version>
+  <version>1100</version>
   <dependencies>
     <dependency>profile-plone.restapi:blocks</dependency>
   </dependencies>
diff --git a/src/plone/volto/profiles/default/registry/plone.base.interfaces.controlpanel.IImagingSchema.xml b/src/plone/volto/profiles/default/registry/plone.base.interfaces.controlpanel.IImagingSchema.xml
@@ -5,10 +5,8 @@
   <record field="allowed_sizes"
           interface="plone.base.interfaces.controlpanel.IImagingSchema"
           name="plone.allowed_sizes"
-          purge="True"
   >
-    <!-- Purge the existing ones! -->
-    <value>
+    <value purge="true">
       <element>icon 32:32</element>
       <element>tile 64:64</element>
       <element>thumb 128:128</element>
@@ -19,6 +17,8 @@
       <element>larger 1000:65536</element>
       <element>great 1200:65536</element>
       <element>huge 1600:65536</element>
+      <element>2k 2000:65536</element>
+      <element>4k 4000:65536</element>
     </value>
   </record>
 </registry>
diff --git a/src/plone/volto/summary.py b/src/plone/volto/summary.py
@@ -18,4 +18,5 @@ def default_metadata_fields(self):
             "mime_type",
             "nav_title",
             "start",
+            "getRemoteUrl",
         }
diff --git a/src/plone/volto/upgrades.py b/src/plone/volto/upgrades.py
@@ -192,6 +192,15 @@ def update_robots_txt(context):
         )
 
 
+def add_large_image_scales(context):
+    value = api.portal.get_registry_record("plone.allowed_sizes")
+    if not any(item.startswith("2k ") for item in value):
+        value.append("2k 2000:65536")
+    if not any(item.startswith("4k ") for item in value):
+        value.append("4k 4000:65536")
+    api.portal.set_registry_record("plone.allowed_sizes", value)
+
+
 def reindex_block_types(context):
     catalog = getToolByName(context, "portal_catalog")
     brains = catalog(object_provides="plone.restapi.behaviors.IBlocks")
diff --git a/src/plone/volto/upgrades.zcml b/src/plone/volto/upgrades.zcml
@@ -96,6 +96,18 @@
         handler=".upgrades.update_robots_txt"
         />
   </genericsetup:upgradeSteps>
+
+  <genericsetup:upgradeSteps
+      profile="plone.volto:default"
+      source="1019"
+      destination="1100"
+      >
+    <genericsetup:upgradeStep
+        title="Add large image scales"
+        handler=".upgrades.add_large_image_scales"
+        />
+  </genericsetup:upgradeSteps>
+
   <genericsetup:upgradeSteps
       profile="plone.volto:default"
       source="1019"
diff --git a/tests/setup/test_setup_install.py b/tests/setup/test_setup_install.py
@@ -16,7 +16,7 @@ def test_browserlayer(self, browser_layers):
 
     def test_latest_version(self, profile_last_version):
         """Test latest version of default profile."""
-        assert profile_last_version(f"{PACKAGE_NAME}:default") == "1019"
+        assert profile_last_version(f"{PACKAGE_NAME}:default") == "1100"
 
     @pytest.mark.parametrize(
         "portal_type,behavior",
diff --git a/tox.ini b/tox.ini
@@ -11,20 +11,17 @@ envlist =
     py312-plone62
     py311-plone62
     py310-plone62
-    py313-plone61
-    py312-plone61
-    py311-plone61
-    py310-plone61
     dependencies
 
 
 ##
 # Add extra configuration options in .meta.toml:
 # - to specify a custom testing combination of Plone and python versions, use `test_matrix`
+#   Use ["*"] to use all supported Python versions for this Plone version.
 # - to specify extra custom environments, use `envlist_lines`
 # - to specify extra `tox` top-level options, use `config_lines`
 #  [tox]
-#  test_matrix = {"6.2" = ["3.13", "3.12"], "6.1" = ["3.10", "3.9"]}
+#  test_matrix = {"6.2" = ["3.13", "3.12"], "6.1" = ["*"]}
 #  envlist_lines = """
 #      my_other_environment
 #  """
@@ -200,7 +197,6 @@ deps =
     build
     towncrier
     -c constraints-mxdev.txt
-
 commands =
     # fake version to not have to install the package
     # we build the change log as news entries might break
@@ -231,7 +227,6 @@ deps =
     pipdeptree
     pipforester
     -c constraints-mxdev.txt
-
 commands =
     # Generate the full dependency tree
     sh -c 'pipdeptree -j > forest.json'

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+Add getRemoteUrl to summary field serializer. @jackahl`