Merge branch 'pypy-5-travis'

Makefile

@@ -98,7 +98,7 @@ PY27=$(BUILD_RUNTIMES)/snakepit/python2.7
 PY33=$(BUILD_RUNTIMES)/snakepit/python3.3
 PY34=$(BUILD_RUNTIMES)/snakepit/python3.4
 PY35=$(BUILD_RUNTIMES)/snakepit/python3.5
-PYPY=$(BUILD_RUNTIMES)/snakepit/pypy
+PYPY=$(BUILD_RUNTIMES)/snakepit/pypy5
 
 TOOLS=$(BUILD_RUNTIMES)/tools
 
@@ -162,7 +162,7 @@ test-py35: $(PY35)
 	PYTHON=python3.5 PATH=$(BUILD_RUNTIMES)/versions/python3.5/bin:$(PATH) make develop fulltoxtest
 
 test-pypy: $(PYPY)
-	PYTHON=pypy PATH=$(BUILD_RUNTIMES)/versions/pypy/bin:$(PATH) make develop toxtest
+	PYTHON=pypy5 PATH=$(BUILD_RUNTIMES)/versions/pypy5/bin:$(PATH) make develop toxtest
 
 test-py27-cffi: $(PY27)
 	GEVENT_CORE_CFFI_ONLY=1 PYTHON=python2.7 PATH=$(BUILD_RUNTIMES)/versions/python2.7/bin:$(PATH) make develop toxtest

doc/intro.rst

@@ -28,7 +28,7 @@ supported. (Users of older versions of Python 2 need to install gevent
 1.0.x (2.5) or 1.1.x (2.6); Python 3 is not supported by 1.0.) gevent requires the
 greenlet__ library.
 
-gevent 1.1 also runs on PyPy 2.6.1 and above, although 4.0 or above is
+gevent 1.1 also runs on PyPy 2.6.1 and above, although 5.0 or above is
 strongly recommended. On PyPy, there are no external dependencies.
 
 .. note:: gevent does *not* run on PyPy on Windows because the CFFI backend
@@ -332,4 +332,4 @@ __ http://sdiehl.github.io/gevent-tutorial/
 
 .. rubric:: Footnotes
 
-.. [#f1] This was not the case before 0.13.0, :meth:`kill <Greenlet>` method in 0.12.2 and older was asynchronous by default.
+.. [#f1] This was not the case before 0.13.0, :meth:`kill <gevent.greenlet.Greenlet.kill>` method in 0.12.2 and older was asynchronous by default.

scripts/install.sh

@@ -100,7 +100,7 @@ for var in "$@"; do
       install 3.5.1 python3.5
       ;;
     pypy)
-      install pypy-4.0.1 pypy
+      install pypy-5.0.0 pypy5
       ;;
   esac
 done