Skip to content

Commit

Permalink
Merge pull request #7 from zopefoundation/fix-6
Browse files Browse the repository at this point in the history
Fixes #6 - thanks!
  • Loading branch information
dataflake committed Oct 25, 2017
2 parents ad3a96a + f0b7ae5 commit d56e26d
Show file tree
Hide file tree
Showing 5 changed files with 14 additions and 9 deletions.
6 changes: 5 additions & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,14 @@ python:
install:
- pip install -U setuptools==33.1.1
- pip install zc.buildout
- pip install -U coverage coveralls
- pip install -U six==$(curl $(awk '$1 == "extends" {print $3}' buildout.cfg) 2>/dev/null | awk '$1 == "six" {print $3}')
- buildout bootstrap
- buildout
script:
- bin/test -v1
- coverage run bin/test -v1
after_success:
- coveralls
notifications:
email: false
cache:
Expand Down
2 changes: 2 additions & 0 deletions CHANGES.rst
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@ Changelog
3.0.2 (unreleased)
------------------

- Add test coverage computation.

- Various small Python 3 compatibility changes.


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
include *.cfg
exclude .*.cfg

Expand Down
10 changes: 3 additions & 7 deletions buildout.cfg
Original file line number Diff line number Diff line change
@@ -1,14 +1,10 @@
[buildout]
extends =
https://raw.githubusercontent.com/zopefoundation/Zope/master/versions.cfg
extends = https://raw.githubusercontent.com/zopefoundation/Zope/master/versions-prod.cfg
develop = .
parts =
interpreter
parts =
interpreter
test

[versions]
Products.ZSQLMethods =

[interpreter]
recipe = zc.recipe.egg
interpreter = py
Expand Down
4 changes: 3 additions & 1 deletion tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,10 @@ envlist =
commands =
{envbindir}/buildout -c {toxinidir}/buildout.cfg buildout:directory={envdir} buildout:develop={toxinidir} bootstrap
{envbindir}/buildout -c {toxinidir}/buildout.cfg buildout:directory={envdir} buildout:develop={toxinidir}
{envbindir}/test -v1
coverage run {envbindir}/test -cv1
coverage report
skip_install = true
deps =
setuptools==33.1.1
zc.buildout
coverage

0 comments on commit d56e26d

Please sign in to comment.