Revert "Use plone.restapi 7 on Py 2, plone.restapi 8 on Py 3."

This reverts commit 1ef557e. That was supposed to be on a branch. Sorry!
plone · Nov 20, 2021 · e787935 · e787935
1 parent 1ef557e
commit e787935
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 7 deletions.
diff --git a/sources.cfg b/sources.cfg
@@ -115,8 +115,7 @@ plone.recipe.precompiler            = git ${remotes:plone}/plone.recipe.precompi
 plone.recipe.zeoserver              = git ${remotes:plone}/plone.recipe.zeoserver.git pushurl=${remotes:plone_push}/plone.recipe.zeoserver.git branch=master
 plone.recipe.zope2instance          = git ${remotes:plone}/plone.recipe.zope2instance.git pushurl=${remotes:plone_push}/plone.recipe.zope2instance.git branch=master
 plone.rest                          = git ${remotes:plone}/plone.rest.git pushurl=${remotes:plone_push}/plone.rest.git branch=1.x
-# Note: for plone.restapi we use a different branch on Python2.7.  See sources:python27.
-plone.restapi                       = git ${remotes:plone}/plone.restapi.git pushurl=${remotes:plone_push}/plone.restapi.git branch=master
+plone.restapi                       = git ${remotes:plone}/plone.restapi.git pushurl=${remotes:plone_push}/plone.restapi.git branch=7.x.x
 plone.registry                      = git ${remotes:plone}/plone.registry.git pushurl=${remotes:plone_push}/plone.registry.git branch=master
 plone.releaser                      = git ${remotes:plone}/plone.releaser.git pushurl=${remotes:plone_push}/plone.releaser.git branch=master
 plone.reload                        = git ${remotes:plone}/plone.reload.git pushurl=${remotes:plone_push}/plone.reload.git branch=master
@@ -197,9 +196,6 @@ Products.ZCatalog                   = git ${remotes:zope}/Products.ZCatalog.git
 Products.ZCTextIndex                = git ${remotes:zope}/Products.ZCTextIndex.git pushurl=${remotes:zope_push}/Products.ZCTextIndex.git branch=2.13
 Products.ZopeVersionControl         = git ${remotes:zope}/Products.ZopeVersionControl.git pushurl=${remotes:zope_push}/Products.ZopeVersionControl.git branch=master
 
-[sources:python27]
-plone.restapi                       = git ${remotes:plone}/plone.restapi.git pushurl=${remotes:plone_push}/plone.restapi.git branch=7.x.x
-
 [precompiler]
 recipe = plone.recipe.precompiler
 eggs = ${instance:eggs}

diff --git a/versions.cfg b/versions.cfg
@@ -193,7 +193,7 @@ plone.registry                        = 1.2.1
 plone.reload                          = 3.0.2
 plone.resource                        = 2.1.4
 plone.rest                            = 1.6.2
-plone.restapi                         = 8.14.0
+plone.restapi                         = 7.5.0
 plone.resourceeditor                  = 3.0.3
 plone.rfc822                          = 2.0.2
 plone.scale                           = 3.1.2
@@ -351,7 +351,6 @@ futures = 3.3.0
 keyring = 4.1.1
 markdown = 3.1.1
 mock = 3.0.5
-plone.restapi = 7.5.0
 pip = 20.3.4
 PyGithub = 1.45
 SecretStorage = 2.3.1