[python-dtcwt] 15/38: Merge pull request #114 from rjw57/tox-refactor

[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 db8d452a17901a28c0ec9be3188283644845c2ee
Merge: 0e28cf3 c83acda
Author: Rich Wareham <rjw57 at cam.ac.uk>
Date:   Tue Aug 4 16:59:27 2015 +0100

    Merge pull request #114 from rjw57/tox-refactor
    
    fix Travis tests by moving to tox

 .gitignore                    | 18 ++++++++++++++----
 .travis.yml                   | 23 +++++++++--------------
 MANIFEST.in                   |  2 ++
 dtcwt/opencl/lowlevel.py      |  2 +-
 pytest.ini                    |  3 +++
 tests/opencl-requirements.txt |  4 ++++
 tests/requirements.txt        |  3 +++
 tests/testagainstmatlab.py    |  2 --
 tests/testcoeffs.py           | 18 +++++++++---------
 tests/testcoldfilt.py         | 14 +++++++-------
 tests/testcolifilt.py         | 14 +++++++-------
 tests/testifm1.py             |  5 +----
 tests/testifm2.py             |  5 -----
 tests/testopenclcoldfilt.py   | 14 +++++++-------
 tests/testopenclcolifilt.py   | 14 +++++++-------
 tests/testopenclxfm2.py       | 10 +++-------
 tests/testswitchbackends.py   | 13 ++++++-------
 tests/testxfm1.py             | 14 +++-----------
 tests/testxfm2.py             |  9 +++------
 tests/testxfm3.py             |  2 --
 tests/util.py                 | 20 +++++++-------------
 tox.ini                       | 12 ++++++++++++
 22 files changed, 108 insertions(+), 113 deletions(-)

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