Merge pull request #179 from collective/pinnings

Separate Plone 4 and Plone 5 versions

.gitignore

@@ -9,7 +9,9 @@ coverage/
 develop-eggs/
 downloads/
 eggs/
+local
 parts/
+share/
 var/
 include/
 lib/

.travis.yml

@@ -14,18 +14,15 @@ 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
-- 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 CATALOG_OPTIMIZATION_DISABLED=true
-- firefox -v
+  - firefox -v
 script:
 - bin/code-analysis
 - bin/test

buildout.cfg

@@ -1,13 +1,14 @@
 [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 = sc.social.like
 package-extras = [develop, test]
 
+newest = true
+
 parts +=
     code-analysis
     i18ndude
@@ -47,6 +48,7 @@ eggs = pylint < 2.0
 [test]
 initialization +=
     os.environ['TZ'] = 'UTC'
+    os.environ['CATALOG_OPTIMIZATION_DISABLED'] = 'true'
 
 [zopepy]
 recipe = zc.recipe.egg
@@ -55,15 +57,6 @@ interpreter = zopepy
 scripts = zopepy
 
 [versions]
-setuptools = 33.1.1
-zc.buildout = 2.9.5
-
-# code analysis
-configparser = 3.5.3
-enum34 = 1.1.6
-flake8 = 3.5.0
-mccabe = 0.6.1
-pycodestyle = 2.3.1
-pyflakes = 1.6.0
-pylint = 1.9.3
-lazy-object-proxy = 1.3.1
+# FIXME: https://github.com/collective/buildout.plonetest/pull/61
+flake8 =
+pycodestyle =

requirements.txt

@@ -0,0 +1,2 @@
+setuptools==40.8.0
+zc.buildout==2.13.1

sc/social/like/tests/test_viewlets.py

@@ -139,7 +139,7 @@ def render(times):
         with capture() as out:
             render(times)
 
-        timelapse = float(re.search('(\d+\.\d+)', out[1]).group())
+        timelapse = float(re.search(r'(\d+\.\d+)', out[1]).group())
         self.assertLess(timelapse, limit)
 
         # show rendering profile
@@ -226,7 +226,7 @@ def render(times):
         with capture() as out:
             render(times)
 
-        timelapse = float(re.search('(\d+\.\d+)', out[1]).group())
+        timelapse = float(re.search(r'(\d+\.\d+)', out[1]).group())
         self.assertLess(timelapse, limit)
 
         # show rendering profile

versions-4.3.x.cfg

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

versions-5.1.x.cfg

@@ -0,0 +1 @@
+[versions]