Skip to content

Commit

Permalink
Add support for Python 3.6
Browse files Browse the repository at this point in the history
Switch to using zope-testrunner instead of setup.py test because of
the namespace package issues.

Enable pip caching on travis.

Stop testing pypy3 on travis since it implements Python 3.2 and is not
supported by pip anymore. There is a 3.3-alpha available on travis,
but that's a dead end and not developed anymore since 3.5-beta is
out (but not available on Travis AFAIK).

Fixes #6.
  • Loading branch information
jamadden committed Apr 24, 2017
1 parent 0f265ce commit 04cbcc4
Show file tree
Hide file tree
Showing 7 changed files with 50 additions and 30 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
15 changes: 11 additions & 4 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,18 @@ python:
- 3.3
- 3.4
- 3.5
- pypy
- pypy3
- 3.6
- pypy-5.4.1
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 -m zope.testrunner --test-path=src
notifications:
email: false
cache: pip
before_cache:
- rm -f $HOME/.cache/pip/log/debug.log
after_success:
- coveralls
2 changes: 1 addition & 1 deletion CHANGES.rst
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
4.1.1 (unreleased)
------------------

- Nothing changed yet.
- Add support for Python 3.6.


4.1.0 (2017-04-12)
Expand Down
1 change: 1 addition & 0 deletions MANIFEST.in
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
include *.rst
include *.txt
include .coveragerc

recursive-include docs *
recursive-include src *
Expand Down
3 changes: 3 additions & 0 deletions setup.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -8,3 +8,6 @@ where=src
[aliases]
dev = develop easy_install zope.exceptions[testing]
docs = easy_install zope.exceptions[docs]

[bdist_wheel]
universal = 1
38 changes: 23 additions & 15 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -40,15 +40,19 @@ def alltests():
suites = list(zope.testrunner.find.find_suites(options))
return unittest.TestSuite(suites)

tests_require = [
'zope.testrunner',
]

setup(name='zope.exceptions',
version='4.1.1.dev0',
author='Zope Foundation and Contributors',
author_email='zope-dev@zope.org',
description='Zope Exceptions',
long_description=(read('README.rst') + '\n\n' +
read('CHANGES.rst')),
keywords = 'zope exceptions',
classifiers = [
keywords='zope exceptions',
classifiers=[
'Development Status :: 5 - Production/Stable',
'Environment :: Web Environment',
'Intended Audience :: Developers',
Expand All @@ -60,28 +64,32 @@ def alltests():
'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'],
'Framework :: Zope3',
],
url='http://cheeseshop.python.org/pypi/zope.exceptions',
license='ZPL 2.1',
packages=find_packages('src'),
package_dir = {'': 'src'},
package_dir={'': 'src'},
namespace_packages=['zope'],
install_requires=['setuptools',
'zope.interface',
],
tests_require = [
install_requires=[
'setuptools',
'zope.interface',
],
tests_require=[
'zope.testrunner',
],
test_suite = '__main__.alltests',
include_package_data = True,
zip_safe = False,
extras_require = {
'docs': ['Sphinx', 'repoze.sphinx.autointerface'],
'testing': ['nose', 'coverage'],
],
test_suite='__main__.alltests',
include_package_data=True,
zip_safe=False,
extras_require={
'docs': ['Sphinx', 'repoze.sphinx.autointerface'],
'testing': ['nose', 'coverage'],
'test': tests_require,
},
)
15 changes: 5 additions & 10 deletions tox.ini
Original file line number Diff line number Diff line change
@@ -1,13 +1,12 @@
[tox]
envlist =
py27,py33,py34,py35,pypy,pypy3,coverage,docs
py27,py33,py34,py35,py36,pypy,pypy3,coverage,docs

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

[testenv:coverage]
usedevelop = true
Expand All @@ -16,9 +15,7 @@ basepython =
commands =
nosetests --with-xunit --with-xcoverage
deps =
zope.interface
nose
coverage
.[test,testing]
nosexcover

[testenv:docs]
Expand All @@ -28,6 +25,4 @@ commands =
sphinx-build -b html -d docs/_build/doctrees docs docs/_build/html
sphinx-build -b doctest -d docs/_build/doctrees docs docs/_build/doctest
deps =
zope.interface
Sphinx
repoze.sphinx.autointerface
.[test,docs]

0 comments on commit 04cbcc4

Please sign in to comment.