Skip to content

Commit

Permalink
Take over versions from 6.1 branch.
Browse files Browse the repository at this point in the history
  • Loading branch information
mauritsvanrees committed Dec 18, 2024
1 parent c0b7926 commit f510202
Show file tree
Hide file tree
Showing 10 changed files with 130 additions and 202 deletions.
4 changes: 2 additions & 2 deletions constraints-ecosystem.txt
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
collective.z3cform.datagridfield==3.0.2
collective.z3cform.datagridfield==3.0.3
plone.app.blocks==7.0.1
plone.app.debugtoolbar==1.4.0
plone.app.drafts==2.0.0
plone.app.jquerytools==1.9.5
plone.app.mosaic==3.2.0a7
plone.app.mosaic==3.2.0b1
plone.app.standardtiles==3.1.4
plone.app.tiles==4.0.1
plone.formwidget.autocomplete==1.4.1
Expand Down
12 changes: 6 additions & 6 deletions constraints-extra.txt
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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
Expand Down
180 changes: 49 additions & 131 deletions constraints.txt
Original file line number Diff line number Diff line change
@@ -1,120 +1,38 @@
###############################################################################
# begin constraints from: https://zopefoundation.github.io/Zope/releases/5.11/constraints.txt

AccessControl==7.1
Acquisition==6.1
AuthEncoding==5.0
BTrees==6.1
Chameleon==4.4.4; python_version == '3.8'
Chameleon==4.4.4; python_version > '3.8'
DateTime==5.5
DocumentTemplate==4.6
ExtensionClass==6.0
MultiMapping==5.0
Paste==3.10.1
PasteDeploy==3.1.0
Persistence==5.1
RestrictedPython==7.4
WSGIProxy2==0.5.1
WebOb==1.8.8
WebTest==3.0.1
ZConfig==4.1
ZODB==6.0
Zope2==4.0
beautifulsoup4==4.12.3
cffi==1.17.1
multipart==0.2.5
persistent==6.1
pycparser==2.22
python-gettext==5.0
pytz==2024.2
roman==4.2
six==1.16.0
soupsieve==2.6
transaction==5.0
# waitress==3.0.0 -> mxdev disabled (override)
z3c.pt==4.4
zExceptions==5.0
zc.lockfile==3.0.post1
zc.recipe.egg==2.0.7
zodbpickle==4.1.1
zope.annotation==5.0
zope.browser==3.0
zope.browsermenu==5.0
zope.browserpage==5.0
zope.browserresource==5.1
zope.cachedescriptors==5.0
zope.component==6.0
zope.configuration==5.0.1
zope.container==6.1
zope.contentprovider==6.0
zope.contenttype==5.1
zope.datetime==5.0.0
zope.deferredimport==5.0
zope.deprecation==5.0
zope.dottedname==6.0
zope.event==5.0
zope.exceptions==5.1
zope.filerepresentation==6.0
zope.globalrequest==2.0
zope.hookable==7.0
zope.i18n==5.2
zope.i18nmessageid==7.0
# zope.interface==7.1.0 -> mxdev disabled (override)
zope.lifecycleevent==5.0
zope.location==5.0
zope.pagetemplate==5.1
zope.processlifetime==3.0
zope.proxy==6.1
zope.ptresource==5.0
zope.publisher==7.1
zope.schema==7.0.1
zope.security==7.3
zope.sequencesort==5.0
zope.site==5.0
zope.size==5.0
zope.structuredtext==5.0
zope.tal==5.0.1
zope.tales==6.0
zope.testbrowser==7.0
zope.testing==5.0.1
zope.traversing==5.0
zope.viewlet==5.0

