diff --git a/.meta.toml b/.meta.toml index d01daeef97..45294331e3 100644 --- a/.meta.toml +++ b/.meta.toml @@ -35,6 +35,7 @@ testenv-deps = [ "# universal2 mode instead of architecture-specific. These dependencies", "# must be installed separately, zc.buildout is incompatible with the", "# universal2 mode and cannot install them itself.", + "universal2: -c {toxinidir}/constraints.txt", "universal2: zope.interface", "universal2: zope.security", "universal2: zope.container", diff --git a/constraints.txt b/constraints.txt index 51ed120c5a..8b182d23f1 100644 --- a/constraints.txt +++ b/constraints.txt @@ -1,7 +1,7 @@ -AccessControl==6.3 -Acquisition==5.2 +AccessControl==7.0 +Acquisition==6.0 AuthEncoding==5.0 -BTrees==5.2 +BTrees==6.0 Chameleon==4.4.4; python_version == '3.8' Chameleon==4.4.4; python_version > '3.8' DateTime==5.5 @@ -10,7 +10,7 @@ ExtensionClass==5.1 MultiMapping==5.0 Paste==3.10.1 PasteDeploy==3.1.0 -Persistence==4.1 +Persistence==5.0 RestrictedPython==7.1 WSGIProxy2==0.5.1 WebOb==1.8.7 @@ -21,7 +21,7 @@ Zope2==4.0 beautifulsoup4==4.12.3 cffi==1.16.0 multipart==0.2.4 -persistent==5.2 +persistent==6.0 pycparser==2.22 python-gettext==5.0 pytz==2024.1 @@ -34,7 +34,7 @@ z3c.pt==4.3 zExceptions==5.0 zc.lockfile==3.0.post1 zc.recipe.egg==2.0.7 -zodbpickle==3.3 +zodbpickle==4.0 zope.annotation==5.0 zope.browser==3.0 zope.browsermenu==5.0 @@ -66,7 +66,7 @@ zope.proxy==5.2 zope.ptresource==5.0 zope.publisher==7.0 zope.schema==7.0.1 -zope.security==6.2 +zope.security==7.0 zope.sequencesort==5.0 zope.site==5.0 zope.size==5.0 diff --git a/requirements-full.txt b/requirements-full.txt index df051186e5..05daad6d43 100644 --- a/requirements-full.txt +++ b/requirements-full.txt @@ -1,8 +1,8 @@ -e git+https://github.com/zopefoundation/Zope.git@master#egg=Zope -AccessControl==6.3 -Acquisition==5.2 +AccessControl==7.0 +Acquisition==6.0 AuthEncoding==5.0 -BTrees==5.2 +BTrees==6.0 Chameleon==4.4.4; python_version == '3.8' Chameleon==4.4.4; python_version > '3.8' DateTime==5.5 @@ -11,7 +11,7 @@ ExtensionClass==5.1 MultiMapping==5.0 Paste==3.10.1 PasteDeploy==3.1.0 -Persistence==4.1 +Persistence==5.0 RestrictedPython==7.1 WSGIProxy2==0.5.1 WebOb==1.8.7 @@ -22,7 +22,7 @@ Zope2==4.0 beautifulsoup4==4.12.3 cffi==1.16.0 multipart==0.2.4 -persistent==5.2 +persistent==6.0 pycparser==2.22 python-gettext==5.0 pytz==2024.1 @@ -35,7 +35,7 @@ z3c.pt==4.3 zExceptions==5.0 zc.lockfile==3.0.post1 zc.recipe.egg==2.0.7 -zodbpickle==3.3 +zodbpickle==4.0 zope.annotation==5.0 zope.browser==3.0 zope.browsermenu==5.0 @@ -67,7 +67,7 @@ zope.proxy==5.2 zope.ptresource==5.0 zope.publisher==7.0 zope.schema==7.0.1 -zope.security==6.2 +zope.security==7.0 zope.sequencesort==5.0 zope.site==5.0 zope.size==5.0 diff --git a/tox.ini b/tox.ini index 67a5283340..27ff40a780 100644 --- a/tox.ini +++ b/tox.ini @@ -25,6 +25,7 @@ deps = # universal2 mode instead of architecture-specific. These dependencies # must be installed separately, zc.buildout is incompatible with the # universal2 mode and cannot install them itself. + universal2: -c {toxinidir}/constraints.txt universal2: zope.interface universal2: zope.security universal2: zope.container diff --git a/versions-prod.cfg b/versions-prod.cfg index 56edc8103c..f630e925b7 100644 --- a/versions-prod.cfg +++ b/versions-prod.cfg @@ -4,10 +4,10 @@ [versions] Zope = Zope2 = 4.0 -AccessControl = 6.3 -Acquisition = 5.2 +AccessControl = 7.0 +Acquisition = 6.0 AuthEncoding = 5.0 -BTrees = 5.2 +BTrees = 6.0 Chameleon = 4.4.4 DateTime = 5.5 DocumentTemplate = 4.6 @@ -15,7 +15,7 @@ ExtensionClass = 5.1 MultiMapping = 5.0 Paste = 3.10.1 PasteDeploy = 3.1.0 -Persistence = 4.1 +Persistence = 5.0 RestrictedPython = 7.1 WebTest = 3.0.0 WSGIProxy2 = 0.5.1 @@ -25,7 +25,7 @@ ZODB = 6.0 beautifulsoup4 = 4.12.3 cffi = 1.16.0 multipart = 0.2.4 -persistent = 5.2 +persistent = 6.0 pycparser = 2.22 python-gettext = 5.0 pytz = 2024.1 @@ -38,7 +38,7 @@ z3c.pt = 4.3 zExceptions = 5.0 zc.lockfile = 3.0.post1 zc.recipe.egg = 2.0.7 -zodbpickle = 3.3 +zodbpickle = 4.0 zope.annotation = 5.0 zope.browser = 3.0 zope.browsermenu = 5.0 @@ -70,7 +70,7 @@ zope.proxy = 5.2 zope.ptresource = 5.0 zope.publisher = 7.0 zope.schema = 7.0.1 -zope.security = 6.2 +zope.security = 7.0 zope.sequencesort = 5.0 zope.site = 5.0 zope.size = 5.0