Commit 82726ea1 authored by Jason Madden's avatar Jason Madden

Update to PyPy 7.1.

Fixes #1373
parent 68c765ab
...@@ -8,8 +8,8 @@ ...@@ -8,8 +8,8 @@
================== ==================
- Python version updates: gevent is now tested with CPython 2.7.15, - 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.0 and PyPy 3.5.6, 3.6.8, and 3.7.2. It is also tested with PyPy2 7.1 and PyPy
3.6 7.0. 3.6 7.1 (PyPy 7.0 was not capable of running SSL tests on Travis CI).
- Support for Python 3.4 has been removed, as that version is no - Support for Python 3.4 has been removed, as that version is no
longer supported uptstream. longer supported uptstream.
......
...@@ -126,8 +126,8 @@ PY27=$(BUILD_RUNTIMES)/snakepit/python2.7.16 ...@@ -126,8 +126,8 @@ PY27=$(BUILD_RUNTIMES)/snakepit/python2.7.16
PY35=$(BUILD_RUNTIMES)/snakepit/python3.5.6 PY35=$(BUILD_RUNTIMES)/snakepit/python3.5.6
PY36=$(BUILD_RUNTIMES)/snakepit/python3.6.8 PY36=$(BUILD_RUNTIMES)/snakepit/python3.6.8
PY37=$(BUILD_RUNTIMES)/snakepit/python3.7.2 PY37=$(BUILD_RUNTIMES)/snakepit/python3.7.2
PYPY=$(BUILD_RUNTIMES)/snakepit/pypy700 PYPY=$(BUILD_RUNTIMES)/snakepit/pypy710
PYPY3=$(BUILD_RUNTIMES)/snakepit/pypy3.6_700 PYPY3=$(BUILD_RUNTIMES)/snakepit/pypy3.6_710
TOOLS=$(BUILD_RUNTIMES)/tools TOOLS=$(BUILD_RUNTIMES)/tools
...@@ -188,10 +188,10 @@ test-py37: $(PY37) ...@@ -188,10 +188,10 @@ test-py37: $(PY37)
PYTHON=python3.7.2 PATH=$(BUILD_RUNTIMES)/versions/python3.7.2/bin:$(PATH) make develop leaktest cffibackendtest coverage_combine PYTHON=python3.7.2 PATH=$(BUILD_RUNTIMES)/versions/python3.7.2/bin:$(PATH) make develop leaktest cffibackendtest coverage_combine
test-pypy: $(PYPY) test-pypy: $(PYPY)
PYTHON=$(PYPY) PATH=$(BUILD_RUNTIMES)/versions/pypy700/bin:$(PATH) make develop cffibackendtest PYTHON=$(PYPY) PATH=$(BUILD_RUNTIMES)/versions/pypy710/bin:$(PATH) make develop cffibackendtest
test-pypy3: $(PYPY3) test-pypy3: $(PYPY3)
PYTHON=$(PYPY3) PATH=$(BUILD_RUNTIMES)/versions/pypy3.6_700/bin:$(PATH) make develop basictest PYTHON=$(PYPY3) PATH=$(BUILD_RUNTIMES)/versions/pypy3.6_710/bin:$(PATH) make develop basictest
test-py27-noembed: $(PY27) test-py27-noembed: $(PY27)
@python2.7.16 scripts/travis.py fold_start conf_libev "Configuring libev" @python2.7.16 scripts/travis.py fold_start conf_libev "Configuring libev"
......
...@@ -36,7 +36,7 @@ environment: ...@@ -36,7 +36,7 @@ environment:
PYTHON_EXE: python PYTHON_EXE: python
# 32-bit # 32-bit
- PYTHON: "C:\\pypy2.7-v7.0.0-win32" - PYTHON: "C:\\pypy2.7-v7.1.0-win32"
PYTHON_ID: "pypy" PYTHON_ID: "pypy"
PYTHON_EXE: pypy PYTHON_EXE: pypy
PYTHON_VERSION: "2.7.x" PYTHON_VERSION: "2.7.x"
...@@ -105,10 +105,10 @@ install: ...@@ -105,10 +105,10 @@ install:
New-Item -ItemType directory -Path "$env:PYTMP" | Out-Null; New-Item -ItemType directory -Path "$env:PYTMP" | Out-Null;
} }
if ("${env:PYTHON_ID}" -eq "pypy") { if ("${env:PYTHON_ID}" -eq "pypy") {
if (!(Test-Path "${env:PYTMP}\pypy2-v7.0.0-win32.zip")) { if (!(Test-Path "${env:PYTMP}\pypy2-v7.1.0-win32.zip")) {
(New-Object Net.WebClient).DownloadFile('https://bitbucket.org/pypy/pypy/downloads/pypy2.7-v7.0.0-win32.zip', "${env:PYTMP}\pypy2-v7.0.0-win32.zip"); (New-Object Net.WebClient).DownloadFile('https://bitbucket.org/pypy/pypy/downloads/pypy2.7-v7.1.0-win32.zip', "${env:PYTMP}\pypy2-v7.1.0-win32.zip");
} }
7z x -y "${env:PYTMP}\pypy2-v7.0.0-win32.zip" -oC:\ | Out-Null; 7z x -y "${env:PYTMP}\pypy2-v7.1.0-win32.zip" -oC:\ | Out-Null;
& "${env:PYTHON}\pypy.exe" "-mensurepip"; & "${env:PYTHON}\pypy.exe" "-mensurepip";
} }
......
...@@ -98,10 +98,10 @@ for var in "$@"; do ...@@ -98,10 +98,10 @@ for var in "$@"; do
install 3.7.2 python3.7.2 install 3.7.2 python3.7.2
;; ;;
pypy) pypy)
install pypy2.7-7.0.0 pypy700 install pypy2.7-7.1.0 pypy710
;; ;;
pypy3) pypy3)
install pypy3.6-7.0.0 pypy3.6_700 install pypy3.6-7.1.0 pypy3.6_710
;; ;;
esac esac
done done
...@@ -259,12 +259,6 @@ if PYPY: ...@@ -259,12 +259,6 @@ if PYPY:
# This fails to get the correct results, sometimes. I can't reproduce locally # This fails to get the correct results, sometimes. I can't reproduce locally
'FLAKY test__example_udp_server.py', 'FLAKY test__example_udp_server.py',
'FLAKY test__example_udp_client.py', 'FLAKY test__example_udp_client.py',
# PyPy 7.0 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: if LIBUV:
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment