Merge pull request #1292 from romanz/master

travis.yml: add protobuf to requirements and exclude plugins
2015-06-12 12:25:12 +02:00 · 2015-06-12 12:25:12 +02:00 · bb4d175978
parent c46ac26d82 b5c53d2ea6
commit bb4d175978
1 changed files with 2 additions and 2 deletions
--- a/.travis.yml
+++ b/.travis.yml
@ -2,5 +2,5 @@ sudo: false
 language: python
 python:
    - "2.7"
-install: "pip install slowaes==0.1a1 ecdsa>=0.9 pbkdf2 requests pyasn1 pyasn1-modules tlslite>=0.4.5 qrcode SocksiPy-branch"
-script: nosetests -e gui
+install: "pip install slowaes==0.1a1 ecdsa>=0.9 pbkdf2 requests pyasn1 pyasn1-modules tlslite>=0.4.5 qrcode SocksiPy-branch protobuf"
+script: nosetests -e gui -e plugins