diff options
| author | Alex Gaynor <alex.gaynor@gmail.com> | 2016-12-23 12:20:36 -0500 |
|---|---|---|
| committer | Paul Kehrer <paul.l.kehrer@gmail.com> | 2016-12-23 11:20:36 -0600 |
| commit | 31b5d784e6542a6bcac9af9b39d3feacabdba137 (patch) | |
| tree | 5917a94d71a9a8d69a02331ad00c3f9eb60e341b | |
| parent | 5685baa2121cb7e5abc99b4325701dad44cb5f30 (diff) | |
| download | cryptography-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
| -rw-r--r-- | .travis.yml | 6 | ||||
| -rwxr-xr-x | .travis/install.sh | 4 | ||||
| -rw-r--r-- | CHANGELOG.rst | 2 | ||||
| -rw-r--r-- | docs/installation.rst | 4 | ||||
| -rw-r--r-- | setup.py | 1 | ||||
| -rw-r--r-- | 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 @@ -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 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 @@ -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", @@ -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 = |