Add support for 3.6, drop support for 3.3.

Also enable coverage reporting and universal wheels.
zopefoundation · Jul 25, 2017 · bfec351 · bfec351
1 parent fd1e6f5
commit bfec351
Show file tree

Hide file tree

Showing 9 changed files with 64 additions and 36 deletions.
diff --git a/.coveragerc b/.coveragerc
@@ -0,0 +1,8 @@
+[run]
+source = zope.componentvocabulary
+
+[report]
+exclude_lines =
+    pragma: no cover
+    if __name__ == '__main__':
+    raise NotImplementedError
diff --git a/.gitignore b/.gitignore
@@ -7,3 +7,5 @@ bin/
 develop-eggs/
 eggs/
 parts/
+.coverage
+htmlcov
diff --git a/.travis.yml b/.travis.yml
@@ -2,14 +2,21 @@ language: python
 sudo: false
 python:
     - 2.7
-    - 3.3
     - 3.4
     - 3.5
-    - pypy
-    - pypy3
+    - 3.6
+    - pypy-5.6.0
+    - pypy3.3-5.5-alpha
 install:
-    - pip install .
+    - pip install -U pip
+    - pip install -U setuptools coverage coveralls
+    - pip install -U -e .[test]
 script:
-    - python setup.py test -q
+    - coverage run setup.py test -q
+after_success:
+    - coveralls
 notifications:
     email: false
+cache: pip
+before_cache:
+    - rm -f $HOME/.cache/pip/log/debug.log
diff --git a/CHANGES.rst b/CHANGES.rst
@@ -4,9 +4,9 @@ Changes
 2.1.0 (unreleased)
 ------------------
 
-- Add support for Python 3.5.
+- Add support for Python 3.5 and 3.6.
 
-- Drop support for Python 2.6.
+- Drop support for Python 2.6 and 3.3.
 
 
 2.0.0 (2014-12-24)

diff --git a/MANIFEST.in b/MANIFEST.in
@@ -3,6 +3,8 @@ include *.txt
 include *.py
 include buildout.cfg
 include tox.ini
+include .travis.yml
+include .coveragerc
 
 recursive-include src *
 

diff --git a/README.rst b/README.rst
@@ -4,4 +4,9 @@
 .. image:: https://travis-ci.org/zopefoundation/zope.componentvocabulary.png?branch=master
         :target: https://travis-ci.org/zopefoundation/zope.componentvocabulary
 
+.. image:: https://coveralls.io/repos/github/zopefoundation/zope.componentvocabulary/badge.svg?branch=master
+        :target: https://coveralls.io/github/zopefoundation/zope.componentvocabulary?branch=master
+
+
+
 This package contains various vocabularies.
diff --git a/setup.cfg b/setup.cfg
@@ -0,0 +1,2 @@
+[bdist_wheel]
+universal = 1
diff --git a/setup.py b/setup.py
@@ -17,10 +17,10 @@
 from setuptools import setup, find_packages
 
 def read(*rnames):
-    return open(os.path.join(os.path.dirname(__file__), *rnames)).read()
+    with open(os.path.join(os.path.dirname(__file__), *rnames)) as f:
+        return f.read()
 
 def alltests():
-    import os
     import sys
     import unittest
     # use the zope.testrunner machinery to find all the
@@ -34,6 +34,12 @@ def alltests():
     suites = list(zope.testrunner.find.find_suites(options))
     return unittest.TestSuite(suites)
 
+TEST_REQUIRES = [
+    'zope.configuration',
+    'zope.testing',
+    'zope.testrunner',
+]
+
 setup(name='zope.componentvocabulary',
       version='2.1.0.dev0',
       author='Zope Foundation and Contributors',
@@ -43,7 +49,7 @@ def alltests():
           read('README.rst')
           + '\n\n' +
           read('CHANGES.rst')
-          ),
+      ),
       keywords="zope component architecture vocabulary",
       classifiers=[
           'Development Status :: 5 - Production/Stable',
@@ -54,16 +60,17 @@ def alltests():
           'Programming Language :: Python :: 2',
           'Programming Language :: Python :: 2.7',
           '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',
           'Natural Language :: English',
           'Operating System :: OS Independent',
           'Topic :: Internet :: WWW/HTTP',
-          'Framework :: Zope3'],
-      url='http://pypi.python.org/pypi/zope.componentvocabulary',
+          'Framework :: Zope3',
+      ],
+      url='http://github.com/zopefoundation/zope.componentvocabulary',
       license='ZPL 2.1',
       packages=find_packages('src'),
       package_dir={'': 'src'},
@@ -76,19 +83,12 @@ def alltests():
           'zope.interface',
           'zope.schema',
           'zope.security',
-          ],
-      extras_require=dict(
-          test=[
-              'zope.component',
-              'zope.configuration',
-              'zope.testing',
-              ]),
-      tests_require = [
-          'zope.configuration',
-          'zope.testing',
-          'zope.testrunner',
-          ],
-      test_suite = '__main__.alltests',
+      ],
+      extras_require={
+          'test': TEST_REQUIRES,
+      },
+      tests_require=TEST_REQUIRES,
+      test_suite='__main__.alltests',
       include_package_data=True,
       zip_safe=False,
-      )
+)
diff --git a/tox.ini b/tox.ini
@@ -1,16 +1,18 @@
 [tox]
 envlist =
-    py27,py33,py34,py35,pypy,pypy3
+    py27,py34,py35,py36,pypy,pypy3
 
 [testenv]
+usedevelop = true
 commands =
     python setup.py -q test -q
 deps =
-    zope.component
-    zope.configuration
-    zope.i18nmessageid
-    zope.interface
-    zope.schema
-    zope.security
-    zope.testing
-    zope.testrunner
+    .[test]
+
+[testenv:coverage]
+commands =
+    coverage run setup.py -q test -q
+    coverage report
+deps =
+    {[testenv]deps}
+    coverage