From b68b6ae49e86d6d6315cb2ab924ffd36f7236269 Mon Sep 17 00:00:00 2001 From: Maurits van Rees Date: Fri, 20 Dec 2024 14:41:28 +0100 Subject: [PATCH] Plone 6.0.14 and 6.1.0b2 are out with Python 3.13 support. (#1823) * Plone 6.0.14 and 6.1.0b2 are out with Python 3.13 support. * Add admonition for Python support in Plone 6.0.14 * Fix PLONE_BACKEND_PATCH_VERSION Add latest versions to In-place migrations * Fix example of unresolvable version conflict. With the current PLONE_BACKEND_PATCH_VERSION the example actually contained no version conflict. :-) * Update docs/conf.py --------- Co-authored-by: Steve Piercy --- docs/_inc/_install-python-plone60.md | 8 ++++++++ docs/backend/upgrading/intro.md | 4 ++-- docs/conceptual-guides/package-management.md | 6 +++--- docs/conf.py | 5 ++--- 4 files changed, 15 insertions(+), 8 deletions(-) diff --git a/docs/_inc/_install-python-plone60.md b/docs/_inc/_install-python-plone60.md index f97f50b4e..57c21c276 100644 --- a/docs/_inc/_install-python-plone60.md +++ b/docs/_inc/_install-python-plone60.md @@ -3,6 +3,14 @@ However, it is recommended to use a Python version manager, {term}`pyenv`, that Plone 6.0 requires Python version {{SUPPORTED_PYTHON_VERSIONS_PLONE60}}. +```{versionadded} Plone 6.0.14 +Support for Python 3.13. +``` + +```{versionremoved} Plone 6.0.14 +Support for Python 3.8. +``` + ```{warning} Do not create or activate a Python virtual environment at this time. The instructions below will create one. diff --git a/docs/backend/upgrading/intro.md b/docs/backend/upgrading/intro.md index 152cbb3a7..22b1799b5 100644 --- a/docs/backend/upgrading/intro.md +++ b/docs/backend/upgrading/intro.md @@ -118,8 +118,8 @@ If you are at Plone 2.5 and want to upgrade to the latest Plone 6, you should ap - First upgrade from Plone 2.5 to the latest Plone 3 version (3.3.6). - Then upgrade from Plone 3 to the latest Plone 4 version (4.3.20). -- Then upgrade from Plone 4 to the latest Plone 5 version. -- Then upgrade from Plone 5 to the latest Plone 6 version. +- Then upgrade from Plone 4 to the latest Plone 5 version (5.2.15). +- Then upgrade from Plone 5 to the latest Plone 6 version ({PLONE_BACKEND_PATCH_VERSION}). (introduction-upgrade-strategies-export-import-migrations-label)= diff --git a/docs/conceptual-guides/package-management.md b/docs/conceptual-guides/package-management.md index baaef4a35..595c0637b 100644 --- a/docs/conceptual-guides/package-management.md +++ b/docs/conceptual-guides/package-management.md @@ -32,11 +32,11 @@ If you want to check out a Plone core package for development, or want to overri ```text # constraints.txt with unresolvable version conflict --c https://dist.plone.org/release/{PLONE_BACKEND_PATCH_VERSION}/constraints.txt -plone.api>=2.0.0a3 +-c https://dist.plone.org/release/6.0.9/constraints.txt +plone.api>=2.1.0 ``` -Unfortunately `pip` does not allow overriding constraints this way. +Unfortunately `pip` does not allow overriding constraints this way. {term}`mxdev` solves this issue. diff --git a/docs/conf.py b/docs/conf.py index be7efa3b4..8b5658349 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -318,8 +318,8 @@ "postman_response": "![](../_static/img/postman_response.png)", "postman_retain_headers": "![](../_static/img/postman_retain_headers.png)", "fawrench": '', - "SUPPORTED_PYTHON_VERSIONS_PLONE60": "3.8, 3.9, 3.10, 3.11, or 3.12", - "SUPPORTED_PYTHON_VERSIONS_PLONE61": "3.10, 3.11, or 3.12", + "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", } @@ -441,7 +441,6 @@ def source_replace(app, docname, source): # Dict of replacements. source_replacements = { "{PLONE_BACKEND_MINOR_VERSION}": "6.0", - "{PLONE_BACKEND_PATCH_VERSION}": "6.0.13", } # Finally, configure app attributes.