From 090a5cdfcfae3f92070f6292181d2eb3879252bd Mon Sep 17 00:00:00 2001 From: Sloane Hertel <19572925+s-hertel@users.noreply.github.com> Date: Wed, 7 Jun 2023 11:54:23 -0400 Subject: [PATCH] add 2.16 to the release and maintenance table (#80974) --- .../collection_requirements.rst | 4 ++-- .../release_and_maintenance.rst | 17 +++++++++-------- 2 files changed, 11 insertions(+), 10 deletions(-) diff --git a/docs/docsite/rst/community/collection_contributors/collection_requirements.rst b/docs/docsite/rst/community/collection_contributors/collection_requirements.rst index bae0f21d37f..261c3effd00 100644 --- a/docs/docsite/rst/community/collection_contributors/collection_requirements.rst +++ b/docs/docsite/rst/community/collection_contributors/collection_requirements.rst @@ -84,12 +84,12 @@ One example scenario where the "even if" clause comes into play is when using cl Controller environment ~~~~~~~~~~~~~~~~~~~~~~ -In the controller environment, collections MUST support Python 2 (version 2.7) and Python 3 (Version 3.6 and higher), unless required libraries do not support these versions. Collections SHOULD also support Python v3.5 if all required libraries support this version. +Review the :ref:`support_life` for the versions of ``ansible-core`` that the collection supports. Collections MUST document the supported Python versions for plugins which cannot support all controller Python versions (for example, if required libraries do not support them). Other environment ~~~~~~~~~~~~~~~~~ -In the other environment, collections MUST support Python 2 (version 2.7) and Python 3 (Version 3.6 and higher), unless required libraries do not support these versions. Collections SHOULD also support Python v2.6 and v3.5 if all required libraries support this version. +Review the :ref:`support_life` for the versions of ``ansible-core`` that the collection supports. Collections MUST document the supported Python versions for modules which cannot support all target Python versions (for example, if required libraries do not support them). .. note:: diff --git a/docs/docsite/rst/reference_appendices/release_and_maintenance.rst b/docs/docsite/rst/reference_appendices/release_and_maintenance.rst index 5ccbe76363b..43a2e925c72 100644 --- a/docs/docsite/rst/reference_appendices/release_and_maintenance.rst +++ b/docs/docsite/rst/reference_appendices/release_and_maintenance.rst @@ -134,6 +134,15 @@ Dates listed indicate the start date of the maintenance cycle. - End Of Life - Controller Python - Target Python / PowerShell + * - `2.16` + - | GA: 06 Nov 2023 + | Critical: 20 May 2024 + | Security: Nov 2024 + - May 2025 + - | Python 3.10 - 3.12 + - | Python 2.7 + | Python 3.6 - 3.12 + | Powershell TBD * - `2.15`_ - | GA: 22 May 2023 | Critical: 06 Nov 2023 @@ -204,14 +213,6 @@ Dates listed indicate the start date of the maintenance cycle. - | Python 2.6 - 2.7 | Python 3.5 - 3.8 | PowerShell 3 - 5.1 -.. * - 2.16 -.. - 06 Nov 2023 -.. - 20 May 2024 -.. - Nov 2024 -.. - May 2025 -.. - | Python 3.10 - 3.12 -.. - | Python 3.6 - 3.12 -.. | PowerShell TBD .. * - 2.17 .. - 20 May 2024 .. - Nov 2024