Mark as compatible with Python 2 and 3.

.gitignore

@@ -9,6 +9,7 @@ parts
 *.pyo
 *.so
 .installed.cfg
+.tox
 develop-eggs/
 eggs/
 *.egg-info/

.travis.yml

@@ -2,9 +2,14 @@ language: python
 sudo: false
 python:
     - 2.7
+    - 3.4
+    - 3.5
+    - 3.6
 install:
-    - python bootstrap.py
-    - bin/buildout
+    - pip install -U setuptools==33.1.1
+    - pip install zc.buildout
+    - buildout bootstrap
+    - buildout
 script:
     - bin/test -v1
 notifications:

CHANGES.rst

@@ -1,9 +1,10 @@
 Changelog
 =========
 
-4.1 (unreleased)
-----------------
+4.0.1 (unreleased)
+------------------
 
+- Mark as compatible with Python 2 and 3.
 
 4.0 (2016-07-23)
 ----------------

buildout.cfg

@@ -1,17 +1,22 @@
 [buildout]
-extends = https://raw.githubusercontent.com/zopefoundation/Zope/master/versions.cfg
-
+extends =
+    https://raw.githubusercontent.com/zopefoundation/Zope/master/versions.cfg
 develop = .
-parts = interpreter test
+parts =
+    interpreter
+    test
 
 [versions]
 Products.OFSP =
 
 [interpreter]
 recipe = zc.recipe.egg
-interpreter = python
-eggs = Products.OFSP
+interpreter = py
+eggs =
+    Products.OFSP
+    tox
 
 [test]
 recipe = zc.recipe.testrunner
-eggs = Products.OFSP
+eggs =
+    Products.OFSP

setup.cfg

@@ -4,5 +4,11 @@ ignore =
     bootstrap.py
 
 [flake8]
-ignore = N801,N802,N803,N805,N806,N812,E301
+ignore =
 exclude = bootstrap.py
+
+[bdist_wheel]
+universal = 1
+
+[zest.releaser]
+create-wheel = yes

setup.py

@@ -14,8 +14,11 @@
 
 from setuptools import setup, find_packages
 
+__version__ = '4.0.1.dev0'
+
+
 setup(name='Products.OFSP',
-      version='4.1.dev0',
+      version=__version__,
       url='http://pypi.python.org/pypi/Products.OFSP',
       license='ZPL 2.1',
       description="General Zope 2 help screens.",
@@ -33,9 +36,14 @@
           "License :: OSI Approved :: Zope Public License",
           "Operating System :: OS Independent",
           "Programming Language :: Python",
-          "Programming Language :: Python :: 2 :: Only",
+          "Programming Language :: Python :: 2",
           "Programming Language :: Python :: 2.7",
+          "Programming Language :: Python :: 3",
+          "Programming Language :: Python :: 3.4",
+          "Programming Language :: Python :: 3.5",
+          "Programming Language :: Python :: 3.6",
           "Programming Language :: Python :: Implementation :: CPython",
+          "Programming Language :: Python :: Implementation :: PyPy",
       ],
       install_requires=[
           'setuptools',

tox.ini

@@ -0,0 +1,16 @@
+[tox]
+envlist =
+    py27,
+    py34,
+    py35,
+    py36
+
+[testenv]
+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