Merge pull request #955 from plone/maurits-move-versions-61

Move some pins from versions-extra.cfg to versions.cfg.

constraints-extra.txt

@@ -1,12 +1,9 @@
 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
 click-default-group==1.2.4
-cmarkgfm==2024.1.14
 colorama==0.4.6
 commonmark==0.9.1
 configparser==6.0.0
@@ -20,20 +17,12 @@ 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
 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
 oauthlib==3.2.2
 pdbpp==0.10.3
-pep440==0.1.2
 pep517==0.13.1
-pkginfo==1.9.6
 plone.recipe.zeoserver==3.0.2
 plone.releaser==2.3.2
 plone.reload==4.0.0
@@ -42,26 +31,14 @@ progress==1.6
 PyGithub==2.2.0
 PyNaCl==1.5.0
 pyparsing==3.1.2
-pyproject-hooks==1.0.0
 pyrepl==0.9.0
-pyroma==4.2
-readme-renderer==42.0
-requests-toolbelt==1.0.0
-rfc3986==2.0.0
-rich==13.7.1
 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
 webencodings==0.5.1
 wmctrl==0.5
 z3c.dependencychecker==2.15
 zest.pocompile==2.0.0
-zest.releaser==9.1.3
-zestreleaser.towncrier==1.3.0
 zodbverify==1.2.0
 zope.mkzeoinstance==5.1.1
 ZopeUndo==6.0

constraints.txt

@@ -142,6 +142,8 @@ z3c.zcmlhook==2.0
 zc.relation==2.0
 zdaemon==5.0
 ZEO==6.0.0
+zest.releaser==9.1.3
+zestreleaser.towncrier==1.3.0
 ZODB3==3.11.0
 zodbupdate==2.0
 zope.app.locales==5.0
@@ -155,8 +157,13 @@ zope.sendmail==6.2
 async-generator==1.10
 attrs==23.2.0
 backports.cached-property==1.0.2
-cryptography==43.0.1
+backports.tarfile==1.2.0
+build==1.2.2post1
+check-manifest==0.49
 click==8.1.7
+cmarkgfm==2024.1.14
+coverage==7.6.1
+cryptography==43.0.1
 cssselect==1.2.0
 decorator==5.1.1
 exceptiongroup==1.2.0
@@ -167,32 +174,49 @@ gunicorn==21.2.0
 h11==0.14.0
 importlib-resources==6.1.1
 iniconfig==2.0.0
+jaraco.classes==3.4.0
+jaraco.context==6.0.1
+jaraco.functools==4.1.0
+jeepney==0.8.0
 jsonschema==4.21.1
 jsonschema-specifications==2023.12.1
-jeepney==0.8.0
+keyring==25.4.1
 lxml==5.2.1
 lxml-html-clean==0.1.1
 manuel==1.12.4
 Markdown==3.5.2
+markdown-it-py==3.0.0
+mdurl==0.1.2
 mock==5.1.0
+more-itertools==10.5.0
+nh3==0.2.18
 orderedmultidict==1.0.1
 outcome==1.3.0post0
 overrides==7.7.0
+pep440==0.1.2
 piexif==1.1.3
 Pillow==10.2.0
+pkginfo==1.10.0
 pluggy==1.5.0
 prompt-toolkit==2.0.10
 py==1.11.0
 PyJWT==2.8.0
 pyOpenSSL==24.1.0
+pyproject-hooks==1.2.0
+pyroma==4.2
 pyrsistent==0.20.0
 PySocks==1.7.1
 pytest==7.4.4
+pytest-cov==5.0.0
 python-dateutil==2.8.2
 python-dotenv==1.0.1
 PyYAML==6.0.1
+readme-renderer==44.0
 referencing==0.33.0
+requests-toolbelt==1.0.0
 responses==0.24.1
+rfc3986==2.0.0
+rich==13.9.2
 robotframework==6.0.2
 robotframework-lsp==1.10.1
 robotframework-assertion-engine==2.0.0
@@ -211,8 +235,12 @@ simplejson==3.19.2
 sniffio==1.3.1
 sortedcontainers==2.4.0
 toml==0.10.2
+tomli==2.0.1
+towncrier==24.8.0
 trio==0.24.0
 trio-websocket==0.11.1
+trove-classifiers==2024.9.12
+twine==5.1.1
 types-PyYAML==6.0.12.10
 types-toml==0.10.8.5
 typing-extensions==4.9.0
@@ -223,3 +251,4 @@ wcwidth==0.2.13
 webresource==1.2
 wrapt==1.16.0
 wsproto==1.2.0
+pywin32-ctypes==0.2.3; platform_system == "Windows"

versions-extra.cfg

@@ -6,12 +6,9 @@
 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
 click-default-group = 1.2.4
