From 31b5d784e6542a6bcac9af9b39d3feacabdba137 Mon Sep 17 00:00:00 2001
From: Alex Gaynor <alex.gaynor@gmail.com>
Date: Fri, 23 Dec 2016 12:20:36 -0500
Subject: 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
---
 .travis.yml           | 6 ++++++
 .travis/install.sh    | 4 ++++
 CHANGELOG.rst         | 2 ++
 docs/installation.rst | 4 ++--
 setup.py              | 1 +
 tox.ini               | 2 +-
 6 files changed, 16 insertions(+), 3 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
@@ -57,6 +59,10 @@ matrix:
           os: osx
           osx_image: xcode8.1
           env: TOXENV=py35 CRYPTOGRAPHY_OSX_NO_LINK_FLAGS=1
+        - 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
diff --git a/.travis/install.sh b/.travis/install.sh
index f405ab1c..14c29dfe 100755
--- a/.travis/install.sh
+++ b/.travis/install.sh
@@ -32,6 +32,10 @@ if [[ "$(uname -s)" == 'Darwin' ]]; then
             pyenv install 3.5.2
             pyenv global 3.5.2
             ;;
+        py36)
+            pyenv install 3.6.0
+            pyenv global 3.6.0
+            ;;
         pypy*)
             pyenv install "pypy-$PYPY_VERSION"
             pyenv global "pypy-$PYPY_VERSION"
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index a4bcac32..15f444ce 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -6,6 +6,8 @@ Changelog
 
 .. note:: This version is not yet released and is under active development.
 
+* Added support for Python 3.6.
+
 1.7.1 - 2016-12-13
 ~~~~~~~~~~~~~~~~~~
 
diff --git a/docs/installation.rst b/docs/installation.rst
index 0c489adc..888b8bc4 100644
--- a/docs/installation.rst
+++ b/docs/installation.rst
@@ -10,8 +10,8 @@ You can install ``cryptography`` with ``pip``:
 Supported platforms
 -------------------
 
-Currently we test ``cryptography`` on Python 2.6, 2.7, 3.3, 3.4, 3.5, and PyPy
-2.6+ on these operating systems.
+Currently we test ``cryptography`` on Python 2.6, 2.7, 3.3, 3.4, 3.5, 3.6, and
+PyPy 2.6+ on these operating systems.
 
 * x86-64 CentOS 7.x, 6.4
 * x86-64 FreeBSD 10
diff --git a/setup.py b/setup.py
index c5a99be5..8419e6a7 100644
--- a/setup.py
+++ b/setup.py
@@ -297,6 +297,7 @@ setup(
         "Programming Language :: Python :: 3.3",
         "Programming Language :: Python :: 3.4",
         "Programming Language :: Python :: 3.5",
+        "Programming Language :: Python :: 3.6",
         "Programming Language :: Python :: Implementation :: CPython",
         "Programming Language :: Python :: Implementation :: PyPy",
         "Topic :: Security :: Cryptography",
diff --git a/tox.ini b/tox.ini
index e29b2d5d..0e75011a 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,6 +1,6 @@
 [tox]
 minversion = 2.4
-envlist = py26,py27,pypy,py33,py34,py35,docs,pep8,py3pep8
+envlist = py26,py27,pypy,py33,py34,py35,py36,docs,pep8,py3pep8
 
 [testenv]
 extras =
-- 
cgit v1.2.3