Merge d70ef01 into f5c2759

.coveragerc

@@ -1,3 +1,12 @@
+[run]
+branch = True
+source = bobtemplates
+
+omit =
+
+
 [report]
-include =
-  bobtemplates/*
+precision = 2
+
+[html]
+directory = reports/coverage

.gitignore

@@ -1,8 +1,8 @@
-.coverage
+.coverage*
 .installed.cfg
 *.egg-info
 *.mo
-*.pyc
+*.py[cod]
 # dirs
 bin/
 buildout-cache/
@@ -13,17 +13,23 @@ include/
 lib/
 local/
 parts/
-src/*
 test.plone_addon/
 var/
+reports/
+.tox/
+collective*/
 # files
 lib64
 pip-selfcheck.json
-# excludes
+.cache/
+.python-version
+coverage.xml
+.Python
+
+# excludes / This Files should go into version control
 !.coveragerc
 !.editorconfig
 !.gitattributes
 !.gitignore
 !.gitkeep
 !.travis.yml
-!bobtemplates

.travis.yml

@@ -1,58 +1,51 @@
 language: python
-python: 2.7
 sudo: false
+
 cache:
   pip: true
   directories:
     - $HOME/buildout-cache
+
 before_install:
-  - mkdir -p $HOME/buildout-cache/{eggs,downloads}
-  - mkdir $HOME/.buildout
-  - echo "[buildout]" > $HOME/.buildout/default.cfg
-  - echo "download-cache = $HOME/buildout-cache/downloads" >> $HOME/.buildout/default.cfg
-  - echo "eggs-directory = $HOME/buildout-cache/eggs" >> $HOME/.buildout/default.cfg
-  - pip install --upgrade pip setuptools zc.buildout
-  - if [[ `npm -v` != 3.10.7 ]]; then npm i -g npm@3.10.7; fi
-  - npm install -g grunt-cli
-
-env:
-  matrix:
-    - PLONE_VERSION=       PACKAGE_TYPE=
-    - PLONE_VERSION=4.3.11 PACKAGE_TYPE=Basic
-    - PLONE_VERSION=4.3.11 PACKAGE_TYPE=Dexterity
-    - PLONE_VERSION=4.3.11 PACKAGE_TYPE=Theme
-    - PLONE_VERSION=5.0.6  PACKAGE_TYPE=Basic
-    - PLONE_VERSION=5.0.6  PACKAGE_TYPE=Dexterity
-    - PLONE_VERSION=5.0.6  PACKAGE_TYPE=Theme
+    - mkdir -p $HOME/buildout-cache/{downloads,eggs,extends}
+    - mkdir $HOME/.buildout
+    - echo "[buildout]" > $HOME/.buildout/default.cfg
+    - echo "download-cache = $HOME/buildout-cache/downloads" >> $HOME/.buildout/default.cfg
+    - echo "eggs-directory = $HOME/buildout-cache/eggs" >> $HOME/.buildout/default.cfg
+    - echo "extends-cache = $HOME/buildout-cache/extends" >> $HOME/.buildout/default.cfg
+    - echo "abi-tag-eggs = true" >> $HOME/.buildout/default.cfg
+
+
+matrix:
+    include:
+        # pyXX-plone_sunburst,pyXX-plone_barceloneta
+        - python: "2.7"
+          env: TOXENV=py27
+        - python: "3.4"
+          env: TOXENV=py34
+        - python: "3.5"
+          env: TOXENV=py35
+        - python: "3.6"
+          env: TOXENV=py36
+        - python: "pypy"
+          env: TOXENV=pypy
 
 install:
-  - pip install docutils
-  - sed -ie "s/^plone.version.*/plone.version = $PLONE_VERSION/g" test_answers.ini
-  - sed -ie "s/^package.type.*/package.type = $PACKAGE_TYPE/g" test_answers.ini
-  - if [[ "$PLONE_VERSION" == "" && "$PACKAGE_TYPE" == "" ]]; then sed -ie "s/^plone.version.*//g" test_answers.ini; sed -ie "s/^package.type.*//g" test_answers.ini; fi
-  - if [ "$PACKAGE_TYPE" == "Dexterity" ]; then echo "package.dexterity_type_name = MyDexterityTestType" >> test_answers.ini; fi
-  - buildout -c travis.cfg
+    - travis_retry pip install -U setuptools==33.1.1 tox coveralls coverage
 
 before_script:
   - export DISPLAY=:99.0
   - sh -e /etc/init.d/xvfb start
 
 script:
-#  - bin/check-readme
-  - bin/code-analysis
-  - bin/test
-  - bin/test-plone_addon
-
-after_script:
-  - sh -e /etc/init.d/xvfb stop
+    - travis_retry tox
 
 after_success:
-  - bin/createcoverage
-  - pip install -q coveralls
-  - coveralls
+    - coverage combine
+    - coveralls
 
-after_failure:
-  - cat test_answers.ini
+after_script:
+  - sh -e /etc/init.d/xvfb stop
 
 notifications:
   email:

MANIFEST.in

@@ -1,4 +1,5 @@
 include *.cfg *.rst *.in
-graft bobtemplates
+graft src
+graft tests
 graft docs
 global-exclude *pyc

bobtemplates/hooks.py

@@ -6,6 +6,7 @@
 from mrbob.bobexceptions import SkipQuestion
 from mrbob.bobexceptions import ValidationError
 from mrbob.hooks import validate_choices
+
 import keyword
 import os
 import re

buildout.cfg

@@ -83,8 +83,8 @@ mode = 755
 
 
 [versions]
-setuptools = 28.3.0
-zc.buildout = 2.5.3
+setuptools = 33.1.1
+zc.buildout = 2.8.0
 flake8 = 3.3.0
 mr.bob =
 flake8-coding = 1.3.0

CHANGES.rst → docs/CHANGES.rst

@@ -42,6 +42,8 @@ Changelog
   causes the toolbar JS stop working properly
   [sneridagh]
 
+- Adopt tox a test invocation tool.
+  [loechel]
 
 1.0.5 (2016-10-16)
 ------------------