From 6d8bb9ae7a747ee116c56ab1a417d61b891fbfa6 Mon Sep 17 00:00:00 2001 From: Maurits van Rees Date: Tue, 10 Dec 2024 23:23:45 +0100 Subject: [PATCH 1/4] Update various versions for 6.0. --- requirements.txt | 2 +- versions-extra.cfg | 72 ++++++++++++++++++++++------------------- versions.cfg | 80 +++++++++++++++++++++++----------------------- 3 files changed, 81 insertions(+), 73 deletions(-) diff --git a/requirements.txt b/requirements.txt index 83a7c29e77..c9ef752144 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,5 +1,5 @@ pip==24.3.1 -setuptools==75.3.0 +setuptools==75.6.0 wheel==0.45.1 zc.buildout==3.3 diff --git a/versions-extra.cfg b/versions-extra.cfg index 437d7f7567..320f5bd830 100644 --- a/versions-extra.cfg +++ b/versions-extra.cfg @@ -3,69 +3,77 @@ # that pull in ever more dependencies. # Note: version pins in this file can be removed at any time. [versions] -argcomplete = 3.2.3 -argh = 0.31.2 -bleach = 6.1.0 -build = 1.0.3 -cachecontrol = 0.14.0 -cached-property = 1.5.2 -check-manifest = 0.49 +argcomplete = 3.5.2 +argh = 0.31.3 +bleach = 6.2.0 +build = 1.2.2post1 +cachecontrol = 0.14.1 +cached-property = 2.0.1 +check-manifest = 0.50 click-default-group = 1.2.4 -cmarkgfm = 2024.1.14 +cmarkgfm = 2024.11.20 colorama = 0.4.6 commonmark = 0.9.1 -configparser = 5.3.0 -Deprecated = 1.2.14 +configparser = 7.1.0 +Deprecated = 1.2.15 distro = 1.9.0 fancycompleter = 0.9.1 -filelock = 3.13.4 +filelock = 3.16.1 gitdb = 4.0.11 GitPython = 3.1.43 httplib2 = 0.22.0 i18ndude = 6.2.1 -incremental = 22.10.0 -jaraco.classes = 3.3.1 -keyring = 24.3.1 +incremental = 24.7.2 +jaraco.functools = 4.1.0 +jaraco.classes = 3.4.0 +jaraco.context = 6.0.1 +keyring = 25.5.0 lockfile = 0.12.2 markdown-it-py = 3.0.0 mdurl = 0.1.2 -more-itertools = 10.2.0 -msgpack = 1.0.8 -mxdev = 4.0.2 -nh3 = 0.2.17 +more-itertools = 10.5.0 +msgpack = 1.1.0 +mxdev = 4.0.3 +nh3 = 0.2.19 oauthlib = 3.2.2 pdbpp = 0.10.3 pep440 = 0.1.2 pep517 = 0.13.1 -pkginfo = 1.9.6 +pkginfo = 1.10.0 plone.recipe.zeoserver = 3.0.2 plone.releaser = 2.3.2 plone.reload = 4.0.0 plone.versioncheck = 1.8.2 progress = 1.6 -PyGithub = 2.2.0 +PyGithub = 2.5.0 PyNaCl = 1.5.0 -pyparsing = 3.1.2 -pyproject-hooks = 1.0.0 +pyparsing = 3.2.0 +pyproject-hooks = 1.2.0 pyrepl = 0.9.0 pyroma = 4.2 -readme-renderer = 42.0 +readme-renderer = 44.0 requests-toolbelt = 1.0.0 rfc3986 = 2.0.0 -rich = 13.7.1 +rich = 13.9.4 smmap = 5.0.1 -stdlib-list = 0.10.0 -tomli = 2.0.1 -towncrier = 23.11.0 -trove-classifiers = 2024.4.10 -twine = 4.0.2 -wadllib = 1.3.6 +stdlib-list = 0.11.0 +towncrier = 24.8.0 +trove-classifiers = 2024.10.21.16 +twine = 5.1.1 +wadllib = 2.0.0 webencodings = 0.5.1 wmctrl = 0.5 z3c.dependencychecker = 2.15 zest.pocompile = 2.0.0 -zest.releaser = 9.1.3 +zest.releaser = 9.2.0 zestreleaser.towncrier = 1.3.0 zodbverify = 1.2.0 -zope.mkzeoinstance = 5.1.1 +zope.mkzeoinstance = 6.0 ZopeUndo = 6.0 + +[versionannotations] +# keep this alphabetical please +pkginfo = + Requirement of twine>=1.6.0: pkginfo<1.11 +smmap = + Requirement of gitdb<5,>=4.0.1: smmap<6,>=3.0.1 diff --git a/versions.cfg b/versions.cfg index c7b07f9e2f..61eba9bbe2 100644 --- a/versions.cfg +++ b/versions.cfg @@ -14,7 +14,7 @@ extends = https://zopefoundation.github.io/Zope/releases/5.11.1/versions.cfg # Basics # !! keep in sync with requirements.txt !! pip = 24.3.1 -setuptools = 75.3.0 +setuptools = 75.6.0 wheel = 0.45.1 zc.buildout = 3.3 @@ -22,6 +22,10 @@ zc.buildout = 3.3 nt-svcutils = 2.13.0 # OVERRIDES +packaging = 24.2 +zope.configuration = 6.0 +waitress = 3.0.2 +webtest = 3.0.2 # CORE PLONE. # These packages are what you get when installing Plone plus test dependencies, @@ -47,7 +51,7 @@ plone.app.intid = 2.0.0 plone.app.iterate = 5.0.5 plone.app.layout = 4.1.1 plone.app.linkintegrity = 4.0.6 -plone.app.locales = 6.0.24 +plone.app.locales = 6.0.25 plone.app.lockingbehavior = 2.0.1 plone.app.multilingual = 7.0.4 plone.app.portlets = 5.0.7 @@ -138,7 +142,7 @@ collective.monkeypatcher = 1.2.2 collective.recipe.omelette = 1.1.0 collective.recipe.vscode = 0.1.9 collective.xmltestreport = 2.0.2 -icalendar = 5.0.12 +icalendar = 5.0.13 Products.DateRecurringIndex = 3.0.1 robotsuite = 2.3.2 @@ -147,34 +151,34 @@ robotsuite = 2.3.2 # and are managed by the Zope/ZODB/z3c/repoze communities, # which are close to Plone. five.customerize = 3.0.0 -Products.CMFCore = 3.5 +Products.CMFCore = 3.6 Products.CMFUid = 4.2 Products.DCWorkflow = 3.0 -Products.ExternalMethod = 5.0 -Products.GenericSetup = 3.0.2 +Products.ExternalMethod = 6.0 +Products.GenericSetup = 4.0 Products.MailHost = 5.2 Products.PluggableAuthService = 3.0 Products.PluginRegistry = 2.0 -Products.PythonScripts = 5.0 +Products.PythonScripts = 5.1 Products.Sessions = 5.0 Products.SiteErrorLog = 6.0 Products.StandardCacheManagers = 5.0 Products.ZopeVersionControl = 4.1 repoze.xmliter = 1.0b1 z3c.caching = 3.0 -z3c.form = 4.3 +z3c.form = 5.1 z3c.formwidget.query = 2.0.0 z3c.objpath = 2.0 z3c.relationfield = 2.0.0 z3c.zcmlhook = 2.0 -zc.relation = 2.0 -zdaemon = 5.0 +zc.relation = 2.1 +zdaemon = 5.1 ZEO = 6.0.0 ZODB3 = 3.11.0 zodbupdate = 2.0 zope.app.locales = 5.0 zope.componentvocabulary = 2.3.0 -zope.copy = 4.3 +zope.copy = 5.0 zope.intid = 5.0 zope.keyreference = 6.0 zope.ramcache = 3.0 @@ -184,43 +188,43 @@ zope.sendmail = 6.2 # These packages are what you get when installing Plone and its tests, # but are NOT managed by closely related communities. async-generator = 1.10 -attrs = 23.2.0 +attrs = 24.2.0 backports.cached-property = 1.0.2 -cryptography = 43.0.1 +cryptography = 44.0.0 click = 8.1.7 cssselect = 1.2.0 decorator = 5.1.1 -exceptiongroup = 1.2.0 +exceptiongroup = 1.2.2 feedparser = 6.0.11 furl = 2.1.3 -future = 0.18.3 -gunicorn = 21.2.0 +future = 1.0.0 +gunicorn = 23.0.0 h11 = 0.14.0 -importlib-resources = 5.13.0 -jsonschema = 4.21.1 -jsonschema-specifications = 2023.12.1 +importlib-resources = 6.4.5 +jsonschema = 4.23.0 +jsonschema-specifications = 2024.10.1 jeepney = 0.8.0 -lxml = 5.2.1 -lxml-html-clean = 0.1.1 -manuel = 1.12.4 -Markdown = 3.5.2 +lxml = 5.3.0 +lxml-html-clean = 0.4.1 +manuel = 1.13.0 +Markdown = 3.7 mock = 5.1.0 orderedmultidict = 1.0.1 outcome = 1.3.0post0 overrides = 7.7.0 piexif = 1.1.3 -Pillow = 9.5.0 -prompt-toolkit = 3.0.47 +Pillow = 11.0.0 +prompt-toolkit = 3.0.48 py = 1.11.0 PyJWT = 2.8.0 -pyOpenSSL = 24.1.0 +pyOpenSSL = 24.3.0 pyrsistent = 0.20.0 PySocks = 1.7.1 -python-dateutil = 2.8.2 +python-dateutil = 2.9.0.post0 python-dotenv = 1.0.1 -PyYAML = 6.0.1 -referencing = 0.33.0 -responses = 0.24.1 +PyYAML = 6.0.2 +referencing = 0.35.1 +responses = 0.25.3 robotframework = 6.0.2 robotframework-assertion-engine = 3.0.3 @@ -235,31 +239,27 @@ robotframework-selenium2screenshots = 0.8.1 robotframework-seleniumlibrary = 6.1.3 robotframework-seleniumtestability = 2.1.0 -rpds-py = 0.13.2 +rpds-py = 0.22.3 SecretStorage = 3.3.3 selenium = 4.9.1 sgmllib3k = 1.0.0 -simplejson = 3.19.2 +simplejson = 3.19.3 sniffio = 1.3.1 sortedcontainers = 2.4.0 toml = 0.10.2 -trio = 0.24.0 +trio = 0.27.0 trio-websocket = 0.11.1 types-PyYAML = 6.0.12.10 types-toml = 0.10.8.5 -typing-extensions = 4.9.0 +typing-extensions = 4.12.2 Unidecode = 1.3.8 urllib3-secure-extra = 0.1.0 -watchdog = 3.0.0 +watchdog = 6.0.0 wcwidth = 0.2.13 webresource = 1.2 -wrapt = 1.16.0 +wrapt = 1.17.0 wsproto = 1.2.0 -[versions:python38] -backports.zoneinfo = 0.2.1 -pkgutil-resolve-name = 1.3.10 - [versionannotations] # keep this alphabetical please selenium = From d18dd5be3daa1743a7d2643779fd9198d2350fe0 Mon Sep 17 00:00:00 2001 From: Maurits van Rees Date: Tue, 10 Dec 2024 23:31:07 +0100 Subject: [PATCH 2/4] Pin backports.tarfile on Python 3.9 and 3.10. I don't see which other package is pulling this in. That also makes it hard to know for which Python versions this extra pin is needed. --- versions.cfg | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/versions.cfg b/versions.cfg index 61eba9bbe2..a756b9fc7a 100644 --- a/versions.cfg +++ b/versions.cfg @@ -260,6 +260,12 @@ webresource = 1.2 wrapt = 1.17.0 wsproto = 1.2.0 +[versions:python39] +backports.tarfile = 1.2.0 + +[versions:python310] +backports.tarfile = 1.2.0 + [versionannotations] # keep this alphabetical please selenium = From c7bee7de9baf4303f26984ff8aa4b537db5e1ea9 Mon Sep 17 00:00:00 2001 From: Maurits van Rees Date: Tue, 10 Dec 2024 23:33:21 +0100 Subject: [PATCH 3/4] Pin backports.tarfile on Python 3.11 as well. Otherwise it fails: https://github.com/plone/buildout.coredev/actions/runs/12265863837/job/34222828526?pr=975 --- versions.cfg | 3 +++ 1 file changed, 3 insertions(+) diff --git a/versions.cfg b/versions.cfg index a756b9fc7a..cd7a497fde 100644 --- a/versions.cfg +++ b/versions.cfg @@ -266,6 +266,9 @@ backports.tarfile = 1.2.0 [versions:python310] backports.tarfile = 1.2.0 +[versions:python311] +backports.tarfile = 1.2.0 + [versionannotations] # keep this alphabetical please selenium = From ac49c6a4c992d65d9a11f82eda738d6afecb7be8 Mon Sep 17 00:00:00 2001 From: Maurits van Rees Date: Tue, 10 Dec 2024 23:42:22 +0100 Subject: [PATCH 4/4] Pin docutils on Python 3.9 to override the Zope pin. --- versions.cfg | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/versions.cfg b/versions.cfg index cd7a497fde..83eaba6de8 100644 --- a/versions.cfg +++ b/versions.cfg @@ -262,6 +262,7 @@ wsproto = 1.2.0 [versions:python39] backports.tarfile = 1.2.0 +docutils = 0.21.2 [versions:python310] backports.tarfile = 1.2.0 @@ -273,3 +274,6 @@ backports.tarfile = 1.2.0 # keep this alphabetical please selenium = robotframework-seleniumlibrary 6.1.0 is incompatible with 4.10.0. See https://github.com/robotframework/SeleniumLibrary/issues/1835 +docutils = + On python39 Zope pins docutils to 0.20.1 because Sphinx <8 requires docutils <0.21 (and Spinx 8 requires Python 3.10+). + But we pull in readme-renderer>=35.0 which depends on docutils>=0.21.2.