From a58fc526f728b367b7d8ca8fdceb771a869be25c Mon Sep 17 00:00:00 2001
From: Hanno Schlichting <hanno@hannosch.eu>
Date: Sun, 11 Jun 2017 16:12:38 +0200
Subject: [PATCH] Update development files to latest template.

---
 .travis.yml  |  5 +++--
 buildout.cfg | 17 +++++++----------
 setup.cfg    |  6 ++++++
 tox.ini      | 11 ++++++-----
 4 files changed, 22 insertions(+), 17 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 6c5eb98c..50ec5fe4 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -7,8 +7,9 @@ python:
     - 3.6
 install:
     - pip install -U setuptools==33.1.1
-    - python bootstrap.py
-    - bin/buildout
+    - pip install zc.buildout
+    - buildout bootstrap
+    - buildout
 script:
     - bin/test -v1
 notifications:
diff --git a/buildout.cfg b/buildout.cfg
index 56ec478c..2bbf5140 100644
--- a/buildout.cfg
+++ b/buildout.cfg
@@ -1,25 +1,22 @@
 [buildout]
 extends =
-    https://zopefoundation.github.io/Zope/releases/4.0a5/versions-prod.cfg
+    https://raw.githubusercontent.com/zopefoundation/Zope/master/versions.cfg
 develop = .
 parts = 
     interpreter 
     test 
-    tox
-
 
 [versions]
 Products.ZCatalog =
 
 [interpreter]
 recipe = zc.recipe.egg
-interpreter = python
-eggs = Products.ZCatalog
+interpreter = py
+eggs =
+    Products.ZCatalog
+    tox
 
 [test]
 recipe = zc.recipe.testrunner
-eggs = Products.ZCatalog
-
-[tox]
-recipe = zc.recipe.egg
-eggs = tox
+eggs =
+    Products.ZCatalog
diff --git a/setup.cfg b/setup.cfg
index e0be977c..4efa2075 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -6,3 +6,9 @@ ignore =
 [flake8]
 ignore = C901,N801,N802,N803,N805,N806,N812,E301
 exclude = bootstrap.py
+
+[bdist_wheel]
+universal = 1
+
+[zest.releaser]
+create-wheel = yes
diff --git a/tox.ini b/tox.ini
index 19997c9e..bc5f52b8 100644
--- a/tox.ini
+++ b/tox.ini
@@ -3,13 +3,14 @@ envlist =
    py27,
    py34,
    py35,
-   py36,
+   py36
 
 [testenv]
-commands = 
-    {envbindir}/buildout -c {toxinidir}/buildout.cfg tox:env={envname} bootstrap
-    {envbindir}/buildout -c {toxinidir}/buildout.cfg tox:env={envname} install test
-    {toxinidir}/bin/test
+commands =
+    {envbindir}/buildout -c {toxinidir}/buildout.cfg buildout:directory={envdir} buildout:develop={toxinidir} bootstrap
+    {envbindir}/buildout -c {toxinidir}/buildout.cfg buildout:directory={envdir} buildout:develop={toxinidir}
+    {envbindir}/test -v1
 skip_install = true
 deps =
+    setuptools==33.1.1
     zc.buildout