# end constraints from: 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
certifi==2024.12.14
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
Plone==6.1.0b1
plone.alterego==2.0.1
plone.api==2.2.3
plone.api==2.2.4
plone.app.caching==4.0.0
plone.app.content==4.1.7
plone.app.contentlisting==3.0.5
plone.app.contentmenu==3.0.6
plone.app.contentrules==5.0.4
plone.app.contenttypes==4.0.1
plone.app.contentrules==5.0.5
plone.app.contenttypes==4.0.3
plone.app.customerize==2.0.1
plone.app.dexterity==4.0.2
plone.app.discussion==5.0.0a2
plone.app.event==5.1.8
plone.app.event==5.2.0
plone.app.i18n==4.0.1
plone.app.intid==2.0.0
plone.app.iterate==6.0.1
plone.app.layout==5.0.1
plone.app.linkintegrity==4.0.6
plone.app.locales==6.0.25
plone.app.locales==6.0.27
plone.app.lockingbehavior==2.0.1
plone.app.multilingual==8.1.3
plone.app.multilingual==8.2.0
plone.app.portlets==6.0.0
plone.app.querystring==2.1.2
plone.app.redirector==3.0.3
Expand All @@ -123,16 +41,16 @@ plone.app.relationfield==4.0.0
plone.app.robotframework==2.1.3
plone.app.testing==7.1.0
plone.app.textfield==3.0.0
plone.app.theming==5.0.10
plone.app.theming==5.0.11
plone.app.upgrade==3.1.7
plone.app.users==3.0.7
plone.app.users==3.0.9
plone.app.uuid==2.2.3
plone.app.versioningbehavior==2.0.3
plone.app.viewletmanager==4.0.3
plone.app.vocabularies==6.0.1
plone.app.widgets==5.0.1
plone.app.workflow==5.0.3
plone.app.z3cform==4.7.0
plone.app.z3cform==4.7.1
plone.autoform==2.0.2
plone.autoinclude==1.0.1
plone.base==2.0.2
Expand All @@ -144,7 +62,7 @@ plone.caching==2.0.1
plone.classicui==1.0.0a1
plone.contentrules==3.0.1
plone.dexterity==3.0.6
plone.distribution==3.0.0a1
plone.distribution==3.0.0b1
plone.event==2.0.2
plone.exportimport==1.0.0a8
plone.folder==4.0.1
Expand All @@ -153,38 +71,38 @@ plone.formwidget.recurrence==3.0.4
plone.i18n==5.0.2
plone.indexer==2.0.1
plone.intelligenttext==4.0.1
plone.keyring==4.0.1
plone.keyring==4.0.2
plone.locking==3.0.1
plone.memoize==3.0.2
plone.namedfile==6.3.1
plone.namedfile==6.4.0
plone.outputfilters==5.0.4
plone.portlet.collection==4.0.3
plone.portlet.static==4.0.2
plone.portlet.static==4.0.3
plone.portlets==3.0.1
plone.protect==5.0.2
plone.recipe.zope2instance==7.1.1
plone.protect==5.0.3
plone.recipe.zope2instance==7.1.2
plone.registry==2.0.1
plone.resource==3.0.2
plone.resourceeditor==4.0.1
plone.rest==4.1.3
plone.restapi==9.8.3
plone.restapi==9.8.5
plone.rfc822==3.0.1
plone.scale==4.1.3
plone.schema==2.0.1
plone.schemaeditor==4.0.6
plone.schemaeditor==4.0.7
plone.session==4.0.4
plone.staticresources==2.2.0b1
plone.staticresources==2.2.0b3
plone.stringinterp==2.0.2
plone.subrequest==2.0.5
plone.supermodel==2.0.4
plone.testing==9.0.2
plone.theme==4.0.1
plone.testing==9.0.3
plone.theme==4.0.2
plone.tiles==2.3.1
plone.transformchain==3.0.1
plone.uuid==2.0.1
plone.volto==5.0.0b1
plone.volto==5.0.1
plone.z3cform==2.0.3
plonetheme.barceloneta==3.2.0
plonetheme.barceloneta==3.2.1
Products.CMFDiffTool==4.0.4
Products.CMFDynamicViewFTI==7.0.2
Products.CMFEditions==4.0.4
Expand All @@ -194,11 +112,11 @@ Products.ExtendedPathIndex==4.0.1
Products.isurlinportal==3.0.0
Products.MimetypesRegistry==3.0.1
Products.PlonePAS==8.0.4
Products.PortalTransforms==4.1.0
Products.PortalTransforms==4.1.1
Products.statusmessages==5.0.6
pytest-plone==0.5.0
collective.MockMailHost==3.0.0
collective.monkeypatcher==1.2.1
collective.monkeypatcher==1.2.2
collective.recipe.omelette==1.1.0
collective.recipe.vscode==0.1.9
collective.xmltestreport==2.0.2
Expand All @@ -210,7 +128,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
Expand All @@ -224,7 +142,7 @@ z3c.caching==3.0
z3c.form==5.1
z3c.formwidget.query==2.0.0
z3c.objpath==2.0
z3c.relationfield==1.0
z3c.relationfield==2.0.0
z3c.unconfigure==2.1
z3c.zcmlhook==2.0
zc.relation==2.0
Expand All @@ -236,7 +154,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
Expand All @@ -249,9 +167,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
Expand All @@ -268,17 +186,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
Expand All @@ -289,8 +207,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
Expand All @@ -305,7 +223,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
Expand All @@ -316,7 +234,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
Expand All @@ -335,9 +253,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"
7 changes: 5 additions & 2 deletions mx.ini
Original file line number Diff line number Diff line change
Expand Up @@ -17,5 +17,8 @@ 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
certifi==2024.12.14
packaging==24.2
zope.configuration==6.0
waitress==3.0.2
webtest==3.0.2
2 changes: 1 addition & 1 deletion mxsources.ini
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ branch = master
[plone.api]
url = ${settings:plone}/plone.api.git
pushurl = ${settings:plone_push}/plone.api.git
branch = master
branch = main

[plone.app.caching]
url = ${settings:plone}/plone.app.caching.git
Expand Down
Loading

0 comments on commit f510202

Please sign in to comment.