[python-dtcwt] 31/38: Merge remote-tracking branch 'origin/master' into use-isolated-venvs

[Ghislain Vaillant]

This is an automated email from the git hooks/post-receive script.

ghisvail-guest pushed a commit to branch master
in repository python-dtcwt.

commit 9866aee0a4da05b3a40e2d0cedac52cff2a64215
Merge: df2308c 4525867
Author: Rich Wareham <rjw57 at cam.ac.uk>
Date:   Wed Aug 5 10:57:22 2015 +0100

    Merge remote-tracking branch 'origin/master' into use-isolated-venvs
    
    Conflicts:
    	tox.ini

 .coveragerc             | 7 -------
 README.rst              | 3 ++-
 docs/gettingstarted.rst | 3 ++-
 setup.cfg               | 5 -----
 setup.py                | 2 --
 tests/requirements.txt  | 2 ++
 tox.ini                 | 2 +-
 7 files changed, 7 insertions(+), 17 deletions(-)

diff --cc tox.ini
index 34b241e,4700e27..5062628
--- a/tox.ini
+++ b/tox.ini
@@@ -8,4 -8,5 +8,4 @@@ commands
      # We can't list these in deps since pyopencl moans if numpy is not
      # fully installed at pip-install time.
      py{27,34}-opencl: pip install -rtests/opencl-requirements.txt
-     py.test {posargs}
+     py.test --cov={envsitepackagesdir}/dtcwt --cov-report=term {posargs}
 -sitepackages=True

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/python-dtcwt.git