Merging master to add-more-test to fix travis

This will make travis tests work on this branch as well.

diff --git a/.travis.yaml b/.travis.yaml
deleted file mode 100644 (file)
index 440086e..0000000
--- a/.travis.yaml
+++ /dev/null
@@ -1,5 +0,0 @@
-language: python
-python:
-    - "2.7"
-install: "pip install slowaes ecdsa>=0.9 pbkdf2 requests pyasn1 pyasn1-modules tlslite>=0.4.5 qrcode"
-script: nosetests lib

diff --git a/.travis.yml b/.travis.yml
new file mode 100644 (file)
index 0000000..ceee7af
--- /dev/null
+++ b/.travis.yml
@@ -0,0 +1,5 @@
+language: python
+python:
+    - "2.7"
+install: "pip install slowaes==0.1a1 ecdsa>=0.9 pbkdf2 requests pyasn1 pyasn1-modules tlslite>=0.4.5 qrcode"
+script: nosetests lib