From 02274204929d52384a579b51b44377faef40aa13 Mon Sep 17 00:00:00 2001
From: Gil Forcada Codinachs <gil.gnome@gmail.com>
Date: Thu, 27 Oct 2016 18:01:56 +0200
Subject: [PATCH] Avoid make when running travis

---
 .travis.yml      | 15 ++++++++-------
 buildout.cfg     | 33 +++++++++++++++++++++------------
 coverage.cfg     |  7 +++++--
 docs/CHANGES.rst |  3 +++
 4 files changed, 37 insertions(+), 21 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 44055e69..6a215cc8 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -20,18 +20,19 @@ install:
   - mkdir -p buildout-cache/eggs
   - mkdir -p buildout-cache/downloads
   - sed -ie "s#-4.3.x#-$PLONE_VERSION.x#" buildout.cfg
-  - make "bin/python"
-  - bin/python bootstrap.py
-  - bin/buildout annotate
-  - make version=$TRAVIS_PYTHON_VERSION .installed.cfg
+  - pip install -U zc.buildout setuptools==20.1.1
+  - buildout annotate
+  - buildout
 
 script:
   - bin/code-analysis
-  - make coverage
+  - bin/test
 
 after_success:
-- pip install -q coverage==3.6 coveralls
-- coveralls
+  - buildout -c coverage.cfg
+  - bin/coverage
+  - pip install -q coveralls
+  - coveralls
 
 notifications:
   irc:
diff --git a/buildout.cfg b/buildout.cfg
index 5fb64f69..f5807532 100644
--- a/buildout.cfg
+++ b/buildout.cfg
@@ -7,7 +7,6 @@ package-extras = [test]
 test-eggs = Pillow
 parts +=
     omelette
-    scripts
     code-analysis
 
 # network speedup
@@ -23,12 +22,6 @@ allow-hosts =
 recipe = collective.recipe.omelette
 eggs = ${test:eggs}
 
-[scripts]
-recipe = z3c.recipe.scripts
-dependent-scripts = true
-interpreter = zopepy
-eggs = plone.api [develop]
-
 [code-analysis]
 recipe = plone.recipe.codeanalysis
 directory = ${buildout:directory}/src/plone/api
@@ -41,9 +34,25 @@ debug-statements = True
 return-status-codes = True
 
 [versions]
-Sphinx = 1.1.3
-zc.buildout = 1.7.1
-zc.recipe.egg = 1.3.2
-zope.pagetemplate = 3.6.3
+zc.buildout = 2.5.3
 plone.recipe.codeanalysis = 1.0b5
-mock = 1.0.1
+mccabe = 0.5.2
+pycodestyle = 2.0.0
+pyflakes = 1.2.3
+setuptools = 20.1.1
+
+# Required by:
+# flake8==3.0.4
+configparser = 3.5.0
+
+# Required by:
+# flake8==3.0.4
+enum34 = 1.1.6
+
+# Required by:
+# plone.recipe.codeanalysis==1.0b5
+flake8 = 2.6.2
+
+# Required by:
+# plone.recipe.codeanalysis==1.0b5
+zptlint = 0.2.4
diff --git a/coverage.cfg b/coverage.cfg
index 76126b21..4c74013a 100644
--- a/coverage.cfg
+++ b/coverage.cfg
@@ -17,11 +17,14 @@ recipe = zc.recipe.egg
 eggs = coverage
 initialization =
     include = '--source=${buildout:directory}/src'
-    sys.argv = sys.argv[:] + ['run', include, 'bin/test', '--layer=PloneApiLayer:Integration']
+    sys.argv = sys.argv[:] + ['run', include, 'bin/test', ]
 
 [report]
 recipe = zc.recipe.egg
 eggs = coverage
 scripts = coverage=report
 initialization =
-    sys.argv = sys.argv[:] + ['html', '-i']    
+    sys.argv = sys.argv[:] + ['html', '-i']
+
+[versions]
+coverage = 4.2
diff --git a/docs/CHANGES.rst b/docs/CHANGES.rst
index 2821a2ff..2ba13887 100644
--- a/docs/CHANGES.rst
+++ b/docs/CHANGES.rst
@@ -9,6 +9,9 @@ Fixes:
 - Typo in the documentation.
   [ale-rt]
 
+- Fix travis.
+  [gforcada]
+
 1.5 (2016-02-20)
 ----------------