Merge pull request #145 from plone/extended-travis

Implement continuous intregration over Plone 4.0 and Plone 4.1

.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:

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)
 -----------------------
 

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

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',