From 4e91f7f86436ffe8b1a2bebb4fe1ee74e7824c2c Mon Sep 17 00:00:00 2001
From: Paul Kehrer <paul.l.kehrer@gmail.com>
Date: Mon, 14 Sep 2015 09:02:46 -0500
Subject: let's add python 3.5 to our test matrix

---
 .travis.yml        | 18 ++++++++++++++++++
 .travis/install.sh |  4 ++++
 tox.ini            |  2 +-
 3 files changed, 23 insertions(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 61d3b10a..5e30fd68 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -16,6 +16,8 @@ matrix:
           env: TOXENV=py33
         - python: 3.4
           env: TOXENV=py34
+        - python: 3.5
+          env: TOXENV=py35
         - python: pypy
           env: TOXENV=pypy
         - python: 2.6
@@ -50,6 +52,14 @@ matrix:
                       - lucid
                   packages:
                       - libssl-dev/lucid
+        - python: 3.5
+          env: TOXENV=py35 OPENSSL=0.9.8
+          addons:
+              apt:
+                  sources:
+                      - lucid
+                  packages:
+                      - libssl-dev/lucid
         - python: pypy
           env: TOXENV=pypy OPENSSL=0.9.8
           addons:
@@ -84,6 +94,10 @@ matrix:
           os: osx
           osx_image: xcode7
           env: TOXENV=py34 CRYPTOGRAPHY_OSX_NO_LINK_FLAGS=1
+        - language: generic
+          os: osx
+          osx_image: xcode7
+          env: TOXENV=py35 CRYPTOGRAPHY_OSX_NO_LINK_FLAGS=1
         - language: generic
           os: osx
           osx_image: xcode7
@@ -108,6 +122,10 @@ matrix:
           os: osx
           osx_image: xcode7
           env: TOXENV=py34 OPENSSL=0.9.8
+        - language: generic
+          os: osx
+          osx_image: xcode7
+          env: TOXENV=py35 OPENSSL=0.9.8
         - language: generic
           os: osx
           osx_image: xcode7
diff --git a/.travis/install.sh b/.travis/install.sh
index 929cf48b..1e625509 100755
--- a/.travis/install.sh
+++ b/.travis/install.sh
@@ -33,6 +33,10 @@ if [[ "$(uname -s)" == 'Darwin' ]]; then
             pyenv install 3.4.2
             pyenv global 3.4.2
             ;;
+        py35)
+            pyenv install 3.5.0
+            pyenv global 3.5.0
+            ;;
         pypy)
             pyenv install pypy-2.6.1
             pyenv global pypy-2.6.1
diff --git a/tox.ini b/tox.ini
index 7ee4d801..3f733861 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,5 +1,5 @@
 [tox]
-envlist = py26,py27,pypy,py33,py34,docs,pep8,py3pep8
+envlist = py26,py27,pypy,py33,py34,py35,docs,pep8,py3pep8
 
 [testenv]
 # If you add a new dep here you probably need to add it in setup.py as well
-- 
cgit v1.2.3