Move to PyPy 3.7

th0114nd · Dec 11, 2021 · f1c55ee · f1c55ee
1 parent 51c5aa8
commit f1c55ee
Show file tree

Hide file tree

Showing 65 changed files with 6,841 additions and 4,590 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -145,7 +145,7 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        python-version: [2.7, pypy-2.7, pypy-3.6, 3.6, 3.7, 3.8, 3.9, '3.10.0']
+        python-version: [2.7, pypy-2.7, pypy-3.7, 3.6, 3.7, 3.8, 3.9, '3.10.0']
         # ubuntu-latest is at least 20.04. But this breaks the SSL
         # tests because Ubuntu increased the default OpenSSL
         # strictness.
@@ -156,15 +156,15 @@ jobs:
           - os: macos-latest
             python-version: pypy-2.7
           - os: macos-latest
-            python-version: pypy-3.6
+            python-version: pypy-3.7
           - os: macos-latest
             python-version: 3.6
           - os: ubuntu-latest
             python-version: 2.7
           - os: ubuntu-latest
             python-version: pypy-2.7
           - os: ubuntu-latest
-            python-version: pypy-3.6
+            python-version: pypy-3.7
           - os: ubuntu-latest
             python-version: 3.6
           - os: ubuntu-latest

diff --git a/docs/changes/1843.misc b/docs/changes/1843.misc
@@ -0,0 +1,3 @@
+Update the tested versions of PyPy2 and PyPy3. For PyPy2, there should
+be no user visible changes, but for PyPy3, support has moved from
+Python 3.6 to Python 3.7.
diff --git a/src/gevent/_ssl3.py b/src/gevent/_ssl3.py
@@ -638,7 +638,6 @@ def unwrap(self):
                     break
                 raise
 
-
         self._sslobj = None
 
         # The return value of shutting down the SSLObject is the

diff --git a/src/gevent/testing/patched_tests_setup.py b/src/gevent/testing/patched_tests_setup.py
@@ -281,6 +281,13 @@ def get_switch_expected(fullname):
         'test_subprocess.ProcesstestCase.test_invalid_env',
     ]
 
+if PYPY and PY37:
+    disabled_tests += [
+        # The exact error message the code code checks for is different
+        # (possibly just on macOS?). Plain PyPy3 fails as well.
+        'test_signal.WakeupSignalTests.test_wakeup_write_error',
+    ]
+
 if 'thread' in os.getenv('GEVENT_FILE', ''):
     disabled_tests += [
         'test_subprocess.ProcessTestCase.test_double_close_on_error'

diff --git a/src/gevent/tests/test__socket.py b/src/gevent/tests/test__socket.py
@@ -198,7 +198,9 @@ def accept_and_read():
                     # from generating ``ConnectionResetError`` on AppVeyor.
                     try:
                         client = client.unwrap()
-                    except ValueError:
+                    except (ValueError, OSError):
+                        # PyPy 3.7 started raising _cffi_ssl._stdssl.error.SSLSyscallError,
+                        # which is an OSError
                         pass
 
                 try:

diff --git a/src/greentest/3.6pypy/keycert.passwd.pem b/src/greentest/3.6pypy/keycert.passwd.pem
diff --git a/src/greentest/3.6pypy/ssl_key.passwd.pem b/src/greentest/3.6pypy/ssl_key.passwd.pem
-Original file line number
+Diff line change
@@ Expand Up / @@ -638,7 +638,6 @@ def unwrap(self): @@
                         break
                     raise
             self._sslobj = None
             # The return value of shutting down the SSLObject is the
@@ Expand Down @@