Merge branch '5.2' of github.com:plone/buildout.coredev into 5.2

Makefile

@@ -1,7 +1,6 @@
 SHELL := /bin/bash
 CURRENT_DIR:=$(shell dirname $(realpath $(lastword $(MAKEFILE_LIST))))
 
-
 # We like colors
 # From: https://coderwall.com/p/izxssa/colored-makefile-for-golang-projects
 RED=`tput setaf 1`
@@ -11,14 +10,6 @@ YELLOW=`tput setaf 3`
 
 all: build
 
-.PHONY: build
-build: ## Create virtualenv and run buildout
-	@echo "$(GREEN)==> Setup Virtual Env$(RESET)"
-	virtualenv -p python2 --clear .
-	bin/pip install pip --upgrade
-	bin/pip install -r requirements.txt --upgrade
-	bin/buildout
-
 # Add the following 'help' target to your Makefile
 # And add help text after each target name starting with '\#\#'
 .PHONY: help
@@ -28,6 +19,21 @@ help: ## This help message
 .PHONY: all
 all: build code-analysis test test-acceptance
 
+.PHONY: build
+build: ## Create virtualenv and run buildout
+	@echo "$(GREEN)==> Setup Virtual Env$(RESET)"
+	virtualenv -p python2 --clear .
+	bin/pip install pip --upgrade
+	bin/pip install -r requirements.txt --upgrade
+	bin/buildout
+
+.PHONY: build-py3
+build-py3:
+	virtualenv --python=python3 .
+	bin/pip install --upgrade pip
+	bin/pip install -r requirements.txt
+	bin/buildout
+
 .PHONY: clean
 clean: ## Remove old virtualenv and creates a new one
 	@echo "Clean"

README.rst

@@ -1,26 +1,3 @@
-============
-Build Status
-============
-
-Jenkins CI - Plone 5.2 - core:
-
-.. image:: http://jenkins.plone.org/job/plone-5.2-python-2.7/badge/icon
-    :target: http://jenkins.plone.org/job/plone-5.2-python-2.7/
-    :alt: Jenkins CI - Plone 5.2 - core
-
-Jenkins CI - Plone 5.2 - with archetypes:
-
-.. image:: http://jenkins.plone.org/job/plone-5.2-python-2.7-at/badge/icon
-    :target: http://jenkins.plone.org/job/plone-5.2-python-2.7-at/
-    :alt: Jenkins CI - Plone 5.2 - with Archetypes
-
-Jenkins CI - Plone 5.2 - robot framework:
-
-.. image:: http://jenkins.plone.org/job/plone-5.2-python-2.7-robot/badge/icon
-    :target: http://jenkins.plone.org/job/plone-5.2-python-2.7-robot/
-    :alt: Jenkins CI - Plone 5.2 - robot framework
-
-
 Introduction
 ============
 This is the development buildout for Plone Core.

checkouts.cfg

@@ -2,28 +2,29 @@
 always-checkout = force
 # always-checkout = false
 auto-checkout =
+# These four packages are always checkout out:
+    Plone
     plone.app.locales
     plone.app.upgrade
-    plone.app.widgets
     Products.CMFPlone
 # automatically added by mr.roboto
-    Plone
-    plone.rest
     z3c.form
-    plone.recipe.zope2instance
-    plone.restapi
+    zodbupdate
     plone.app.widgets
+    plone.app.layout
+    plone.restapi
     plone.app.robotframework
-    mockup
-    plone.app.contenttypes
-    plone.app.linkintegrity
     plone.app.discussion
-    Products.CMFDynamicViewFTI
-    plone.app.theming
-    plone.app.content
-    plone.app.portlets
-    plone.app.layout
-    plone.app.multilingual
+    plone.app.linkintegrity
+    plone.app.referenceablebehavior
     plone.app.z3cform
-    plone.formwidget.namedfile
-    plone.resource
+    plone.app.registry
+    plone.dexterity
+    plone.indexer
+    plone.app.customerize
+    plone.app.caching
+    plone.app.contenttypes
+    plone.namedfile
+    plone.z3cform
+    Products.Archetypes
+    plone.app.dexterity

core.cfg

@@ -6,14 +6,6 @@ extends =
     versions.cfg
     tests.cfg
 
