# HG changeset patch # User Armin Rigo <arigo@tunes.org> # Date 1479202968 -3600 # Tue Nov 15 10:42:48 2016 +0100 # Branch extradoc # Node ID 4a9ba4dfb1d7ba85f2f58cb8fc2faacc3a57474e # Parent 2f49dd4737a5394ffeac6dd3bf21529a65cff738 Emphasis on "development version *of NumPy*". It's too easy to misread "of PyPy". diff --git a/download.html b/download.html --- a/download.html +++ b/download.html @@ -115,7 +115,7 @@ </ul> </div> <div class="section" id="python2-7-compatible-pypy-5-6-0"> -<h1>Python2.7 compatible PyPy 5.6.0</h1> +<span id="release"></span><h1>Python2.7 compatible PyPy 5.6.0</h1> <ul class="simple"> <li><a class="reference external" href="https://bitbucket.org/pypy/pypy/downloads/pypy2-v5.6.0-linux32.tar.bz2">Linux x86 binary (32bit, tar.bz2 built on Ubuntu 12.04 - 14.04)</a> (see <tt class="docutils literal">[1]</tt> below)</li> <li><a class="reference external" href="https://bitbucket.org/pypy/pypy/downloads/pypy2-v5.6.0-linux64.tar.bz2">Linux x86-64 binary (64bit, tar.bz2 built on Ubuntu 12.04 - 14.04)</a> (see <tt class="docutils literal">[1]</tt> below)</li> @@ -228,8 +228,10 @@ the Python side and NumPy objects are mediated through the slower cpyext layer (which hurts a few benchmarks that do a lot of element-by-element array accesses, for example).</p> -<p>Installation works using the current developement version of NumPy, since -PyPy specific changes have been merged but not in a release version. +<p>Installation works on any recent PyPy (the <a class="reference internal" href="#release">release</a> above is fine), +but you need the current developement version <em>of NumPy</em>. The reason +is that some PyPy-specific fixes have been merged back into NumPy, +and they are not yet in a released version of NumPy. For example, without using a virtualenv:</p> <pre class="literal-block"> $ ./pypy-xxx/bin/pypy -m ensurepip diff --git a/source/download.txt b/source/download.txt --- a/source/download.txt +++ b/source/download.txt @@ -76,6 +76,8 @@ .. _`portable Linux binaries`: https://github.com/squeaky-pl/portable-pypy#portable-pypy-distribution-for-linux +.. _release: + Python2.7 compatible PyPy 5.6.0 ------------------------------- @@ -251,8 +253,10 @@ layer (which hurts a few benchmarks that do a lot of element-by-element array accesses, for example). -Installation works using the current developement version of NumPy, since -PyPy specific changes have been merged but not in a release version. +Installation works on any recent PyPy (the release_ above is fine), +but you need the current developement version *of NumPy*. The reason +is that some PyPy-specific fixes have been merged back into NumPy, +and they are not yet in a released version of NumPy. For example, without using a virtualenv:: $ ./pypy-xxx/bin/pypy -m ensurepip