Add support and testing for PyPy 4.0

Author: jmoldow

.travis.yml

@@ -21,7 +21,7 @@ matrix:
     - python: 3.5
       env: TOX_ENV=py35
     - python: pypy
-      env: TOX_ENV=pypy
+      env: TOX_ENV=pypy PYPY_VERSION='4.0.0'
     - python: 2.7
       env: TOX_ENV=pep8
     - python: 2.7

.travis/install.sh

@@ -42,21 +42,21 @@ if [[ "$(uname -s)" == 'Darwin' ]]; then
             pyenv global 3.5.0
             ;;
         pypy)
-            pyenv install pypy-2.6.0
-            pyenv global pypy-2.6.0
+            pyenv install "pypy-${PYPY_VERSION}"
+            pyenv global "pypy-${PYPY_VERSION}"
             ;;
     esac
     pyenv rehash
     python -m pip install -U --user virtualenv
 else
-    # temporary pyenv installation to get pypy-2.6 before container infra upgrade
+    # pyenv installation to get specified pypy version (Travis may only have older version(s))
     if [[ "${TOX_ENV}" == "pypy" ]]; then
         git clone https://github.com/yyuu/pyenv.git $PWD/.pyenv
         export PYENV_ROOT="$PWD/.pyenv"
         export PATH="$PYENV_ROOT/bin:$PATH"
         eval "$(pyenv init -)"
-        pyenv install pypy-2.6.0
-        pyenv global pypy-2.6.0
+        pyenv install "pypy-${PYPY_VERSION}"
+        pyenv global "pypy-${PYPY_VERSION}"
     fi
     pip install -U virtualenv
 fi

.travis/run.sh

@@ -14,7 +14,7 @@ else
         export PYENV_ROOT="$PWD/.pyenv"
         export PATH="$PYENV_ROOT/bin:$PATH"
         eval "$(pyenv init -)"
-        pyenv global pypy-2.6.0
+        pyenv global "pypy-${PYPY_VERSION}"
     fi
 fi
 source $PWD/.venv/bin/activate

HISTORY.rst

@@ -7,8 +7,8 @@ Upcoming
 ++++++++
 
 - CPython 3.5 support.
-- Support for cryptography>=1.0 on PyPy 2.6.
-- Travis CI testing for CPython 3.5 and PyPy 2.6.0.
+- Support for cryptography>=1.0 on PyPy >=2.6.
+- Travis CI testing for CPython 3.5 and PyPy 4.0.
 
 1.2.1 (2015-07-22)
 ++++++++++++++++++

README.rst

@@ -312,7 +312,7 @@ Run all tests using -
 The tox tests include code style checks via pep8 and pylint.
 
 The tox tests are configured to run on Python 2.6, 2.7, 3.3, 3.4, 3.5, and
-PyPy 2.6.
+PyPy (our CI is configured to run PyPy tests on PyPy 4.0).
 
 
 Support