Skip to content

Commit

Permalink
Merge 85301d3 into b63df2b
Browse files Browse the repository at this point in the history
  • Loading branch information
Michael Howitz committed Jan 27, 2019
2 parents b63df2b + 85301d3 commit c38d3b0
Show file tree
Hide file tree
Showing 9 changed files with 22 additions and 13 deletions.
14 changes: 10 additions & 4 deletions .travis.yml
Expand Up @@ -5,8 +5,16 @@ python:
- 3.4
- 3.5
- 3.6
- pypy-5.6.0
- pypy3.3-5.5-alpha
- pypy
- pypy3
matrix:
include:
- python: 3.7
dist: xenial
- python: 3.6
name: "Flake8"
install: pip install -U flake8
script: flake8 --doctests src setup.py
install:
- pip install -U pip setuptools zope.testrunner
- pip install -U coveralls coverage
Expand All @@ -18,5 +26,3 @@ after_success:
notifications:
email: false
cache: pip
before_cache:
- rm -f $HOME/.cache/pip/log/debug.log
2 changes: 1 addition & 1 deletion CHANGES.txt → CHANGES.rst
Expand Up @@ -5,7 +5,7 @@ CHANGES
1.1 (unreleased)
----------------

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


1.0 (2017-06-16)
Expand Down
3 changes: 2 additions & 1 deletion MANIFEST.in
@@ -1,9 +1,10 @@
include *.py
include *.txt
include *.rst
include .coveragerc
include buildout.cfg
include tox.ini

recursive-include src *.pt
recursive-include src *.txt
recursive-include src *.rst
recursive-include src *.zcml
File renamed without changes.
9 changes: 5 additions & 4 deletions setup.py
Expand Up @@ -27,11 +27,11 @@ def read(*rnames):
author_email="zope-dev@zope.org",
description="Wizard based on z3c.form for for Zope3",
long_description='\n\n'.join([
read('README.txt'),
read('README.rst'),
'.. contents::',
read('src', 'z3c', 'wizard', 'README.txt'),
read('src', 'z3c', 'wizard', 'zcml.txt'),
read('CHANGES.txt'),
read('src', 'z3c', 'wizard', 'README.rst'),
read('src', 'z3c', 'wizard', 'zcml.rst'),
read('CHANGES.rst'),
]),
license="ZPL 2.1",
keywords="zope zope3 z3c form wizard",
Expand All @@ -46,6 +46,7 @@ def read(*rnames):
'Programming Language :: Python :: 3.4',
'Programming Language :: Python :: 3.5',
'Programming Language :: Python :: 3.6',
'Programming Language :: Python :: 3.7',
'Programming Language :: Python :: Implementation :: CPython',
'Programming Language :: Python :: Implementation :: PyPy',
'Natural Language :: English',
Expand Down
File renamed without changes.
4 changes: 2 additions & 2 deletions src/z3c/wizard/tests.py
Expand Up @@ -94,12 +94,12 @@ def test_verifyObject(self):
def test_suite():
return unittest.TestSuite((
doctest.DocFileSuite(
'README.txt',
'README.rst',
setUp=testing.setUp, tearDown=testing.tearDown,
optionflags=doctest.NORMALIZE_WHITESPACE | doctest.ELLIPSIS,
),
doctest.DocFileSuite(
'zcml.txt',
'zcml.rst',
setUp=testing.setUp, tearDown=testing.tearDown,
optionflags=doctest.NORMALIZE_WHITESPACE | doctest.ELLIPSIS,),
unittest.makeSuite(TestStep),
Expand Down
File renamed without changes.
3 changes: 2 additions & 1 deletion tox.ini
Expand Up @@ -5,6 +5,7 @@ envlist =
py34,
py35,
py36,
py37,
pypy,
pypy3,
coverage
Expand All @@ -27,7 +28,7 @@ skip_install = true
commands =
coverage erase
coverage combine
coverage report
coverage report --show-missing --fail-under=84
coverage html
coverage xml

Expand Down

0 comments on commit c38d3b0

Please sign in to comment.