From ec38aeab90d1316d1ecee98bbd54c37009902ce7 Mon Sep 17 00:00:00 2001
From: Maurits van Rees <maurits@vanrees.org>
Date: Fri, 6 Dec 2024 23:50:22 +0100
Subject: [PATCH] 6.0: drop Python 3.8, drop macos-12, update
 Zope/pip/st/buildout.

Python 3.8 is out of security support, so I will officially drop it from Plone 6.0 soon.  As we say in the [release schedule](https://plone.org/download/release-schedule): "Plone 6.0 works on Python 3.8, but this Python version reaches end of life in October 2024. At that point, Plone 6 will drop support for Python 3.8."  See also https://github.com/plone/jenkins.plone.org/pull/377

We also need to stop testing on macos-12 as it may fail soon.  See https://github.com/plone/buildout.coredev/issues/967
Updated to macos-13 for now.

Updated pip, setuptools, buildout.
For the moment I kept setuptools at the highest version that still supports Python 3.8, but I want to increase that.  It would break Jenkins currently without the other PR I mentioned.

Update Zope to latest 5.11.1.

I will make this a draft PR, as the `Products.validation` tests fail due to an updated `zope.i18nmessageid`.  I am preparing a workaround for that:
https://github.com/plone/Products.validation/pull/14
---
 .github/workflows/bare.yml         |  2 +-
 .github/workflows/run-buildout.yml |  3 +--
 requirements.txt                   |  8 ++++----
 versions.cfg                       | 12 +++++-------
 4 files changed, 11 insertions(+), 14 deletions(-)

diff --git a/.github/workflows/bare.yml b/.github/workflows/bare.yml
index 53408fb617..ec51ef6a80 100644
--- a/.github/workflows/bare.yml
+++ b/.github/workflows/bare.yml
@@ -8,7 +8,7 @@ jobs:
       matrix:
         python-version:
         # Use the oldest supported Python version, as that may pull in more versions.
-        - "3.8"
+        - "3.9"
     runs-on: ubuntu-latest
     steps:
     - name: locale
diff --git a/.github/workflows/run-buildout.yml b/.github/workflows/run-buildout.yml
index cb87a174c5..ae14fb4181 100644
--- a/.github/workflows/run-buildout.yml
+++ b/.github/workflows/run-buildout.yml
@@ -7,7 +7,6 @@ jobs:
     strategy:
       matrix:
         python-version:
-        - "3.8"
         - "3.9"
         - "3.10"
         - "3.11"
@@ -15,7 +14,7 @@ jobs:
         os:
         - ubuntu-latest
         - windows-latest
-        - macos-12
+        - macos-13
     runs-on: ${{ matrix.os }}
     steps:
     - uses: actions/checkout@v4
diff --git a/requirements.txt b/requirements.txt
index 9511ba5a90..83a7c29e77 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,7 +1,7 @@
-pip==24.2
-setuptools==74.0.0
-wheel==0.44.0
-zc.buildout==3.1.0
+pip==24.3.1
+setuptools==75.3.0
+wheel==0.45.1
+zc.buildout==3.3
 
 # Windows specific down here (has to be installed here, fails in buildout)
 # Dependency of zope.sendmail:
diff --git a/versions.cfg b/versions.cfg
index 30bc2c6c13..c7b07f9e2f 100644
--- a/versions.cfg
+++ b/versions.cfg
@@ -7,23 +7,21 @@
 # Based on latest development Zope:
 # extends = https://raw.githubusercontent.com/zopefoundation/Zope/master/versions.cfg
 # Based on released Zope:
-extends = https://zopefoundation.github.io/Zope/releases/5.10/versions.cfg
+extends = https://zopefoundation.github.io/Zope/releases/5.11.1/versions.cfg
 
 
 [versions]
 # Basics
 # !! keep in sync with requirements.txt !!
-pip = 24.2
-setuptools = 74.0.0
-wheel = 0.44.0
-zc.buildout = 3.1.0
+pip = 24.3.1
+setuptools = 75.3.0
+wheel = 0.45.1
+zc.buildout = 3.3
 
 # windows specific
 nt-svcutils = 2.13.0
 
 # OVERRIDES
-# Zope uses an older version for its Sphinx theme, which Plone does not use
-docutils = 0.20.1
 
 # CORE PLONE.
 # These packages are what you get when installing Plone plus test dependencies,