Merge 66e0efe into 729a624

.gitignore

@@ -23,3 +23,6 @@ parts/
 src/collective.*
 src/plone.*
 var/
+/share/
+/local
+/pip-selfcheck.json

.travis.yml

@@ -1,6 +1,7 @@
+services:
+  - xvfb
 language: python
 python: 2.7
-sudo: false
 cache:
   directories:
   - $HOME/.pylint.d
@@ -16,22 +17,18 @@ matrix:
   allow_failures:
   - env: PLONE_VERSION=5.1
   fast_finish: true
-before_install:
-# FIXME: I have no idea how and why six==1.11.0 is being installed
-- pip uninstall -y six
 install:
-- sed -ie "s#test-4.3#test-$PLONE_VERSION#" buildout.cfg
-- sed -ie "s#versions-4.3#versions-$PLONE_VERSION#" buildout.cfg
-- python bootstrap.py
-- bin/buildout buildout:test-eggs=$TEST_EGGS annotate
-- bin/buildout buildout:test-eggs=$TEST_EGGS
+  - sed -ie "s#test-4.3#test-$PLONE_VERSION#" buildout.cfg
+  - sed -ie "s#versions-4.3#versions-$PLONE_VERSION#" buildout.cfg
+  - virtualenv .
+  - bin/pip install -r requirements.txt
+  - bin/buildout buildout:test-eggs=$TEST_EGGS annotate
+  - bin/buildout buildout:test-eggs=$TEST_EGGS
 before_script:
-- export DISPLAY=:99.0
-- sh -e /etc/init.d/xvfb start
-- firefox -v
+  - firefox -v
 script:
 - bin/code-analysis
-- CATALOG_OPTIMIZATION_DISABLED=true bin/test
+- bin/test
 - bin/pylint --py3k --disable=no-absolute-import src/collective/nitf
 after_success:
 - pip install coverage

buildout.cfg

@@ -1,9 +1,8 @@
 [buildout]
 extends =
-    https://raw.github.com/collective/buildout.plonetest/master/test-4.3.x.cfg
-    https://raw.github.com/collective/buildout.plonetest/master/qa.cfg
-    https://raw.github.com/plone/plone.app.robotframework/master/versions.cfg
-    https://raw.github.com/collective/collective.cover/master/versions-4.3.x.cfg
+    https://raw.githubusercontent.com/collective/buildout.plonetest/master/test-4.3.x.cfg
+    https://raw.githubusercontent.com/collective/buildout.plonetest/master/qa.cfg
+    versions-4.3.x.cfg
 
 package-name = collective.nitf
 package-extras = [test]

requirements.txt

@@ -0,0 +1,3 @@
+-c https://dist.plone.org/release/5.1-latest/requirements.txt
+setuptools
+zc.buildout

versions-4.3.x.cfg

@@ -0,0 +1,6 @@
+[versions]
+setuptools = 40.8.0
+zc.buildout = 2.13.1
+
+collective.js.bootstrap = 2.3.1.1
+zipp = <2.0.0

versions-5.1.x.cfg

@@ -0,0 +1,2 @@
+[versions]
+zipp = <2.0.0