Merge pull request #638 from plone/5.2

Test Plone 5.2 on Travis

.travis.yml

@@ -29,9 +29,6 @@ matrix:
   exclude:
   - python: "2.7"
   - python: "3.6"
-  allow_failures:
-  - python: "3.6"
-    env: PLONE_VERSION=5.2.x
 before_install:
   - mkdir -p $HOME/buildout-cache/{eggs,downloads}
   - mkdir $HOME/.buildout

Makefile

@@ -13,6 +13,17 @@ bin/buildout: bin/pip
 	bin/pip install -r requirements.txt
 	@touch -c $@
 
+build-plone-5.2: .installed.cfg
+	bin/pip install --upgrade pip
+	bin/pip install -r requirements.txt
+	bin/buildout -c plone-5.2.x.cfg
+
+build-py3:
+	virtualenv --python=python3 .
+	bin/pip install --upgrade pip
+	bin/pip install -r requirements.txt
+	bin/buildout -c plone-5.2.x.cfg
+
 bin/python bin/pip:
 	virtualenv --clear --python=python$(version) .
 

base.cfg

@@ -189,3 +189,6 @@ mode = 755
 [sources]
 plone.rest = git git://github.com/plone/plone.rest.git pushurl=git@github.com:plone/plone.rest.git branch=master
 plone.schema = git git://github.com/plone/plone.schema.git pushurl=git@github.com:plone/plone.schema.git branch=newjsonschemafield
+
+[versions]
+plone.restapi =

plone-5.2.x.cfg

@@ -1,5 +1,18 @@
 [buildout]
 extends =
     base.cfg
-    http://dist.plone.org/release/5.1.4/versions.cfg
-    versions.cfg
+    http://dist.plone.org/release/5.2a1-pending/versions.cfg
+find-links += http://dist.plone.org/thirdparty/
+versions=versions
+
+[versions]
+plone.restapi =
+# Sphinx
+Sphinx = 1.6.5
+docutils = 0.14
+Pygments = 2.2.0
+sphinxcontrib-httpexample = 0.7.0
+sphinxcontrib-httpdomain = 1.5.0
+sphinx-rtd-theme = 0.2.4
+Jinja2 = 2.10
+Babel = 2.5.1

setup.py

@@ -25,7 +25,11 @@
 ]
 
 PY2_ONLY = [
+    'archetypes.schemaextender',
     'Products.Archetypes',
+    'Products.contentmigration',
+    'Products.ATContentTypes',
+    'plone.app.blob',
     'plone.app.collection',
 ]
 

src/plone/restapi/deserializer/configure.zcml

@@ -30,7 +30,7 @@
     <adapter factory=".atfields.FileFieldDeserializer" />
     <adapter factory=".atfields.ReferenceFieldDeserializer" />
   </configure>
-  
+
   <configure zcml:condition="have plone-5">
     <adapter factory=".controlpanels.ControlpanelDeserializeFromJson" />
   </configure>

test-no-sphinx-warnings.in

@@ -3,6 +3,11 @@
 # CI test that should fail if there are warnings or even errors when building
 # the Sphinx docs.
 
+if [ "$PLONE_VERSION" = "5.2.x" ]; then
+    echo "Skipping checks for sphinx warnings for 5.2.x"
+    exit 0
+fi
+
 set -euo pipefail
 
 BUILD_LOG="sphinx_build.log"