[Pkg-bitcoin-commits] [python-quamash] 151/269: Merge branch 'master' of https://github.com/harvimt/quamash

[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 74738cd3a7f9dcedc21b5c8bdc74cc2641bc4451
Merge: ba4c95b 7474c3d
Author: Arve Knudsen <arve.knudsen at gmail.com>
Date:   Mon Dec 8 16:46:24 2014 +0100

    Merge branch 'master' of https://github.com/harvimt/quamash

 .travis.yml                                        |   2 +-
 quamash/__init__.py                                |  27 ++++++++++++++-------
 .../PySide-1.2.2-cp34-cp34m-linux_x86_64.whl       | Bin 0 -> 13398014 bytes
 3 files changed, 19 insertions(+), 10 deletions(-)

diff --cc .travis.yml
index ac5a85d,60d2aa5..0e647e6
--- a/.travis.yml
+++ b/.travis.yml
@@@ -4,8 -4,5 +4,8 @@@ python
  before_install:
    - "export DISPLAY=:99.0"
    - "sh -e /etc/init.d/xvfb start"
- install: "pip install pyside pytest-pep8 pytest-cov pytest-flakes"
+ install: "pip install wheelhouse/PySide-1.2.2-cp34-cp34m-linux_x86_64.whl pytest-pep8 pytest-cov pytest-flakes"
  script: py.test
 +cache:
 +  directories:
 +    - /home/travis/virtualenv/python3.4.2/lib/python3.4/site-packages

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