Merge f4d6fba into cf13425

.codacy.yml

@@ -1,4 +1,3 @@
 exclude_paths:
-- bootstrap.py
 - setup.py
 - src/collective/cover/static/js/vendor/*

.travis.yml

@@ -24,13 +24,11 @@ env:
     - PLONE_VERSION=5.1
 matrix:
   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
+- virtualenv -p `which python` .
+- bin/pip install -r requirements.txt
 - bin/buildout $VERSIONS annotate
 - bin/buildout $VERSIONS
 before_script:

buildout.cfg

@@ -6,7 +6,6 @@ extends =
 
 package-name = collective.cover
 package-extras = [relations, test]
-newest = false
 
 parts +=
     checkversions
@@ -86,3 +85,6 @@ initialization +=
 
 [versions]
 sc.recipe.staticresources = 1.1b5
+# Keep the same as in requirements.txt:
+setuptools = 40.8.0
+zc.buildout = 2.13.1

requirements.txt

@@ -0,0 +1,4 @@
+# Use constraints from the newest Plone version we support.
+-c https://dist.plone.org/release/5.1-latest/requirements.txt
+setuptools
+zc.buildout

setup.cfg

@@ -11,7 +11,6 @@ ignore =
     .csslintrc
     .jshintignore
     .travis.yml
-    bootstrap.py
 
 [isort]
 force_alphabetical_sort = True

src/collective/cover/tests/test_setup.py

@@ -25,7 +25,7 @@ def test_installed(self):
         self.assertTrue(self.qi.isProductInstalled(PROJECTNAME))
 
     def test_addon_layer(self):
-        layers = [l.getName() for l in registered_layers()]
+        layers = [layer.getName() for layer in registered_layers()]
         self.assertIn('ICoverLayer', layers)
 
     @unittest.skipIf(IS_PLONE_5, 'No easy way to test this under Plone 5')
@@ -74,7 +74,7 @@ def test_uninstalled(self):
         self.assertFalse(self.qi.isProductInstalled(PROJECTNAME))
 
     def test_addon_layer_removed(self):
-        layers = [l.getName() for l in registered_layers()]
+        layers = [layer.getName() for layer in registered_layers()]
         self.assertNotIn('ICoverLayer', layers)
 
     @unittest.skipIf(IS_PLONE_5, 'No easy way to test this under Plone 5')