From ffc9099569ac0c922074c0130e95a77b78be66e3 Mon Sep 17 00:00:00 2001 From: Timo Stollenwerk Date: Sat, 17 Nov 2018 18:28:18 +0100 Subject: [PATCH 01/15] Use Plone 5.2a1. --- plone-5.2.x.cfg | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/plone-5.2.x.cfg b/plone-5.2.x.cfg index e716cb7289..096cd499f6 100644 --- a/plone-5.2.x.cfg +++ b/plone-5.2.x.cfg @@ -1,5 +1,6 @@ [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 From 24a793f249487d820ecc72420a5a05b3c57afcb7 Mon Sep 17 00:00:00 2001 From: Timo Stollenwerk Date: Sat, 17 Nov 2018 19:08:00 +0100 Subject: [PATCH 02/15] Add some missing py2 AT deps. --- setup.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/setup.py b/setup.py index c1ec07a3d6..53c15fd0bd 100644 --- a/setup.py +++ b/setup.py @@ -25,7 +25,9 @@ ] PY2_ONLY = [ + 'Products.ATContentTypes', 'Products.Archetypes', + 'plone.app.blob', 'plone.app.collection', ] From 84e04840f7cba0d7c3fc70b1e4de7b078f9df5c3 Mon Sep 17 00:00:00 2001 From: Timo Stollenwerk Date: Sat, 17 Nov 2018 19:23:50 +0100 Subject: [PATCH 03/15] Revert "Add some missing py2 AT deps." This reverts commit 24a793f249487d820ecc72420a5a05b3c57afcb7. --- setup.py | 2 -- 1 file changed, 2 deletions(-) diff --git a/setup.py b/setup.py index 53c15fd0bd..c1ec07a3d6 100644 --- a/setup.py +++ b/setup.py @@ -25,9 +25,7 @@ ] PY2_ONLY = [ - 'Products.ATContentTypes', 'Products.Archetypes', - 'plone.app.blob', 'plone.app.collection', ] From 6962193f825d1eb6bbf8bf00dc347101344102c4 Mon Sep 17 00:00:00 2001 From: Timo Stollenwerk Date: Sat, 17 Nov 2018 20:24:38 +0100 Subject: [PATCH 04/15] Add build-plone-5.2. --- Makefile | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/Makefile b/Makefile index 7404dce50b..84d7c93c2f 100644 --- a/Makefile +++ b/Makefile @@ -13,6 +13,11 @@ 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 + bin/python bin/pip: virtualenv --clear --python=python$(version) . From 22af70e64c324d33e150679df74cd4489a17a391 Mon Sep 17 00:00:00 2001 From: Timo Stollenwerk Date: Sat, 17 Nov 2018 20:25:35 +0100 Subject: [PATCH 05/15] Add zcml condition for plone.app.blob. --- src/plone/restapi/serializer/configure.zcml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/plone/restapi/serializer/configure.zcml b/src/plone/restapi/serializer/configure.zcml index 041400fceb..0bd1b8bbd2 100644 --- a/src/plone/restapi/serializer/configure.zcml +++ b/src/plone/restapi/serializer/configure.zcml @@ -20,6 +20,7 @@ + @@ -31,6 +32,7 @@ + From 4ae2aff8511ad0d1be7d427e75d2f4b52169e751 Mon Sep 17 00:00:00 2001 From: David Glick Date: Sat, 17 Nov 2018 22:17:45 -0500 Subject: [PATCH 06/15] Be sure to use unreleased plone.restapi --- base.cfg | 3 +++ 1 file changed, 3 insertions(+) diff --git a/base.cfg b/base.cfg index dcf032d3e9..204f586f60 100644 --- a/base.cfg +++ b/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 = From 1fc2dcab853a101b994a5156ce639a30a6bcb164 Mon Sep 17 00:00:00 2001 From: Timo Stollenwerk Date: Sun, 18 Nov 2018 08:08:33 +0100 Subject: [PATCH 07/15] Another attempt to force plone.restapi source. --- plone-5.2.x.cfg | 3 +++ 1 file changed, 3 insertions(+) diff --git a/plone-5.2.x.cfg b/plone-5.2.x.cfg index 096cd499f6..083d871231 100644 --- a/plone-5.2.x.cfg +++ b/plone-5.2.x.cfg @@ -4,3 +4,6 @@ extends = http://dist.plone.org/release/5.2a1-pending/versions.cfg find-links += http://dist.plone.org/thirdparty/ versions=versions + +[versions] +plone.restapi = From f7a2166aa0e5b7b26a5c225add31c7b9c6599a06 Mon Sep 17 00:00:00 2001 From: Timo Stollenwerk Date: Sun, 18 Nov 2018 08:16:46 +0100 Subject: [PATCH 08/15] Require plone.app.blob to be installed for blob deserializer. --- src/plone/restapi/deserializer/configure.zcml | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/src/plone/restapi/deserializer/configure.zcml b/src/plone/restapi/deserializer/configure.zcml index ef861bab68..2535acff73 100644 --- a/src/plone/restapi/deserializer/configure.zcml +++ b/src/plone/restapi/deserializer/configure.zcml @@ -24,13 +24,15 @@ - - - - - + + + + + + + - + From b1399a75ed8f1ac6150d786163109b350bb86514 Mon Sep 17 00:00:00 2001 From: Timo Stollenwerk Date: Sun, 18 Nov 2018 08:28:21 +0100 Subject: [PATCH 09/15] Add ATContentTypes and p.a.blob to py2 only deps. --- setup.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/setup.py b/setup.py index c1ec07a3d6..7e8f8a6781 100644 --- a/setup.py +++ b/setup.py @@ -26,6 +26,8 @@ PY2_ONLY = [ 'Products.Archetypes', + 'Products.ATContentTypes', + 'plone.app.blob', 'plone.app.collection', ] From 97edd55a5bee88086f12fd9dbdfe837b7dea61d6 Mon Sep 17 00:00:00 2001 From: Timo Stollenwerk Date: Sun, 18 Nov 2018 08:36:20 +0100 Subject: [PATCH 10/15] More missing py2 deps. --- setup.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/setup.py b/setup.py index 7e8f8a6781..a3d333183b 100644 --- a/setup.py +++ b/setup.py @@ -25,7 +25,9 @@ ] PY2_ONLY = [ + 'archetypes.schemaextender', 'Products.Archetypes', + 'Products.contentmigration', 'Products.ATContentTypes', 'plone.app.blob', 'plone.app.collection', From 678114f6aa31c87c97dc6b71c26348ce2066a93c Mon Sep 17 00:00:00 2001 From: Timo Stollenwerk Date: Sun, 18 Nov 2018 08:54:49 +0100 Subject: [PATCH 11/15] Revert zcml checks for plone.app.blob. --- src/plone/restapi/deserializer/configure.zcml | 12 +++++------- src/plone/restapi/serializer/configure.zcml | 2 -- 2 files changed, 5 insertions(+), 9 deletions(-) diff --git a/src/plone/restapi/deserializer/configure.zcml b/src/plone/restapi/deserializer/configure.zcml index 2535acff73..635e2c5b1a 100644 --- a/src/plone/restapi/deserializer/configure.zcml +++ b/src/plone/restapi/deserializer/configure.zcml @@ -24,13 +24,11 @@ - - - - - - - + + + + + diff --git a/src/plone/restapi/serializer/configure.zcml b/src/plone/restapi/serializer/configure.zcml index 0bd1b8bbd2..041400fceb 100644 --- a/src/plone/restapi/serializer/configure.zcml +++ b/src/plone/restapi/serializer/configure.zcml @@ -20,7 +20,6 @@ - @@ -32,7 +31,6 @@ - From eb051ec7e86897445268329a9e0d079963c5d321 Mon Sep 17 00:00:00 2001 From: Timo Stollenwerk Date: Sun, 18 Nov 2018 09:00:22 +0100 Subject: [PATCH 12/15] Plone 5.2 w. py3 now passes. --- .travis.yml | 3 --- 1 file changed, 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 4a37d16bc4..7e1802797f 100644 --- a/.travis.yml +++ b/.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 From 5506aed6385def1e95b7b97aff0ce903f0c0ba23 Mon Sep 17 00:00:00 2001 From: Timo Stollenwerk Date: Sun, 18 Nov 2018 15:13:47 +0100 Subject: [PATCH 13/15] Add make build-py3. --- Makefile | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/Makefile b/Makefile index 84d7c93c2f..9966e6bf76 100644 --- a/Makefile +++ b/Makefile @@ -18,6 +18,12 @@ build-plone-5.2: .installed.cfg 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) . From 3e475bfb11c39eecb4efdb796eaa03aaf0387265 Mon Sep 17 00:00:00 2001 From: Timo Stollenwerk Date: Sun, 18 Nov 2018 15:15:40 +0100 Subject: [PATCH 14/15] Pin Sphinx versions for 5.2 to avoid warnings. --- plone-5.2.x.cfg | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/plone-5.2.x.cfg b/plone-5.2.x.cfg index 083d871231..9d39ee7c6b 100644 --- a/plone-5.2.x.cfg +++ b/plone-5.2.x.cfg @@ -7,3 +7,12 @@ 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 From d059821cd8dc27749f3c3d10fd726ccde3a3e3bc Mon Sep 17 00:00:00 2001 From: Timo Stollenwerk Date: Sun, 18 Nov 2018 15:28:08 +0100 Subject: [PATCH 15/15] Skip Sphinx warnings for Plone 5.2. --- test-no-sphinx-warnings.in | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/test-no-sphinx-warnings.in b/test-no-sphinx-warnings.in index 8dfb0aac2e..ba7c0a7fb5 100644 --- a/test-no-sphinx-warnings.in +++ b/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"