summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJean-Paul Calderone <exarkun@twistedmatrix.com>2014-05-01 11:18:30 -0400
committerJean-Paul Calderone <exarkun@twistedmatrix.com>2014-05-01 11:18:30 -0400
commitd4ff4e460f30d228407198ad9d0a38b7651735f3 (patch)
treed047a1ffd9addc58c81540d99b4f2dc749e41c94
parent1a3d2112636e4a1639b9d811a0e6c43e34602a0a (diff)
parent9fa575b450c7ed4bb7c73cbe340b768c8a183a8c (diff)
downloadpyopenssl-d4ff4e460f30d228407198ad9d0a38b7651735f3.tar.gz
Merge pull request #106 from pyca/python-3.4-105
Begin to support Python 3.4.0 (by testing against it on CI). No code changes necessary for the test suite to pass.
-rw-r--r--.travis.yml4
1 files changed, 4 insertions, 0 deletions
diff --git a/.travis.yml b/.travis.yml
index f5db002..f359de1 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -9,6 +9,7 @@ python:
- "2.7"
- "3.2"
- "3.3"
+ - "3.4"
matrix:
include:
@@ -25,6 +26,9 @@ matrix:
- python: "3.3"
env:
CRYPTOGRAPHY_GIT_MASTER=true
+ - python: "3.4"
+ env:
+ CRYPTOGRAPHY_GIT_MASTER=true
- python: "pypy"
env:
CRYPTOGRAPHY_GIT_MASTER=true