Test with Plone 5 by default.

Use main_template/macros/master. Travis: test on Plone 4 and 5.
tud-mit-plone · Feb 22, 2016 · 1157c84 · 1157c84
1 parent 2f0b1c8
commit 1157c84
Show file tree

Hide file tree

Showing 10 changed files with 169 additions and 203 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -5,6 +5,10 @@ cache:
 language: python
 python:
   - "2.7"
+env:
+  matrix:
+    - PLONE=4
+    - PLONE=5
 notifications:
   email:
     recipients:
@@ -13,7 +17,12 @@ notifications:
 install:
   - mkdir -p buildout-cache/eggs
   - mkdir -p buildout-cache/downloads
-  - python bootstrap.py -c travis.cfg
+  - sed -ie "s#travis-5.x.cfg#travis-$PLONE.x.cfg#" buildout.cfg
+# Keep setuptools and zc.buildout synced with buildout.cfg,
+# otherwise the buildout fails due to the non newest ('-N') option
+# when it wants to downgrade one of them to the pinned version.
+  - python bootstrap.py -c travis.cfg --buildout-version=2.5.0 --setuptools-version=19.4
+  - bin/buildout -N -t 3 -c travis.cfg annotate
   - bin/buildout -N -t 3 -c travis.cfg install download install
   - bin/buildout -N -t 3 -c travis.cfg
 script: bin/test
diff --git a/CHANGES.rst b/CHANGES.rst
@@ -2,10 +2,14 @@ History of feedfeeder
 =====================
 
 
-2.9 (unreleased)
-----------------
+3.0.0 (unreleased)
+------------------
+
+- Compatible with Plone 4.3 and 5.0.  [maurits]
 
-- Nothing changed yet.
+- Use ``main_template/macros/master``, instead of strange old
+  ``@@standard-macros/view`` which would show only the core content on
+  Plone 5.  [maurits]
 
 
 2.8 (2015-05-16)

diff --git a/Products/feedfeeder/browser/feed-folder.pt b/Products/feedfeeder/browser/feed-folder.pt
@@ -2,7 +2,7 @@
       xmlns:tal="http://xml.zope.org/namespaces/tal"
       xmlns:metal="http://xml.zope.org/namespaces/metal"
       xmlns:i18n="http://xml.zope.org/namespaces/i18n"
-      metal:use-macro="context/@@standard_macros/view"
+      metal:use-macro="context/main_template/macros/master"
       i18n:domain="feedfeeder">
 
    <body>

diff --git a/README.rst b/README.rst
@@ -46,7 +46,7 @@ I'm using archgenxml to generate the boiler plate stuff. There's a
 'generate.sh' shell script that'll call archgenxml for you. Nothing
 fancy.
 
-The feedfeeder's content types are: 
+The feedfeeder's content types are:
   - folder.FeedfeederFolder
   - item.FeedFeederItem
 
@@ -83,8 +83,8 @@ with the following data::
 Updating all feeds once
 +++++++++++++++++++++++
 
-If your site has several feed folders and you 
-want update them all once you can do:: 
+If your site has several feed folders and you
+want update them all once you can do::
 
    <clock-server>
      method /yoursiteid/feed-mega-update
@@ -93,7 +93,7 @@ want update them all once you can do::
      password 123
      host localhost:8080
    </clock-server>
-   
+
 
 Removing old feed items
 +++++++++++++++++++++++
@@ -112,12 +112,20 @@ You can periodically remove feed items older than a specific number of days. For
 Dependencies
 ------------
 
-We need Plone 4.x.  Compatibility with Plone 4.3 has been checked.
+Since version 3 we need Plone 4.3 or 5.0.
+
+Plone 5: in the add-ons control panel you also need to install
+'Archetypes Content Types for Plone'.  Otherwise, if you try to add a
+FeedfeederFolder, you will get a 404 Not Found error because the
+``createObject`` script is not found.
+
+For earlier Plone 4 versions, use version 2.x.  The current latest is 2.8.
 
 If you use Plone 3, please use a Products.feedfeeder version from the
 2.0 line.  The current latest is 2.0.9.
 
 
+
 Upgrade notes
 -------------