From 3ddd8f86097ab2834fbde80463844d684bdfd0c8 Mon Sep 17 00:00:00 2001
From: hvelarde <hector.velarde@gmail.com>
Date: Wed, 27 Aug 2014 11:08:30 -0300
Subject: [PATCH] Refactor CI configuration

- Test under Plone 4.2, 4.3 and 5.0
- Add support for Coveralls
---
 .travis.yml | 18 +++++++++++++-----
 setup.py    |  3 ++-
 travis.cfg  |  4 +++-
 3 files changed, 18 insertions(+), 7 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 33b0a71..1a666d7 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,18 +1,26 @@
 language: python
 python: 2.7
-env: PLONE_VERSION=4.3
+env:
+  - PLONE_VERSION=4.2
+  - PLONE_VERSION=4.3 QA=true
+  - PLONE_VERSION=5.0
 matrix:
+  allow_failures:
+    env:
+      - PLONE_VERSION=4.2
+      - PLONE_VERSION=5.0
   fast_finish: true
 install:
   - sed -ie "s#travis-4.x.cfg#travis-$PLONE_VERSION.x.cfg#" travis.cfg
   - mkdir -p buildout-cache/downloads
   - python bootstrap.py -c travis.cfg
+  - bin/buildout -c travis.cfg annotate
   - bin/buildout -c travis.cfg -N -q
 before_script:
   - export DISPLAY=:99.0
   - sh -e /etc/init.d/xvfb start
-script: bin/test
-after_success: bin/code-analysis
-after_failure: bin/buildout annotate -c travis.cfg
+script: bin/code-analysis && bin/test
+after_success: test QA && bin/coverage.sh && pip install -q coveralls && coveralls || true
+after_failure: firefox -v
 notifications:
-  irc: irc.freenode.org#simplesconsultoria
+  irc: irc.freenode.org#plone-testing
diff --git a/setup.py b/setup.py
index f58eac6..f204de7 100644
--- a/setup.py
+++ b/setup.py
@@ -19,6 +19,7 @@
         'Development Status :: 3 - Alpha',
         'Environment :: Web Environment',
         'Framework :: Plone',
+        'Framework :: Plone :: 4.2',
         'Framework :: Plone :: 4.3',
         'Intended Audience :: System Administrators',
         'License :: OSI Approved :: GNU General Public License v2 (GPLv2)',
@@ -44,7 +45,7 @@
         'plone.dexterity',
         'plone.directives.form',
         'plone.memoize',
-        'Products.CMFPlone >=4.3',
+        'Products.CMFPlone >=4.2',
         'Products.GenericSetup',
         'setuptools',
         'zope.annotation',
diff --git a/travis.cfg b/travis.cfg
index 81686e6..7c15881 100644
--- a/travis.cfg
+++ b/travis.cfg
@@ -1,11 +1,12 @@
 [buildout]
 extends =
-    https://raw.github.com/collective/buildout.plonetest/master/travis-4.3.x.cfg
+    https://raw.github.com/collective/buildout.plonetest/master/travis-4.x.cfg
     https://raw.github.com/collective/buildout.plonetest/master/qa.cfg
     https://raw.github.com/plone/plone.app.robotframework/master/versions.cfg
 
 package-name = collective.liveblog
 package-extras = [test]
+test-eggs = Pillow
 
 parts +=
     coverage-sh
@@ -24,5 +25,6 @@ return-status-codes = True
 utf8-header = True
 
 [versions]
+pep8 = 1.5.7
 # use latest version of setuptools
 setuptools =