-parts +=
-    instance
-    zopepy
-    packages
-    releaser
-    z3c_checkversions
-    dependencies
-
 allow-hosts =
     *.python.org
     *.plone.org
@@ -53,18 +45,32 @@ plone-user =
     admin:admin
 
 [buildout:python27]
-parts +=
+parts =
     instance
     instance-archetypes
     ploneversioncheck
+    zopepy
+    packages
+    releaser
+    z3c_checkversions
+    dependencies
 
 extensions +=
     plone.versioncheck
 
+[buildout:python3]
+parts =
+    instance
+    zopepy
+    packages
+    releaser
+    z3c_checkversions
+    dependencies
+    zodbupdate
+
 [instance]
 recipe = plone.recipe.zope2instance
 user = ${buildout:plone-user}
-wsgi = on
 eggs =
     Plone
     ${buildout:custom-eggs}
@@ -138,3 +144,9 @@ eggs = plone.versioncheck
 [dependencies]
 recipe = zc.recipe.egg
 eggs = z3c.dependencychecker
+
+[zodbupdate:python3]
+recipe = zc.recipe.egg
+eggs =
+    zodbupdate
+    ${instance:eggs}

ecosystem.cfg

@@ -10,6 +10,8 @@ auto-checkout +=
     plone.formwidget.contenttree
     plone.schemaeditor
 
+    Products.PDBDebugMode
+
 test-eggs +=
     collective.z3cform.datagridfield [test]
     five.grok [form]
@@ -30,7 +32,105 @@ eggs +=
     plone.app.dexterity[grok,relations]
     plone.app.referenceablebehavior
 
+    Products.PDBDebugMode
+
+zcml +=
+    Products.PDBDebugMode
+
 [sources]
 plone.app.intid = git ${remotes:plone}/plone.app.intid.git pushurl=${remotes:plone_push}/plone.app.intid.git
+plone.app.ldap = git ${remotes:plone}/plone.app.ldap.git pushurl=${remotes:plone_push}/plone.app.ldap.git
 plone.app.relationfield = git ${remotes:plone}/plone.app.relationfield.git pushurl=${remotes:plone_push}/plone.app.relationfield.git
 plone.app.referenceablebehavior = git ${remotes:plone}/plone.app.referenceablebehavior pushurl=${remotes:plone_push}/plone.app.referenceablebehavior.git
+plone.formwidget.contenttree = git ${remotes:plone}/plone.formwidget.contenttree.git pushurl=${remotes:plone_push}/plone.formwidget.contenttree.git branch=master
+
+Products.PDBDebugMode = git ${remotes:collective}/Products.PDBDebugMode.git pushurl=${remotes:collective_push}/Products.PDBDebugMode.git branch=master
+
+[versions]
+five.formlib = 2.1
+grok = 3.1
+grokcore.catalog = 3.0.1
+grokcore.chameleon = 3.0.1
+grokcore.component = 3.1
+grokcore.content = 3.0.2
+grokcore.formlib = 3.0.1
+grokcore.json = 3.0.3
+grokcore.layout = 3.0.3
+grokcore.rest = 3.0.1
+grokcore.security = 3.0.1
+grokcore.traverser = 3.0.1
+grokcore.view = 3.1
+grokcore.viewlet = 3.1.0
+grokcore.xmlrpc = 3.0.0
+plone.directives.dexterity = 1.0.2
+plone.directives.form = 2.0.3
+zope.app.appsetup = 4.1.0
+zope.app.publication = 4.3.0
+zope.app.wsgi = 4.1.0
+zope.errorview = 1.2.0
+zope.index = 4.4.0
+zope.securitypolicy = 4.3.1
+zope.session = 4.3.0
+
+# Required by:
+# plone.directives.dexterity==1.0.2
+five.grok = 1.3.2
+
+# Required by:
+# five.grok==1.3.2
+grokcore.annotation = 3.0.1
+
+# Required by:
+# grok==3.1
+grokcore.message = 3.0.1
+
+# Required by:
+# five.grok==1.3.2
+grokcore.site = 3.0.3
+
+# Required by:
+# five.grok==1.3.2
+# grokcore.annotation==3.0.1
+martian = 1.3.post1
+
+# Required by:
+# grokcore.message==3.0.1
+z3c.flashmessage = 2.1
+
+# Required by:
+# grok==3.1
+zc.catalog = 3.0
+
+# Required by:
+# five.formlib==2.1
+zope.app.form = 5.1.0
+
+# Required by:
+# zope.login==2.1.0
+# zope.securitypolicy==4.3.1
+zope.authentication = 4.4.0
+
+# Required by:
+# grok==3.1
+zope.catalog = 4.2.1
+
+# Required by:
+# zope.app.wsgi==4.1.0
+zope.error = 4.5.0
+
+# Required by:
+# grok==3.1
+zope.generations = 4.1.0
+
+# Required by:
+# grok==3.1
+# grokcore.viewlet==3.1.0
+zope.login = 2.1.0
+
+# Required by:
+# zope.session==4.3.0
+zope.minmax = 2.2.0
+
+# Required by:
+# grok==3.1
+zope.principalregistry = 4.2.0

