Update to ZCatalog 5.2 and set branches for packages those master is …

…Zope 5 only.
zopefoundation · Oct 9, 2020 · 6e96a9a · 6e96a9a
1 parent 58ffdf5
commit 6e96a9a
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 6 deletions.
diff --git a/constraints.txt b/constraints.txt
@@ -12,7 +12,7 @@ Paste==3.4.3
 PasteDeploy==2.1.0
 Persistence==3.0
 Products.BTreeFolder2==4.2
-Products.ZCatalog==5.1
+Products.ZCatalog==5.2
 Record==3.5
 RestrictedPython==5.0
 WSGIProxy2==0.4.6

diff --git a/requirements-full.txt b/requirements-full.txt
@@ -13,7 +13,7 @@ Paste==3.4.3
 PasteDeploy==2.1.0
 Persistence==3.0
 Products.BTreeFolder2==4.2
-Products.ZCatalog==5.1
+Products.ZCatalog==5.2
 Record==3.5
 RestrictedPython==5.0
 WSGIProxy2==0.4.6

diff --git a/sources.cfg b/sources.cfg
@@ -4,7 +4,7 @@ github_push = git@github.com:zopefoundation
 
 [sources]
 # Zope-specific
-AccessControl = git ${remotes:github}/AccessControl pushurl=${remotes:github_push}/AccessControl
+AccessControl = git ${remotes:github}/AccessControl pushurl=${remotes:github_push}/AccessControl branch=4.x
 Acquisition = git ${remotes:github}/Acquisition pushurl=${remotes:github_push}/Acquisition
 AuthEncoding = git ${remotes:github}/AuthEncoding pushurl=${remotes:github_push}/AuthEncoding
 DateTime = git ${remotes:github}/DateTime pushurl=${remotes:github_push}/DateTime
@@ -23,7 +23,7 @@ Missing = git ${remotes:github}/Missing pushurl=${remotes:github_push}/Missing
 Products.BTreeFolder2 = git ${remotes:github}/Products.BTreeFolder2 pushurl=${remotes:github_push}/Products.BTreeFolder2
 Products.MailHost = git ${remotes:github}/Products.MailHost pushurl=${remotes:github_push}/Products.MailHost
 Products.PythonScripts = git ${remotes:github}/Products.PythonScripts pushurl=${remotes:github_push}/Products.PythonScripts
-Products.ZCatalog = git ${remotes:github}/Products.ZCatalog pushurl=${remotes:github_push}/Products.ZCatalog
+Products.ZCatalog = git ${remotes:github}/Products.ZCatalog pushurl=${remotes:github_push}/Products.ZCatalog branch=5.x
 Products.Sessions = git ${remotes:github}/Products.Sessions pushurl=${remotes:github_push}/Products.Sessions
 Products.TemporaryFolder = git ${remotes:github}/Products.TemporaryFolder pushurl=${remotes:github_push}/Products.TemporaryFolder
 Products.ZODBMountPoint = git ${remotes:github}/Products.ZODBMountPoint pushurl=${remotes:github_push}/Products.ZODBMountPoint

diff --git a/versions-prod.cfg b/versions-prod.cfg
@@ -7,7 +7,6 @@ Zope2 = 4.0
 # AccessControl 5+ no longer supports Zope 4.
 AccessControl = 4.2
 Acquisition = 4.6
-# AuthEncoding 5+ requires Python 3
 AuthEncoding = 4.2
 BTrees = 4.7.2
 Chameleon = 3.8.1
@@ -21,7 +20,7 @@ PasteDeploy = 2.1.0
 Persistence = 3.0
 Products.BTreeFolder2 = 4.2
 # ZCatalog 6+ no longer supports Zope 4.
-Products.ZCatalog = 5.1
+Products.ZCatalog = 5.2
 Record = 3.5
 RestrictedPython = 5.0
 WSGIProxy2 = 0.4.6