commit e3e284b25d52ede917942fe50fa5807ffdd8f66f
author Laurens Van Houtven <_@lvh.cc> Mon Mar 17 11:21:27 2014 +0100
committer Laurens Van Houtven <_@lvh.cc> Mon Mar 17 11:21:27 2014 +0100
tree 698e29bb8797139ce411944766f2f2222809e0c4
parent 77d7b915921deaca62dd92e9f41dd08f0154edf3
parent 82285ecf6a4c734c9ee49687790ca8b3bbd6a80f

Merge pull request #64 from reaperhulk/travis-test-cryptography-master

Test against cryptography's master branch

.travis.yml

diff --git a/.travis.yml b/.travis.yml
index 68149b4..52f1032 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -11,6 +11,24 @@
   - "3.2"
   - "3.3"
 
+matrix:
+  include:
+  - python: "2.6"
+    env: CRYPTOGRAPHY_GIT_MASTER=true
+  - python: "2.7"
+    env: CRYPTOGRAPHY_GIT_MASTER=true
+  - python: "3.2"
+    env: CRYPTOGRAPHY_GIT_MASTER=true
+  - python: "3.3"
+    env: CRYPTOGRAPHY_GIT_MASTER=true
+  - python: "pypy"
+    env: CRYPTOGRAPHY_GIT_MASTER=true
+  allow_failures:
+  - env: CRYPTOGRAPHY_GIT_MASTER=true
+
+before_install:
+  - if [ -n "$CRYPTOGRAPHY_GIT_MASTER" ]; then pip install git+https://github.com/pyca/cryptography.git;fi
+
 install:
   # Install the wheel library explicitly here.  It is not really a setup
   # dependency.  It is not an install dependency.  It is only a dependency for