plips/plip-1653-staticresources.cfg

@@ -6,11 +6,6 @@ extends = plipbase.cfg
 template-directory = ../templates
 config-directory = ../etc
 
-dev-eggs +=
-    plone.reload
-    pdbpp
-    profilehooks
-
 auto-checkout +=
     jquery.recurrenceinput.js
     mockup
@@ -41,12 +36,11 @@ test-eggs +=
 eggs +=
     Plone
     plone.staticresources
-    ${buildout:dev-eggs}
 resources = ${buildout:directory}/../resources
 
 
 [sources]
-jquery.recurrenceinput.js = git ${remotes:collective}/jquery.recurrenceinput.js.git pushurl=${remotes:collective_push}/jquery.recurrenceinput.js.git branch=thet-npm egg=False
+jquery.recurrenceinput.js = git ${remotes:collective}/jquery.recurrenceinput.js.git pushurl=${remotes:collective_push}/jquery.recurrenceinput.js.git branch=master egg=False
 mockup = git ${remotes:plone}/mockup.git pushurl=${remotes:plone_push}/mockup.git branch=thet-npm
 plone.app.theming = git ${remotes:plone}/plone.app.theming.git pushurl=${remotes:plone_push}/plone.app.theming.git branch=thet-staticresources
 plone.app.upgrade = git ${remotes:plone}/plone.app.upgrade.git pushurl=${remotes:plone_push}/plone.app.upgrade.git branch=thet-staticresources

plips/plip-2454-dx-siteroot.cfg

@@ -15,3 +15,4 @@ Products.CMFPlone                   = git ${remotes:plone}/Products.CMFPlone.git
 plone.app.multilingual              = git ${remotes:plone}/plone.app.multilingual.git pushurl=${remotes:plone_push}/plone.app.multilingual.git branch=dxcontainer-siteroot
 plone.supermodel                    = git ${remotes:plone}/plone.supermodel.git pushurl=${remotes:plone_push}/plone.supermodel.git branch=dx-siteroot
 plone.app.testing                   = git ${remotes:plone}/plone.app.testing.git pushurl=${remotes:plone_push}/plone.app.testing.git branch=dx-siteroot
+plone.restapi                       = git ${remotes:plone}/plone.restapi.git pushurl=${remotes:plone_push}/plone.restapi.git branch=dxcontainer-siteroot

plips/plip-2516-navigation.cfg

@@ -21,6 +21,5 @@ eggs +=
 plone.app.layout = git ${remotes:plone}/plone.app.layout.git pushurl=${remotes:plone_push}/plone.app.layout.git branch=plip-2516-navigation
 plonetheme.barceloneta = git ${remotes:plone}/plonetheme.barceloneta.git pushurl=${remotes:plone_push}/plonetheme.barceloneta.git branch=plip-2516-navigation
 plone.app.standardtiles = git ${remotes:plone}/plone.app.standardtiles.git pushurl=${remotes:plone_push}/plone.app.standardtiles.git branch=plip-2516-navigation
-mockup = git ${remotes:plone}/mockup.git pushurl=${remotes:plone_push}/mockup.git branch=plip-2516-navigation
 plone.app.upgrade = git ${remotes:plone}/plone.app.upgrade.git pushurl=${remotes:plone_push}/plone.app.upgrade.git branch=plip-2516-navigation
 Products.CMFPlone = git ${remotes:plone}/Products.CMFPlone.git pushurl=${remotes:plone_push}/Products.CMFPlone.git branch=plip-2516-navigation