From 50ba0969f1db8a8f6c949500fb539313614283f1 Mon Sep 17 00:00:00 2001 From: Steve Piercy Date: Wed, 25 Mar 2026 01:51:16 -0700 Subject: [PATCH 1/3] Prepare for Plone 6.2 release DO NOT MERGE until Plone 6.2 final is released. @mauritsvanrees here ya go! --- ...python-plone61.md => _install-python-plone62.md} | 2 +- docs/admin-guide/install-buildout.md | 4 ++-- docs/admin-guide/install-pip.md | 4 ++-- .../version-specific-migration/upgrade-to-62.md | 13 ++++++++----- docs/conf.py | 2 +- docs/contributing/core/index.md | 2 +- docs/contributing/documentation/setup-build.md | 4 ++-- submodules/volto | 2 +- 8 files changed, 18 insertions(+), 15 deletions(-) rename docs/_inc/{_install-python-plone61.md => _install-python-plone62.md} (55%) diff --git a/docs/_inc/_install-python-plone61.md b/docs/_inc/_install-python-plone62.md similarity index 55% rename from docs/_inc/_install-python-plone61.md rename to docs/_inc/_install-python-plone62.md index b819d5857..8d06a2087 100644 --- a/docs/_inc/_install-python-plone61.md +++ b/docs/_inc/_install-python-plone62.md @@ -1,5 +1,5 @@ Installing Python is beyond the scope of this documentation. -However, it is recommended to use a Python version manager, {term}`pyenv`, that allows you to install multiple versions of Python on your development environment without destroying your system's Python. +However, it is recommended to use a Python version manager, such as {term}`pyenv`, that allows you to install multiple versions of Python on your development environment without destroying your system's Python. ```{warning} Do not create or activate a Python virtual environment at this time. diff --git a/docs/admin-guide/install-buildout.md b/docs/admin-guide/install-buildout.md index 5888502c1..ede20dcac 100644 --- a/docs/admin-guide/install-buildout.md +++ b/docs/admin-guide/install-buildout.md @@ -31,12 +31,12 @@ For other installation options, see {ref}`get-started-install-label`. ## Prerequisites for installation -- For Plone 6.1, Python {{SUPPORTED_PYTHON_VERSIONS_PLONE61}} +- For Plone 6.2, Python {{SUPPORTED_PYTHON_VERSIONS_PLONE62}} ### Python -```{include} /_inc/_install-python-plone61.md +```{include} /_inc/_install-python-plone62.md ``` diff --git a/docs/admin-guide/install-pip.md b/docs/admin-guide/install-pip.md index dddd40fbe..54990f9c5 100644 --- a/docs/admin-guide/install-pip.md +++ b/docs/admin-guide/install-pip.md @@ -31,12 +31,12 @@ For other installation options, see {ref}`get-started-install-label`. ## Prerequisites for installation -- For Plone 6.1, Python {{SUPPORTED_PYTHON_VERSIONS_PLONE61}} +- For Plone 6.2, Python {{SUPPORTED_PYTHON_VERSIONS_PLONE62}} ### Python -```{include} /_inc/_install-python-plone61.md +```{include} /_inc/_install-python-plone62.md ``` diff --git a/docs/backend/upgrading/version-specific-migration/upgrade-to-62.md b/docs/backend/upgrading/version-specific-migration/upgrade-to-62.md index e833139f9..c148be8c4 100644 --- a/docs/backend/upgrading/version-specific-migration/upgrade-to-62.md +++ b/docs/backend/upgrading/version-specific-migration/upgrade-to-62.md @@ -15,6 +15,11 @@ Plone 6.2 has seen the following major changes. Some may require changes in your setup. +## Added support for Python 3.14 + +Plone 6.2 supports Python 3.14. + + ## Move to native namespaces Plone 6.2 has migrated all core Python packages from `pkg_resources`-style namespaces to native namespaces. @@ -36,11 +41,9 @@ The two terms mean the same. ``` Native namespaces exist since Python 3.3. -Because Plone started in the days of Python 2, it has always used `pkg_resources`. -`pkg_resources` is part of the `setuptools` package. -This part is deprecated. -It's scheduled to be removed around the end of 2025, in `setuptools` 81. -This means Plone needs to move to native namespaces. +Because Plone started in the days of Python 2, it has always used `pkg_resources`, until now. +[`pkg_resources` was removed from `setuptools` 82.0.0](https://setuptools.pypa.io/en/latest/history.html#v82-0-0). +This means Plone needed to move to native namespaces. In general, this move shouldn't cause problems for integrators. To install Plone 6.2 you can keep using the same version of `pip` (or `uv`), or `zc.buildout` as you do for Plone 6.1. diff --git a/docs/conf.py b/docs/conf.py index e9b9db845..b927daebd 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -325,7 +325,7 @@ "fawrench": '', "SUPPORTED_PYTHON_VERSIONS_PLONE60": "3.9, 3.10, 3.11, 3.12, or 3.13", "SUPPORTED_PYTHON_VERSIONS_PLONE61": "3.10, 3.11, 3.12, or 3.13", - "SUPPORTED_PYTHON_VERSIONS_PLONE62": "3.10, 3.11, 3.12, or 3.13", + "SUPPORTED_PYTHON_VERSIONS_PLONE62": "3.10, 3.11, 3.12, 3.13, or 3.14", } diff --git a/docs/contributing/core/index.md b/docs/contributing/core/index.md index 42cc80546..35c72bc86 100644 --- a/docs/contributing/core/index.md +++ b/docs/contributing/core/index.md @@ -48,7 +48,7 @@ However, the following links and sections below may be helpful. Installing Python is beyond the scope of this documentation. However, it is recommended to use a Python version manager, {term}`pyenv` that allows you to install multiple versions of Python on your development environment without destroying your system's Python. -Plone requires Python version {{SUPPORTED_PYTHON_VERSIONS_PLONE61}}. +Plone requires Python version {{SUPPORTED_PYTHON_VERSIONS_PLONE62}}. ### Make diff --git a/docs/contributing/documentation/setup-build.md b/docs/contributing/documentation/setup-build.md index e1f070cbe..d6aa8eabe 100644 --- a/docs/contributing/documentation/setup-build.md +++ b/docs/contributing/documentation/setup-build.md @@ -22,7 +22,7 @@ Installation of Plone 6 Documentation includes prerequisites and the repository ```{include} ../../volto/_inc/_install-operating-system.md ``` -- {ref}`setup-build-installation-python-label` {{SUPPORTED_PYTHON_VERSIONS_PLONE61}} +- {ref}`setup-build-installation-python-label` {{SUPPORTED_PYTHON_VERSIONS_PLONE62}} - {ref}`setup-build-installation-gnu-make-label` - {ref}`setup-build-installation-graphviz-label` @@ -31,7 +31,7 @@ Installation of Plone 6 Documentation includes prerequisites and the repository ### Python -```{include} /_inc/_install-python-plone61.md +```{include} /_inc/_install-python-plone62.md ``` (setup-build-installation-gnu-make-label)= diff --git a/submodules/volto b/submodules/volto index add36edbe..f9fc69257 160000 --- a/submodules/volto +++ b/submodules/volto @@ -1 +1 @@ -Subproject commit add36edbe30a0a6d66076d71ff04d2d42e5aaa09 +Subproject commit f9fc69257c1d9c5a52823ea62776c13d48868318 From beb022b272fe79648e4f0237b5514889aca93ed2 Mon Sep 17 00:00:00 2001 From: Steve Piercy Date: Wed, 25 Mar 2026 02:26:08 -0700 Subject: [PATCH 2/3] Bump to 6.2 --- docs/_inc/_install-python-plone62.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/_inc/_install-python-plone62.md b/docs/_inc/_install-python-plone62.md index 8d06a2087..a6a4a389d 100644 --- a/docs/_inc/_install-python-plone62.md +++ b/docs/_inc/_install-python-plone62.md @@ -6,4 +6,4 @@ Do not create or activate a Python virtual environment at this time. The instructions below will create one. ``` -Plone 6.1 requires Python version {{SUPPORTED_PYTHON_VERSIONS_PLONE61}}. +Plone 6.2 requires Python version {{SUPPORTED_PYTHON_VERSIONS_PLONE62}}. From d4839302dccbff569f97f1c43c4c1994bf6b39c5 Mon Sep 17 00:00:00 2001 From: Steve Piercy Date: Wed, 25 Mar 2026 16:00:18 -0700 Subject: [PATCH 3/3] Update docs/_inc/_install-python-plone62.md Co-authored-by: David Glick --- docs/_inc/_install-python-plone62.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/_inc/_install-python-plone62.md b/docs/_inc/_install-python-plone62.md index a6a4a389d..68b7e4dbd 100644 --- a/docs/_inc/_install-python-plone62.md +++ b/docs/_inc/_install-python-plone62.md @@ -1,5 +1,5 @@ Installing Python is beyond the scope of this documentation. -However, it is recommended to use a Python version manager, such as {term}`pyenv`, that allows you to install multiple versions of Python on your development environment without destroying your system's Python. +However, it is recommended to use a Python version manager, such as {term}`uv` or {term}`pyenv`, that allows you to install multiple versions of Python on your development environment without destroying your system's Python. ```{warning} Do not create or activate a Python virtual environment at this time.