From 3aef6bd9d81a3df7a8bd080d45ea70428c620c95 Mon Sep 17 00:00:00 2001
From: Nejc Zupan <nejc.zupan@gmail.com>
Date: Fri, 11 Oct 2013 21:32:32 -0300
Subject: [PATCH 1/2] declare supported Plone versions

---
 setup.py | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/setup.py b/setup.py
index 5f0839d..91b80f5 100644
--- a/setup.py
+++ b/setup.py
@@ -51,8 +51,10 @@ setup(
     classifiers=[
         'Environment :: Web Environment',
         'Framework :: Plone',
-        'Framework :: Plone :: 4.2'
-        'Framework :: Plone :: 4.3'
+        'Framework :: Plone :: 4.0',
+        'Framework :: Plone :: 4.1',
+        'Framework :: Plone :: 4.2',
+        'Framework :: Plone :: 4.3',
         'Intended Audience :: Developers',
         'License :: OSI Approved :: GNU General Public License v2 (GPLv2)',
         'Operating System :: OS Independent',

From 83e72fe14d2352e041713d2ae4c6aa5657aeb236 Mon Sep 17 00:00:00 2001
From: hvelarde <hector.velarde@gmail.com>
Date: Fri, 11 Oct 2013 14:13:19 -0300
Subject: [PATCH 2/2] A number of improvements to how we run builds on Travis

Among them:
* add Plone 4.0 and 4.1 under Python 2.6 to the testing matrix
* do not run Plone 4.3 with Python 2.6 and Plone 4.2 with Python 2.7 -- this
  reduces the number of builds but keeps basically the same coverage
* only upload coverage info to Coveralls.io on one job per build, not on all
  jobs
* upgrade zc.buildout to 1.7.1 (was 1.6.3)
* use Plone 4.3 by default (was 4.2)
---
 .travis.yml  | 24 ++++++++++++++----------
 CHANGES.rst  | 25 +++++++++++++++++++++++++
 buildout.cfg |  4 ++--
 3 files changed, 41 insertions(+), 12 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index a95ada7..cae091a 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,14 +1,18 @@
 language: python
-python:
-  - 2.6
-  - 2.7
+python: 2.7
 
 env:
-  global:
-    - secure: "nTXMNU2aYbCtvKD74PndF8Xm2h6IvsxPjr6vj45AxjXmaB7Wf5oGi/4b6ObV\nexBtUQkFnc+M0ThGyUznOCPi3YxcbTzsyhQYhHUtmtw/6QRyYgo4E0GLDItU\n37Ff6wpxl3NMMJTvpi6SOVUvIJUl3+cs+4bkMkS48RSFGg2rGmo="  # Coveralls.io token
-  matrix:
-    - PLONE_VERSION=4.2
-    - PLONE_VERSION=4.3
+  - PLONE_VERSION=4.3
+global:
+  - secure: "nTXMNU2aYbCtvKD74PndF8Xm2h6IvsxPjr6vj45AxjXmaB7Wf5oGi/4b6ObV\nexBtUQkFnc+M0ThGyUznOCPi3YxcbTzsyhQYhHUtmtw/6QRyYgo4E0GLDItU\n37Ff6wpxl3NMMJTvpi6SOVUvIJUl3+cs+4bkMkS48RSFGg2rGmo="  # Coveralls.io token
+matrix:
+  include:
+    - python: 2.6
+      env: PLONE_VERSION=4.0
+    - python: 2.6
+      env: PLONE_VERSION=4.1
+    - python: 2.6
+      env: PLONE_VERSION=4.2 QA=true
 
 install:
   - mkdir -p buildout-cache/eggs
@@ -22,8 +26,8 @@ script:
   - make coverage
 
 after_success:
- - pip install python-coveralls==2.4.0
- - coveralls
+ - test -v QA && pip install python-coveralls==2.4.0 || true
+ - test -v QA && coveralls || true
 
 notifications:
   irc:
diff --git a/CHANGES.rst b/CHANGES.rst
index 6375c48..770a019 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -1,6 +1,31 @@
 Changelog
 =========
 
+1.1.0 (unreleased)
+------------------
+
+- List supported Plone versions in setup.py.
+  [zupo]
+
+- Add Plone 4.0 and 4.1 under Python 2.6 to the testing matrix.
+  [hvelarde]
+
+- Do not run Plone 4.3 with Python 2.6 and Plone 4.2 with Python 2.7 -- this
+  reduces the number of builds but keeps basically the same coverage.
+  [hvelarde]
+
+- Only upload coverage info to Coveralls.io on one job per build, not on all
+  jobs.
+  [hvelarde]
+
+- Upgrade zc.buildout to 1.7.1 (was 1.6.3)
+  [hvelarde]
+
+- Use Plone 4.3 by default (was 4.2)
+  [hvelarde]
+
+
+
 1.1.0-rc.1 (2013-10-10)
 -----------------------
 
diff --git a/buildout.cfg b/buildout.cfg
index aa79839..5a3c5a8 100644
--- a/buildout.cfg
+++ b/buildout.cfg
@@ -1,5 +1,5 @@
 [buildout]
-extends = https://raw.github.com/collective/buildout.plonetest/master/test-4.2.x.cfg
+extends = https://raw.github.com/collective/buildout.plonetest/master/test-4.3.x.cfg
 package-name = plone.api
 package-extras = [test]
 test-eggs = Pillow
@@ -39,7 +39,7 @@ return-status-codes = True
 
 [versions]
 Sphinx = 1.1.3
-zc.buildout = 1.6.3
+zc.buildout = 1.7.1
 zc.recipe.egg = 1.3.2
 zope.pagetemplate = 3.6.3
 plone.recipe.codeanalysis = 1.0b5