Commit 8b7a19e4 authored by Jason Madden's avatar Jason Madden

Merge branch 'pypy5.4'

[skip appveyor]
parents 9a28f5e3 86c5bb98
......@@ -109,7 +109,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/pypy501
PYPY=$(BUILD_RUNTIMES)/snakepit/pypy54
TOOLS=$(BUILD_RUNTIMES)/tools
......@@ -173,7 +173,7 @@ test-py35: $(PY35)
PYTHON=python3.5 PATH=$(BUILD_RUNTIMES)/versions/python3.5/bin:$(PATH) make develop fulltoxtest
test-pypy: $(PYPY)
PYTHON=$(PYPY) PIP=pip PATH=$(BUILD_RUNTIMES)/versions/pypy501/bin:$(PATH) make develop toxtest
PYTHON=$(PYPY) PIP=pip PATH=$(BUILD_RUNTIMES)/versions/pypy54/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
......
......@@ -100,7 +100,7 @@ for var in "$@"; do
install 3.5.1 python3.5
;;
pypy)
install pypy-5.0.1 pypy501
install pypy2-5.4 pypy54
;;
esac
done
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