Add Python 3.6 and drop Python 3.3

- Badges - Enable coveralls - Standard coverage and travis setup for caching, current pypy3 versions, etc. - We don't yet have 100% coverage.
zopefoundation · Aug 3, 2017 · 785485a · 785485a
1 parent 4c38406
commit 785485a
Show file tree

Hide file tree

Showing 9 changed files with 98 additions and 45 deletions.
diff --git a/.coveragerc b/.coveragerc
@@ -0,0 +1,11 @@
+[run]
+source = zope.datetime
+
+[report]
+precision = 2
+exclude_lines =
+    pragma: no cover
+    if __name__ == '__main__':
+    raise NotImplementedError
+    self.fail
+    raise AssertionError
diff --git a/.gitignore b/.gitignore
@@ -4,3 +4,4 @@
 .coverage
 coverage.xml
 nosetests.xml
+htmlcov/
diff --git a/.travis.yml b/.travis.yml
@@ -2,14 +2,19 @@ language: python
 sudo: false
 python:
     - 2.7
-    - 3.3
     - 3.4
     - 3.5
+    - 3.6
     - pypy
-    - pypy3
+    - pypy3.5-5.8.0
 install:
-    - pip install .
+    - pip install -U pip setuptools
+    - pip install -U coverage coveralls
+    - pip install -U -e .[test]
 script:
-    - python setup.py test -q
+    - coverage run -m zope.testrunner --test-path=src
+after_success:
+    - coveralls
 notifications:
     email: false
+cache: pip
diff --git a/CHANGES.rst b/CHANGES.rst
@@ -1,16 +1,17 @@
-CHANGES
-=======
+=========
+ CHANGES
+=========
 
 4.2.0 (unreleased)
-------------------
+==================
 
-- Add support for Python 3.5.
+- Add support for Python 3.5 and 3.6.
 
-- Drop support for Python 2.6 and 3.2.
+- Drop support for Python 2.6, 3.2 and 3.3.
 
 
 4.1.0 (2014-12-26)
-------------------
+==================
 
 - Add support for PyPy and PyPy3.
 
@@ -20,15 +21,15 @@ CHANGES
 
 
 4.0.0 (2013-02-19)
-------------------
+==================
 
 - Add support for Python 3.2 and 3.3.
 
 - Drop support for Python 2.4 and 2.5.
 
 
 3.4.1 (2011-11-29)
-------------------
+==================
 
 - Add test cases from LP #139360 (all passed without modification to
   the ``parse`` function).
@@ -37,6 +38,6 @@ CHANGES
 
 
 3.4.0 (2007-07-20)
-------------------
+==================
 
 - Initial release as a separate project.
diff --git a/MANIFEST.in b/MANIFEST.in
@@ -1 +1,7 @@
 include *.txt
+include *.py
+include *.rst
+include buildout.cfg
+include tox.ini
+include .travis.yml
+include .coveragerc
diff --git a/README.rst b/README.rst
@@ -1,7 +1,19 @@
-``zope.datetime``
-=================
+===================
+ ``zope.datetime``
+===================
+
+.. image:: https://img.shields.io/pypi/v/zope.datetime.svg
+        :target: https://pypi.python.org/pypi/zope.datetime/
+        :alt: Latest release
+
+.. image:: https://img.shields.io/pypi/pyversions/zope.datetime.svg
+        :target: https://pypi.org/project/zope.datetime/
+        :alt: Supported Python versions
 
 .. image:: https://travis-ci.org/zopefoundation/zope.datetime.png?branch=master
         :target: https://travis-ci.org/zopefoundation/zope.datetime
 
+.. image:: https://coveralls.io/repos/github/zopefoundation/zope.datetime/badge.svg?branch=master
+        :target: https://coveralls.io/github/zopefoundation/zope.datetime?branch=master
+
 Commonly used date and time related utility functions.
diff --git a/setup.cfg b/setup.cfg
@@ -0,0 +1,2 @@
+[bdist_wheel]
+universal = 1
diff --git a/setup.py b/setup.py
@@ -23,39 +23,50 @@
 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()
+
+TESTS_REQUIRE = [
+    'zope.testrunner',
+]
 
 setup(name='zope.datetime',
       version='4.2.0.dev0',
-      url='http://pypi.python.org/pypi/zope.datetime',
+      url='http://github.com/zopefoundation/zope.datetime',
       license='ZPL 2.1',
       description='Zope datetime',
       author='Zope Corporation and Contributors',
       author_email='zope-dev@zope.org',
       long_description=read('README.rst') + '\n\n' + read('CHANGES.rst'),
       classifiers=[
-        'Development Status :: 5 - Production/Stable',
-        'Intended Audience :: Developers',
-        'License :: OSI Approved :: Zope Public License',
-        'Programming Language :: Python',
-        '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 :: Implementation :: CPython',
-        'Programming Language :: Python :: Implementation :: PyPy',
-        'Natural Language :: English',
-        'Operating System :: OS Independent',
-        'Topic :: Internet :: WWW/HTTP',
-        'Topic :: Software Development',
-        ],
+          'Development Status :: 5 - Production/Stable',
+          'Intended Audience :: Developers',
+          'License :: OSI Approved :: Zope Public License',
+          'Programming Language :: Python',
+          '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',
+          'Natural Language :: English',
+          'Operating System :: OS Independent',
+          'Topic :: Internet :: WWW/HTTP',
+          'Topic :: Software Development',
+      ],
       packages=find_packages('src'),
-      package_dir = {'': 'src'},
-      test_suite = 'zope.datetime',
+      package_dir={'': 'src'},
+      test_suite='zope.datetime',
       namespace_packages=['zope',],
-      install_requires=['setuptools'],
-      include_package_data = True,
-      zip_safe = False,
-      )
+      install_requires=[
+          'setuptools',
+      ],
+      tests_require=TESTS_REQUIRE,
+      extras_require={
+          'test': TESTS_REQUIRE,
+      },
+      include_package_data=True,
+      zip_safe=False,
+)
diff --git a/tox.ini b/tox.ini
@@ -1,16 +1,20 @@
 [tox]
-envlist = py27,py33,py34,py35,pypy,pypy3,coverage
+envlist =
+   py27,py34,py35,py36,pypy,pypy3,coverage
 
 [testenv]
-commands = python setup.py -q test -q
+commands =
+    zope-testrunner --test-path=src []
+deps =
+    .[test]
 
 [testenv:coverage]
 usedevelop = true
 basepython =
     python2.7
 commands =
-    nosetests --with-xunit --with-xcoverage
+    coverage run -m zope.testrunner --test-path=src
+    coverage report #--fail-under=100
 deps =
-    nose
+    {[testenv]deps}
     coverage
-    nosexcover