aboutsummaryrefslogtreecommitdiffstats
path: root/.travis.yml
diff options
context:
space:
mode:
authorAlex Gaynor <alex.gaynor@gmail.com>2016-12-23 12:20:36 -0500
committerPaul Kehrer <paul.l.kehrer@gmail.com>2016-12-23 11:20:36 -0600
commit31b5d784e6542a6bcac9af9b39d3feacabdba137 (patch)
tree5917a94d71a9a8d69a02331ad00c3f9eb60e341b /.travis.yml
parent5685baa2121cb7e5abc99b4325701dad44cb5f30 (diff)
downloadcryptography-31b5d784e6542a6bcac9af9b39d3feacabdba137.tar.gz
cryptography-31b5d784e6542a6bcac9af9b39d3feacabdba137.tar.bz2
cryptography-31b5d784e6542a6bcac9af9b39d3feacabdba137.zip
Fixed #3334 -- added Python 3.6 support (#3335)
* Fixed #3334 -- added Python 3.6 support * install py36 * empty commit to retrigger travis * this is an impressively dumb typo
Diffstat (limited to '.travis.yml')
-rw-r--r--.travis.yml6
1 files changed, 6 insertions, 0 deletions
diff --git a/.travis.yml b/.travis.yml
index 0cd74610..92e7e5b0 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -19,6 +19,8 @@ matrix:
env: TOXENV=py34
- python: 3.5
env: TOXENV=py35
+ - python: 3.6
+ env: TOXENV=py36
- python: pypy
env: TOXENV=pypy-nocoverage PYPY_VERSION=2.6.1
- python: pypy
@@ -60,6 +62,10 @@ matrix:
- language: generic
os: osx
osx_image: xcode8.1
+ env: TOXENV=py36 CRYPTOGRAPHY_OSX_NO_LINK_FLAGS=1
+ - language: generic
+ os: osx
+ osx_image: xcode8.1
env: TOXENV=pypy-nocoverage CRYPTOGRAPHY_OSX_NO_LINK_FLAGS=1 PYPY_VERSION=5.4.1
- language: generic
os: osx