Revert update of PyPy3 to 7.1; checksum mismatch in pyenv right now.

Also restore the ban on test_ssl.py: the allocation failures still exist.

CHANGES.rst

@@ -7,9 +7,10 @@
 1.5.0 (unreleased)
 ==================
 
-- Python version updates: gevent is now tested with CPython 2.7.15,
-  3.5.6, 3.6.8, and 3.7.2. It is also tested with PyPy2 7.1 and PyPy
-  3.6 7.1 (PyPy 7.0 was not capable of running SSL tests on Travis CI).
+- Python version updates: gevent is now tested with CPython 2.7.16,
+  3.5.6, 3.6.8, and 3.7.2. It is also tested with PyPy2 7.1 and PyPy 3.6
+  7.1 (PyPy 7.0 and 7.1 were not capable of running SSL tests on Travis
+  CI).
 
 - Support for Python 3.4 has been removed, as that version is no
   longer supported uptstream.

Makefile

@@ -8,7 +8,7 @@ CYTHON?=cython
 
 
 
-export PATH:=$(BUILD_RUNTIMES)/snakepit:$(TOOLS):$(PATH)
+export PATH:=$(BUILD_RUNTIMES)/snakepit:$(PATH)
 export LC_ALL=C.UTF-8
 export GEVENT_RESOLVER_NAMESERVERS=8.8.8.8
 
@@ -127,17 +127,7 @@ PY35=$(BUILD_RUNTIMES)/snakepit/python3.5.6
 PY36=$(BUILD_RUNTIMES)/snakepit/python3.6.8
 PY37=$(BUILD_RUNTIMES)/snakepit/python3.7.2
 PYPY=$(BUILD_RUNTIMES)/snakepit/pypy710
-PYPY3=$(BUILD_RUNTIMES)/snakepit/pypy3.6_710
-
-TOOLS=$(BUILD_RUNTIMES)/tools
-
-TOX=$(TOOLS)/tox
-
-TOOL_VIRTUALENV=$(BUILD_RUNTIMES)/virtualenvs/tools
-ISORT_VIRTUALENV=$(BUILD_RUNTIMES)/virtualenvs/isort
-TOOL_PYTHON=$(TOOL_VIRTUALENV)/bin/python
-TOOL_PIP=$(TOOL_VIRTUALENV)/bin/pip
-TOOL_INSTALL=$(TOOL_PIP) install --upgrade
+PYPY3=$(BUILD_RUNTIMES)/snakepit/pypy3.6_700
 
 
 $(PY27):
@@ -191,7 +181,7 @@ test-pypy: $(PYPY)
 	PYTHON=$(PYPY) PATH=$(BUILD_RUNTIMES)/versions/pypy710/bin:$(PATH) make develop cffibackendtest
 
 test-pypy3: $(PYPY3)
-	PYTHON=$(PYPY3) PATH=$(BUILD_RUNTIMES)/versions/pypy3.6_710/bin:$(PATH) make develop basictest
+	PYTHON=$(PYPY3) PATH=$(BUILD_RUNTIMES)/versions/pypy3.6_700/bin:$(PATH) make develop basictest
 
 test-py27-noembed: $(PY27)
 	@python2.7.16 scripts/travis.py fold_start conf_libev "Configuring libev"

scripts/install.sh

@@ -101,7 +101,7 @@ for var in "$@"; do
       install pypy2.7-7.1.0 pypy710
       ;;
     pypy3)
-      install pypy3.6-7.1.0 pypy3.6_710
+      install pypy3.6-7.0.0 pypy3.6_700
       ;;
   esac
 done

src/gevent/testing/patched_tests_setup.py

@@ -494,13 +494,16 @@ if LIBUV:
             'test_ssl.ThreadedTests.test_handshake_timeout',
 
             # These sometimes raise LoopExit, for no apparent reason,
-            # mostly but not exclusively on Python 2.
+            # mostly but not exclusively on Python 2. Sometimes (often?)
+            # this happens in the setUp() method when we attempt to get a client
+            # connection
             'test_socket.BufferIOTest.testRecvFromIntoBytearray',
             'test_socket.BufferIOTest.testRecvFromIntoArray',
             'test_socket.BufferIOTest.testRecvIntoArray',
             'test_socket.BufferIOTest.testRecvFromIntoEmptyBuffer',
             'test_socket.BufferIOTest.testRecvFromIntoMemoryview',
             'test_socket.BufferIOTest.testRecvFromIntoSmallBuffer',
+            'test_socket.BufferIOTest.testRecvIntoBytearray',
         ]
 
         if PY3:

src/gevent/tests/known_failures.py

@@ -259,6 +259,11 @@ if PYPY:
             # This fails to get the correct results, sometimes. I can't reproduce locally
             'FLAKY test__example_udp_server.py',
             'FLAKY test__example_udp_client.py',
+
+            # PyPy 7.0 and 7.1 on Travis with Ubunto Xenial 16.04
+            # can't allocate SSL Context objects, either in Python 2.7
+            # or 3.6. There must be some library incompatibility.
+            'test_ssl.py',
         ]
 
         if LIBUV:
@@ -290,8 +295,6 @@ if PYPY:
 
             ## Unknown; can't reproduce locally on OS X
             'FLAKY test_subprocess.py', # timeouts on one test.
-
-            'FLAKY test_ssl.py',
         ]