[Pkg-bitcoin-commits] [python-quamash] 158/269: testing configuration changes

[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 fab2141f49651e6563cbd3eb0f571b8a026d8aea
Author: Mark Harviston <mark.harviston at gmail.com>
Date:   Sun Dec 14 02:31:04 2014 -0800

    testing configuration changes
    
    Using tox to manage virutalenvs
    
    using flake8 + plugins instead of various pytest plugins.
    
    more things are checked (docstrings, pdb statements, pep8-naming, mccabe
    complexity) along with the old checks (pyflakes and pep8)
    
    the coverage report is not generated unless explicitly asked for
    
    py.test configuration moved to tox.ini (py.test looks in tox.ini by
    default, so you can still run py.test to run tests)
---
 .travis.yml |  4 ++--
 pytest.ini  |  3 ---
 tox.ini     | 36 ++++++++++++++++++++++++++++++++++++
 3 files changed, 38 insertions(+), 5 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 7a3b92a..49c8c71 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -6,10 +6,10 @@ before_install:
   - "sh -e /etc/init.d/xvfb start"
 install:
   - sudo apt-get install libqt4-dev
-  - pip install wheelhouse/PySide-1.2.2-cp34-cp34m-linux_x86_64.whl pytest-pep8 pytest-cov pytest-flakes
+  - 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: py.test
+script: tox -e py34-pyside py34-flake8
 cache:
   directories:
     - /home/travis/virtualenv/python3.4.2/lib/python3.4/site-packages
diff --git a/pytest.ini b/pytest.ini
deleted file mode 100644
index 3a35c7d..0000000
--- a/pytest.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[pytest]
-addopts=--doctest-modules quamash --pep8 tests --cov quamash --cov-report html --cov-config coveragerc --flakes
-pep8ignore=W191 E501
diff --git a/tox.ini b/tox.ini
new file mode 100644
index 0000000..db7bbe4
--- /dev/null
+++ b/tox.ini
@@ -0,0 +1,36 @@
+[tox]
+envlist={py34}-{pyqt4,pyqt5,pyside,flake8}
+toxworkdir=/tmp/quamash-tox-work
+
+[testenv]
+deps=pytest
+commands=py.test-3.4
+
+[testenv:py34-pyqt4]
+sitepackages=True
+setenv=QUAMASH_QTIMPL=PyQt4
+
+[testenv:py34-pyqt5]
+sitepackages=True
+setenv=QUAMASH_QTIMPL=PyQt5
+
+[pytest]
+addopts=--doctest-modules quamash quamash tests
+
+[testenv:py34-pyside]
+deps=wheelhouse/PySide-1.2.2-cp34-cp34m-linux_x86_64.whl
+
+[testenv:py34-flake8]
+deps=
+	flake8
+	pep8-naming
+	flake8-debugger
+	flake8-docstrings
+	wheelhouse/PySide-1.2.2-cp34-cp34m-linux_x86_64.whl
+commands=
+	flake8
+
+[flake8]
+ignore=W191,E501
+max-complexity=15
+exclude=build

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