Skip to content

Commit

Permalink
6.0: drop Python 3.8, drop macos-12, update Zope/pip/st/buildout.
Browse files Browse the repository at this point in the history
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 plone/jenkins.plone.org#377

We also need to stop testing on macos-12 as it may fail soon.  See #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:
plone/Products.validation#14
  • Loading branch information
mauritsvanrees committed Dec 6, 2024
1 parent 49b741e commit f04a253
Show file tree
Hide file tree
Showing 4 changed files with 12 additions and 10 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/bare.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 1 addition & 2 deletions .github/workflows/run-buildout.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,15 +7,14 @@ jobs:
strategy:
matrix:
python-version:
- "3.8"
- "3.9"
- "3.10"
- "3.11"
- "3.12"
os:
- ubuntu-latest
- windows-latest
- macos-12
- macos-13
runs-on: ${{ matrix.os }}
steps:
- uses: actions/checkout@v4
Expand Down
8 changes: 4 additions & 4 deletions requirements.txt
Original file line number Diff line number Diff line change
@@ -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:
Expand Down
9 changes: 6 additions & 3 deletions versions.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,17 @@
# 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.3.1
setuptools = 75.3.0
wheel = 0.45.1
zc.buildout = 3.3

pip = 24.2
setuptools = 74.0.0
wheel = 0.44.0
Expand All @@ -22,8 +27,6 @@ zc.buildout = 3.1.0
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,
Expand Down

0 comments on commit f04a253

Please sign in to comment.