Merge pull request #963 from gevent/pypy571

Pypy2 5.7.1

.travis.yml

 # .travis.yml based on https://github.com/DRMacIver/hypothesis/blob/master/.travis.yml
 language: c
 sudo: false
+dist: trusty
 
 env:
     global:

CHANGES.rst

@@ -9,6 +9,9 @@
 
 - Testing on Python 3.5 now uses Python 3.5.3 due to SSL changes. See
   :issue:`943`.
+- Linux CI has been updated from Ubuntu 12.04 to Ubuntu 14.04 since
+  the former has reached EOL.
+- Linux CI now tests on PyPy2 5.7.1, updated from PyPy2 5.6.0.
 - Python 2 sockets are compatible with the ``SOCK_CLOEXEC`` flag found
   on Linux. They no longer pass the socket type or protocol to
   ``getaddrinfo`` when ``connect`` is called. Reported in :issue:`944`

Makefile

@@ -109,7 +109,7 @@ PY27=$(BUILD_RUNTIMES)/snakepit/python2.7.13
 PY34=$(BUILD_RUNTIMES)/snakepit/python3.4.5
 PY35=$(BUILD_RUNTIMES)/snakepit/python3.5.3
 PY36=$(BUILD_RUNTIMES)/snakepit/python3.6.0
-PYPY=$(BUILD_RUNTIMES)/snakepit/pypy56
+PYPY=$(BUILD_RUNTIMES)/snakepit/pypy571
 PYPY3=$(BUILD_RUNTIMES)/snakepit/pypy3.3_5.5
 
 TOOLS=$(BUILD_RUNTIMES)/tools
@@ -178,7 +178,7 @@ test-py36: $(PY36)
 	PYTHON=python3.6.0 PIP=pip PATH=$(BUILD_RUNTIMES)/versions/python3.6.0/bin:$(PATH) make develop toxtest
 
 test-pypy: $(PYPY)
-	PYTHON=$(PYPY) PIP=pip PATH=$(BUILD_RUNTIMES)/versions/pypy56/bin:$(PATH) make develop toxtest
+	PYTHON=$(PYPY) PIP=pip PATH=$(BUILD_RUNTIMES)/versions/pypy571/bin:$(PATH) make develop toxtest
 
 test-pypy3: $(PYPY3)
 	PYTHON=$(PYPY3) PIP=pip PATH=$(BUILD_RUNTIMES)/versions/pypy3.3_5.5/bin:$(PATH) make develop toxtest

scripts/install.sh

@@ -103,7 +103,7 @@ for var in "$@"; do
       install 3.6.0 python3.6.0
       ;;
     pypy)
-      install pypy2-5.6.0 pypy56
+      install pypy2-5.7.1 pypy571
       ;;
     pypy3)
       install pypy3.3-5.5-alpha pypy3.3_5.5

src/greentest/patched_tests_setup.py

@@ -4,6 +4,8 @@ import sys
 import os
 import re
 
+TRAVIS = os.environ.get("TRAVIS") == "true"
+
 # By default, test cases are expected to switch and emit warnings if there was none
 # If a test is found in this list, it's expected not to switch.
 no_switch_tests = '''test_patched_select.SelectTestCase.test_error_conditions
@@ -356,7 +358,7 @@ if sys.version_info[0] == 3:
         'test_socket.GeneralModuleTests.testGetaddrinfo',
 
     ]
-    if os.environ.get("TRAVIS") == "true":
+    if TRAVIS:
         disabled_tests += [
             # test_cwd_with_relative_executable tends to fail
             # on Travis...it looks like the test processes are stepping
@@ -384,6 +386,15 @@ if hasattr(sys, 'pypy_version_info') and sys.version_info[:2] == (3, 3):
         'test_httplib.HTTPSTest.test_networked_good_cert',
     ]
 
+    if TRAVIS:
+        disabled_tests += [
+            # When we switched to Ubuntu 14.04 trusty, this started
+            # failing with "_ssl.SSLError: [SSL] dh key too small", but it
+            # was fine on 12.04. But we have to switch to be able to
+            # install PyPy? 5.7.1.
+            'test_ssl.ThreadedTests.test_dh_params',
+        ]
+
     disabled_tests += [
         # This raises 'RuntimeError: reentrant call' when exiting the
         # process tries to close the stdout stream; no other platform does this.
@@ -508,7 +519,7 @@ if sys.version_info[:2] >= (3, 4):
             'test_socket.InterruptedSendTimeoutTest.testInterruptedSendmsgTimeout',
         ]
 
-    if os.environ.get('TRAVIS') == 'true':
+    if TRAVIS:
         disabled_tests += [
             'test_subprocess.ProcessTestCase.test_double_close_on_error',
             # This test is racy or OS-dependent. It passes locally (sufficiently fast machine)