-cmarkgfm = 2024.1.14
 colorama = 0.4.6
 commonmark = 0.9.1
 configparser = 6.0.0
@@ -25,20 +22,12 @@ 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
 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
 oauthlib = 3.2.2
 pdbpp = 0.10.3
-pep440 = 0.1.2
 pep517 = 0.13.1
-pkginfo = 1.9.6
 plone.recipe.zeoserver = 3.0.2
 plone.releaser = 2.3.2
 plone.reload = 4.0.0
@@ -47,26 +36,14 @@ progress = 1.6
 PyGithub = 2.2.0
 PyNaCl = 1.5.0
 pyparsing = 3.1.2
-pyproject-hooks = 1.0.0
 pyrepl = 0.9.0
-pyroma = 4.2
-readme-renderer = 42.0
-requests-toolbelt = 1.0.0
-rfc3986 = 2.0.0
-rich = 13.7.1
 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
 webencodings = 0.5.1
 wmctrl = 0.5
 z3c.dependencychecker = 2.15
 zest.pocompile = 2.0.0
-zest.releaser = 9.1.3
-zestreleaser.towncrier = 1.3.0
 zodbverify = 1.2.0
 zope.mkzeoinstance = 5.1.1
 ZopeUndo = 6.0

versions.cfg

@@ -174,6 +174,8 @@ z3c.zcmlhook = 2.0
 zc.relation = 2.0
 zdaemon = 5.0
 ZEO = 6.0.0
+zest.releaser = 9.1.3
+zestreleaser.towncrier = 1.3.0
 ZODB3 = 3.11.0
 zodbupdate = 2.0
 zope.app.locales = 5.0
@@ -191,10 +193,14 @@ zope.sendmail = 6.2
 async-generator = 1.10
 attrs = 23.2.0
 backports.cached-property = 1.0.2
-cryptography = 43.0.1
+backports.tarfile = 1.2.0
+build = 1.2.2post1
+check-manifest = 0.49
 click = 8.1.7
-cssselect = 1.2.0
+cmarkgfm = 2024.1.14
 coverage = 7.6.1
+cryptography = 43.0.1
+cssselect = 1.2.0
 decorator = 5.1.1
 exceptiongroup = 1.2.0
 feedparser = 6.0.11
@@ -204,33 +210,49 @@ gunicorn = 21.2.0
 h11 = 0.14.0
 importlib-resources = 6.1.1
 iniconfig = 2.0.0
+jaraco.classes = 3.4.0
+jaraco.context = 6.0.1
+jaraco.functools = 4.1.0
+jeepney = 0.8.0
 jsonschema = 4.21.1
 jsonschema-specifications = 2023.12.1
-jeepney = 0.8.0
+keyring = 25.4.1
 lxml = 5.2.1
 lxml-html-clean = 0.1.1
 manuel = 1.12.4
 Markdown = 3.5.2
+markdown-it-py = 3.0.0
+mdurl = 0.1.2
 mock = 5.1.0
+more-itertools = 10.5.0
+nh3 = 0.2.18
 orderedmultidict = 1.0.1
 outcome = 1.3.0post0
 overrides = 7.7.0
+pep440 = 0.1.2
 piexif = 1.1.3
 Pillow = 10.2.0
+pkginfo = 1.10.0
 pluggy = 1.5.0
 prompt-toolkit = 2.0.10
 py = 1.11.0
 PyJWT = 2.8.0
 pyOpenSSL = 24.1.0
+pyproject-hooks = 1.2.0
+pyroma = 4.2
 pyrsistent = 0.20.0
 PySocks = 1.7.1
 pytest = 7.4.4
 pytest-cov = 5.0.0
 python-dateutil = 2.8.2
 python-dotenv = 1.0.1
 PyYAML = 6.0.1
+readme-renderer = 44.0
 referencing = 0.33.0
+requests-toolbelt = 1.0.0
 responses = 0.24.1
+rfc3986 = 2.0.0
+rich = 13.9.2
 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
@@ -251,8 +273,12 @@ simplejson = 3.19.2
 sniffio = 1.3.1
 sortedcontainers = 2.4.0
 toml = 0.10.2
+tomli = 2.0.1
+towncrier = 24.8.0
 trio = 0.24.0
 trio-websocket = 0.11.1
+trove-classifiers = 2024.9.12
+twine = 5.1.1
 types-PyYAML = 6.0.12.10
 types-toml = 0.10.8.5
 typing-extensions = 4.9.0
@@ -264,6 +290,9 @@ webresource = 1.2
 wrapt = 1.16.0
 wsproto = 1.2.0
 
+[versions:windows]
+pywin32-ctypes = 0.2.3
+
 [versionannotations]
 # keep this alphabetical please
 prompt-toolkit =