[Pkg-bitcoin-commits] [python-quamash] 163/269: test configuration update : test PyQt/tox is working

[Jonas Smedegaard]

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

js pushed a commit to branch master
in repository python-quamash.

commit 8d69e7b0b86f99a4af251ecd8b0811e88d51273f
Author: Mark Harviston <mark.harviston at gmail.com>
Date:   Sun Dec 14 04:40:55 2014 -0800

    test configuration update : test PyQt/tox is working
---
 .travis.yml |  4 ++--
 tox.ini     | 16 ++++++++++------
 2 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 49c8c71..b7bf036 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -5,11 +5,11 @@ before_install:
   - "export DISPLAY=:99.0"
   - "sh -e /etc/init.d/xvfb start"
 install:
-  - sudo apt-get install libqt4-dev
+  - sudo apt-get install libqt4-dev python3-pyqt5 python3-pyqt4
   - pip install wheelhouse/PySide-1.2.2-cp34-cp34m-linux_x86_64.whl
    # Travis CI servers use virtualenvs, so we need to finish the install by the following
   - python ~/virtualenv/python${TRAVIS_PYTHON_VERSION}/bin/pyside_postinstall.py -install
-script: tox -e py34-pyside py34-flake8
+script: tox
 cache:
   directories:
     - /home/travis/virtualenv/python3.4.2/lib/python3.4/site-packages
diff --git a/tox.ini b/tox.ini
index db7bbe4..0596593 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,34 +1,38 @@
 [tox]
 envlist={py34}-{pyqt4,pyqt5,pyside,flake8}
-toxworkdir=/tmp/quamash-tox-work
+toxworkdir={homedir}/quamash-tox-work
 
 [testenv]
-deps=pytest
 commands=py.test-3.4
 
 [testenv:py34-pyqt4]
 sitepackages=True
 setenv=QUAMASH_QTIMPL=PyQt4
+deps=pytest
 
 [testenv:py34-pyqt5]
 sitepackages=True
 setenv=QUAMASH_QTIMPL=PyQt5
+deps=pytest
 
 [pytest]
 addopts=--doctest-modules quamash quamash tests
 
 [testenv:py34-pyside]
-deps=wheelhouse/PySide-1.2.2-cp34-cp34m-linux_x86_64.whl
+sitepackages=False
+deps=
+	pytest
+	wheelhouse/PySide-1.2.2-cp34-cp34m-linux_x86_64.whl
 
 [testenv:py34-flake8]
+sitepackages=False
 deps=
 	flake8
 	pep8-naming
 	flake8-debugger
-	flake8-docstrings
+# flake8-docstrings - currently behaves badly in python 3 :-(
 	wheelhouse/PySide-1.2.2-cp34-cp34m-linux_x86_64.whl
-commands=
-	flake8
+commands=flake8
 
 [flake8]
 ignore=W191,E501

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-bitcoin/python-quamash.git