Skip to content

Commit

Permalink
Add support for Python 3.6, drop Python 3.3.
Browse files Browse the repository at this point in the history
Switch to zope.testrunner instead of setup.py test.

Whitespace gardening in setup.py.
  • Loading branch information
jamadden committed Jul 20, 2017
1 parent fd86478 commit eb18e28
Show file tree
Hide file tree
Showing 7 changed files with 90 additions and 64 deletions.
6 changes: 6 additions & 0 deletions .coveragerc
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
[run]
source = src

[report]
exclude_lines =
pragma: no cover
28 changes: 19 additions & 9 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,16 +1,26 @@
language: python
sudo: false
python:
- 2.7
- 3.3
- 3.4
- 3.5
- pypy
- pypy3
- 2.7
- 3.4
- 3.5
- 3.6
- pypy-5.6.0
- pypy3.3-5.5-alpha
install:
- pip install .
- pip install zope.error[test]
- pip install -U pip setuptools
- pip install -U coveralls coverage
- pip install -U -e ".[test]"
script:
- python setup.py test -q
- coverage run -m zope.testrunner --test-path=src --auto-color --auto-progress

after_success:
- coveralls

notifications:
email: false

cache: pip

before_cache:
- rm -f $HOME/.cache/pip/log/debug.log
6 changes: 4 additions & 2 deletions CHANGES.rst
Original file line number Diff line number Diff line change
@@ -1,10 +1,12 @@
Changes
=======

4.3.1 (unreleased)
4.4.0 (unreleased)
------------------

- Nothing changed yet.
- Drop support for Python 3.3.

- Add support for Python 3.6.


4.3.0 (2016-07-07)
Expand Down
3 changes: 2 additions & 1 deletion MANIFEST.in
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,10 @@ include *.txt
include bootstrap.py
include buildout.cfg
include MANIFEST.in

recursive-include src *.zcml

# added by check_manifest.py
include *.rst
include .travis.yml
include tox.ini
include .coveragerc
4 changes: 4 additions & 0 deletions README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,8 @@
.. image:: https://travis-ci.org/zopefoundation/zope.error.png?branch=master
:target: https://travis-ci.org/zopefoundation/zope.error

.. image:: https://coveralls.io/repos/github/zopefoundation/zope.error/badge.svg
:target: https://coveralls.io/github/zopefoundation/zope.error


This package provides an error reporting utility which is able to store errors.
98 changes: 51 additions & 47 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -28,51 +28,55 @@ def read(*rnames):
return f.read()

setup(name='zope.error',
version='4.3.1.dev0',
author='Zope Foundation and Contributors',
author_email='zope-dev@zope.org',
description = "An error reporting utility for Zope3",
long_description=(
read('README.rst')
+ '\n\n' +
read('CHANGES.rst')
),
license='ZPL 2.1',
keywords = "zope3 error",
classifiers = [
'Development Status :: 5 - Production/Stable',
'Environment :: Web Environment',
'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',
'Framework :: Zope3'],
url='http://pypi.python.org/pypi/zope.error',
packages=find_packages('src'),
package_dir = {'': 'src'},
namespace_packages=['zope',],
install_requires=['setuptools',
'zope.exceptions',
'zope.interface',
'zope.location',
'persistent', # error.py imports from persistent
'six'
],
extras_require=dict(
test=[
version='4.4.0.dev0',
author='Zope Foundation and Contributors',
author_email='zope-dev@zope.org',
description="An error reporting utility for Zope3",
long_description=(
read('README.rst')
+ '\n\n' +
read('CHANGES.rst')
),
license='ZPL 2.1',
keywords="zope3 error",
classifiers=[
'Development Status :: 5 - Production/Stable',
'Environment :: Web Environment',
'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',
'Framework :: Zope3',
],
url='http://github.com/zopefoundation/zope.error',
packages=find_packages('src'),
package_dir={'': 'src'},
namespace_packages=['zope',],
install_requires=[
'setuptools',
'zope.exceptions',
'zope.interface',
'zope.location',
'persistent', # error.py imports from persistent
'six',
],
extras_require={
'test': [
'zope.testing >= 3.8',
]),
test_suite = 'zope.error.tests',
include_package_data = True,
zip_safe = False,
)
'zope.testrunner',
],
},
test_suite='zope.error.tests',
include_package_data=True,
zip_safe=False,
)
9 changes: 4 additions & 5 deletions tox.ini
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
[tox]
envlist = py27,py33,py34,py35,pypy,pypy3
envlist = py27,py34,py35,py36,pypy,pypy3

[testenv]
commands =
python setup.py -q test -q
deps =
zope.testing
six
zope-testrunner --test-path=src
deps =
.[test]

0 comments on commit eb18e28

Please sign in to comment.