From 1e8092076a5efb120d9e07912b194ec8b8b1418a Mon Sep 17 00:00:00 2001 From: Maurits van Rees Date: Fri, 6 Dec 2024 22:01:10 +0100 Subject: [PATCH] Update various versions for 6.1. --- constraints-extra.txt | 12 ++++++------ constraints.txt | 44 ++++++++++++++++++++++--------------------- mx.ini | 6 ++++-- mxcheckouts.ini | 6 ++++++ requirements.txt | 6 +++--- versions-extra.cfg | 12 ++++++------ versions.cfg | 44 ++++++++++++++++++++++--------------------- 7 files changed, 71 insertions(+), 59 deletions(-) diff --git a/constraints-extra.txt b/constraints-extra.txt index fad0a393f6..f1a81b56bc 100644 --- a/constraints-extra.txt +++ b/constraints-extra.txt @@ -1,13 +1,13 @@ -argcomplete==3.5.1 +argcomplete==3.5.2 argh==0.31.3 -bleach==6.1.0 -cachecontrol==0.14.0 -cached-property==1.5.2 +bleach==6.2.0 +cachecontrol==0.14.1 +cached-property==2.0.1 click-default-group==1.2.4 colorama==0.4.6 commonmark==0.9.1 configparser==7.1.0 -Deprecated==1.2.14 +Deprecated==1.2.15 distro==1.9.0 fancycompleter==0.9.1 filelock==3.16.1 @@ -27,7 +27,7 @@ plone.releaser==2.3.2 plone.reload==4.0.0 plone.versioncheck==1.8.2 progress==1.6 -PyGithub==2.4.0 +PyGithub==2.5.0 PyNaCl==1.5.0 pyparsing==3.2.0 pyrepl==0.9.0 diff --git a/constraints.txt b/constraints.txt index 4f56c7b047..21dc921404 100644 --- a/constraints.txt +++ b/constraints.txt @@ -1,11 +1,13 @@ --c https://zopefoundation.github.io/Zope/releases/5.11/constraints.txt -pip==24.2 -setuptools==75.2.0 -wheel==0.44.0 +-c https://zopefoundation.github.io/Zope/releases/5.11.1/constraints.txt +pip==24.3.1 +setuptools==75.6.0 +wheel==0.45.1 zc.buildout==3.3 nt-svcutils==2.13.0 -zope.interface==7.1.1 -waitress==3.0.1 +packaging==24.2 +zope.configuration==6.0 +waitress==3.0.2 +webtest==3.0.2 borg.localrole==3.1.11 diazo==2.0.2 five.intid==2.0.0 @@ -125,7 +127,7 @@ Products.CMFCore==3.6 Products.CMFUid==4.2 Products.DCWorkflow==3.0 Products.ExternalMethod==6.0 -Products.GenericSetup==3.0.2 +Products.GenericSetup==4.0 Products.MailHost==5.2 Products.PluggableAuthService==3.0 Products.PluginRegistry==2.0 @@ -151,7 +153,7 @@ 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.pytestlayer==8.2 @@ -164,9 +166,9 @@ backports.tarfile==1.2.0 build==1.2.2post1 check-manifest==0.50 click==8.1.7 -cmarkgfm==2024.1.14 -coverage==7.6.4 -cryptography==43.0.3 +cmarkgfm==2024.11.20 +coverage==7.6.9 +cryptography==44.0.0 cssselect==1.2.0 decorator==5.1.1 exceptiongroup==1.2.2 @@ -183,17 +185,17 @@ jaraco.functools==4.1.0 jeepney==0.8.0 jsonschema==4.23.0 jsonschema-specifications==2024.10.1 -keyring==25.4.1 +keyring==25.5.0 lxml==5.3.0 -lxml-html-clean==0.3.1 -manuel==1.12.4 +lxml-html-clean==0.4.1 +manuel==1.13.0 Markdown==3.7 markdown-it-py==3.0.0 mdurl==0.1.2 mock==5.1.0 more-itertools==10.5.0 natsort==8.4.0 -nh3==0.2.18 +nh3==0.2.19 orderedmultidict==1.0.1 outcome==1.3.0post0 overrides==7.7.0 @@ -204,8 +206,8 @@ pkginfo==1.10.0 pluggy==1.5.0 prompt-toolkit==3.0.48 py==1.11.0 -PyJWT==2.9.0 -pyOpenSSL==24.2.1 +PyJWT==2.10.1 +pyOpenSSL==24.3.0 pyproject-hooks==1.2.0 pyroma==4.2 pyrsistent==0.20.0 @@ -220,7 +222,7 @@ referencing==0.35.1 requests-toolbelt==1.0.0 responses==0.25.3 rfc3986==2.0.0 -rich==13.9.2 +rich==13.9.4 robotframework==6.0.2 robotframework-assertion-engine==3.0.3 robotframework-browser==18.9.1 @@ -231,7 +233,7 @@ robotframework-selenium2library==3.0.0 robotframework-selenium2screenshots==0.8.1 robotframework-seleniumlibrary==6.1.3 robotframework-seleniumtestability==2.1.0 -rpds-py==0.20.0 +rpds-py==0.22.3 SecretStorage==3.3.3 seedir==0.5.0 selenium==4.9.1 @@ -250,9 +252,9 @@ types-toml==0.10.8.5 typing-extensions==4.12.2 Unidecode==1.3.8 urllib3-secure-extra==0.1.0 -watchdog==5.0.3 +watchdog==6.0.0 wcwidth==0.2.13 webresource==1.2 -wrapt==1.16.0 +wrapt==1.17.0 wsproto==1.2.0 pywin32-ctypes==0.2.3; platform_system == "Windows" diff --git a/mx.ini b/mx.ini index 85723ae7ae..aaebfe318e 100644 --- a/mx.ini +++ b/mx.ini @@ -17,5 +17,7 @@ include = mxtests.ini version-overrides = # You MUST manually keep this in sync with the OVERRIDES in versions.cfg. - zope.interface==7.1.1 - waitress==3.0.1 + packaging==24.2 + zope.configuration==6.0 + waitress==3.0.2 + webtest==3.0.2 diff --git a/mxcheckouts.ini b/mxcheckouts.ini index dc83438544..8138032186 100644 --- a/mxcheckouts.ini +++ b/mxcheckouts.ini @@ -18,3 +18,9 @@ use = true [Products.CMFPlone] use = true + +[plone.restapi] +use = true + +[plone.app.theming] +use = true diff --git a/requirements.txt b/requirements.txt index f9bcbbca87..c9ef752144 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,6 +1,6 @@ -pip==24.2 -setuptools==75.2.0 -wheel==0.44.0 +pip==24.3.1 +setuptools==75.6.0 +wheel==0.45.1 zc.buildout==3.3 # Windows specific down here (has to be installed here, fails in buildout) diff --git a/versions-extra.cfg b/versions-extra.cfg index 6ff65c8b67..3bc1bb5319 100644 --- a/versions-extra.cfg +++ b/versions-extra.cfg @@ -3,16 +3,16 @@ # that pull in ever more dependencies. # Note: version pins in this file can be removed at any time. [versions] -argcomplete = 3.5.1 +argcomplete = 3.5.2 argh = 0.31.3 -bleach = 6.1.0 -cachecontrol = 0.14.0 -cached-property = 1.5.2 +bleach = 6.2.0 +cachecontrol = 0.14.1 +cached-property = 2.0.1 click-default-group = 1.2.4 colorama = 0.4.6 commonmark = 0.9.1 configparser = 7.1.0 -Deprecated = 1.2.14 +Deprecated = 1.2.15 distro = 1.9.0 fancycompleter = 0.9.1 filelock = 3.16.1 @@ -32,7 +32,7 @@ plone.releaser = 2.3.2 plone.reload = 4.0.0 plone.versioncheck = 1.8.2 progress = 1.6 -PyGithub = 2.4.0 +PyGithub = 2.5.0 PyNaCl = 1.5.0 pyparsing = 3.2.0 pyrepl = 0.9.0 diff --git a/versions.cfg b/versions.cfg index 5c8deefc36..cbb1ec0315 100644 --- a/versions.cfg +++ b/versions.cfg @@ -7,15 +7,15 @@ # 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.11/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 = 75.2.0 -wheel = 0.44.0 +pip = 24.3.1 +setuptools = 75.6.0 +wheel = 0.45.1 zc.buildout = 3.3 # windows specific @@ -25,8 +25,10 @@ nt-svcutils = 2.13.0 # You MUST manually keep this in sync with the version-overrides in mx.ini. # zope.interface 7 until 7.1.0 can give segmentation faults. # See https://github.com/plone/buildout.coredev/issues/962 -zope.interface = 7.1.1 -waitress = 3.0.1 +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, @@ -159,7 +161,7 @@ Products.CMFCore = 3.6 Products.CMFUid = 4.2 Products.DCWorkflow = 3.0 Products.ExternalMethod = 6.0 -Products.GenericSetup = 3.0.2 +Products.GenericSetup = 4.0 Products.MailHost = 5.2 Products.PluggableAuthService = 3.0 Products.PluginRegistry = 2.0 @@ -185,7 +187,7 @@ 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.pytestlayer = 8.2 @@ -202,9 +204,9 @@ backports.tarfile = 1.2.0 build = 1.2.2post1 check-manifest = 0.50 click = 8.1.7 -cmarkgfm = 2024.1.14 -coverage = 7.6.4 -cryptography = 43.0.3 +cmarkgfm = 2024.11.20 +coverage = 7.6.9 +cryptography = 44.0.0 cssselect = 1.2.0 decorator = 5.1.1 exceptiongroup = 1.2.2 @@ -221,17 +223,17 @@ jaraco.functools = 4.1.0 jeepney = 0.8.0 jsonschema = 4.23.0 jsonschema-specifications = 2024.10.1 -keyring = 25.4.1 +keyring = 25.5.0 lxml = 5.3.0 -lxml-html-clean = 0.3.1 -manuel = 1.12.4 +lxml-html-clean = 0.4.1 +manuel = 1.13.0 Markdown = 3.7 markdown-it-py = 3.0.0 mdurl = 0.1.2 mock = 5.1.0 more-itertools = 10.5.0 natsort = 8.4.0 -nh3 = 0.2.18 +nh3 = 0.2.19 orderedmultidict = 1.0.1 outcome = 1.3.0post0 overrides = 7.7.0 @@ -242,8 +244,8 @@ pkginfo = 1.10.0 pluggy = 1.5.0 prompt-toolkit = 3.0.48 py = 1.11.0 -PyJWT = 2.9.0 -pyOpenSSL = 24.2.1 +PyJWT = 2.10.1 +pyOpenSSL = 24.3.0 pyproject-hooks = 1.2.0 pyroma = 4.2 pyrsistent = 0.20.0 @@ -258,7 +260,7 @@ referencing = 0.35.1 requests-toolbelt = 1.0.0 responses = 0.25.3 rfc3986 = 2.0.0 -rich = 13.9.2 +rich = 13.9.4 robotframework = 6.0.2 # robotframework >= 6.1 is only supported with robotframwork-lsp >= 1.11.0, # but https://github.com/robocorp/robotframework-lsp/issues/947 @@ -271,7 +273,7 @@ robotframework-selenium2library = 3.0.0 robotframework-selenium2screenshots = 0.8.1 robotframework-seleniumlibrary = 6.1.3 robotframework-seleniumtestability = 2.1.0 -rpds-py = 0.20.0 +rpds-py = 0.22.3 SecretStorage = 3.3.3 seedir = 0.5.0 selenium = 4.9.1 @@ -290,10 +292,10 @@ types-toml = 0.10.8.5 typing-extensions = 4.12.2 Unidecode = 1.3.8 urllib3-secure-extra = 0.1.0 -watchdog = 5.0.3 +watchdog = 6.0.0 wcwidth = 0.2.13 webresource = 1.2 -wrapt = 1.16.0 +wrapt = 1.17.0 wsproto = 1.2.0 [versions:windows]