Merge e3b8227 into ac9d1ca

.coveragerc

@@ -0,0 +1,2 @@
+[run]
+source = ZConfig

.gitignore

@@ -9,3 +9,5 @@ develop-eggs/
 eggs/
 parts/
 doc/_build
+htmlcov/
+.coverage

.travis.yml

@@ -5,11 +5,20 @@ python:
     - 3.3
     - 3.4
     - 3.5
-    - pypy
-    - pypy3
+    - 3.6
+    - pypy-5.4.1
+    - pypy3.3-5.2-alpha1
 install:
-    - pip install .
+    - pip install -U pip setuptools
+    - pip install -U coverage coveralls
+    - pip install -U -e .[test]
 script:
-    - python setup.py -q test -q
+    - coverage run setup.py -q test -q
 notifications:
     email: false
+after_success:
+    - coveralls
+
+cache: pip
+before_cache:
+    - rm -f $HOME/.cache/pip/log/debug.log

CHANGES.rst

@@ -5,7 +5,7 @@ Change History for ZConfig
 3.2.0 (unreleased)
 ------------------
 
-- Drop support for Python 2.6 and 3.2.
+- Drop support for Python 2.6 and 3.2 and add support for Python 3.6.
 
 - Run tests with pypy and pypy3 as well.
 

setup.cfg

@@ -5,3 +5,6 @@ doc_files =
     README.txt
     doc/schema.dtd
     doc/zconfig.pdf
+
+[bdist_wheel]
+universal = 1

setup.py

@@ -18,6 +18,10 @@ def alltests():
     suites = list(zope.testrunner.find.find_suites(options))
     return unittest.TestSuite(suites)
 
+tests_require = [
+    'zope.testrunner',
+]
+
 options = dict(
     name="ZConfig",
     version='3.2.0.dev0',
@@ -56,16 +60,19 @@ def alltests():
         'Programming Language :: Python :: 3',
         'Programming Language :: Python :: 3.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',
         'Operating System :: OS Independent',
         'Topic :: Software Development',
         ],
     # Support for 'setup.py test' when setuptools is available:
     test_suite='__main__.alltests',
-    tests_require=[
-        'zope.testrunner',
-        ],
+    tests_require=tests_require,
+    extras_require={
+        'test': tests_require,
+    },
     )
 
 try:

tox.ini

@@ -1,5 +1,5 @@
 [tox]
-envlist = py27,py33,py34,py35
+envlist = py27,py33,py34,py35,py36
 
 [testenv]
 commands =