diff options
| author | Ralf Gommers <ralf.gommers@gmail.com> | 2019-03-01 12:00:20 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-03-01 12:00:20 -0800 |
| commit | 2f2dfa19839d69a20713b2fe05ca1ca35f6454a7 (patch) | |
| tree | d245ad72e02e3b89c1a3ebb4efe2b6f23626190c | |
| parent | bd9f33fc3201e15b86b3e4333d65f1a085d1f012 (diff) | |
| parent | 005dfd23a7111349c4d99e96166eb4eb84fe36cc (diff) | |
| download | numpy-2f2dfa19839d69a20713b2fe05ca1ca35f6454a7.tar.gz | |
Merge pull request #13063 from mattip/doc-fixes2
DOC: revert PR #13058 and fixup Makefile
| -rw-r--r-- | doc/Makefile | 8 | ||||
| -rw-r--r-- | doc/source/user/whatisnumpy.rst | 2 | ||||
| -rw-r--r-- | numpy/lib/function_base.py | 6 |
3 files changed, 10 insertions, 6 deletions
diff --git a/doc/Makefile b/doc/Makefile index 7c1dde90c..cb8f8a397 100644 --- a/doc/Makefile +++ b/doc/Makefile @@ -1,9 +1,13 @@ # Makefile for Sphinx documentation # -# This needs to be major.minor, just "3" doesn't work - it will result in +# PYVER needs to be major.minor, just "3" doesn't work - it will result in # issues with the amendments to PYTHONPATH and install paths (see DIST_VARS). -export PYVER=`python3 -c 'import sys; print("{0}.{1}".format(*sys.version_info[:2]))'` + +# Use explicit "version_info" indexing since make cannot handle colon characters, and +# evaluate it now to allow easier debugging when printing the varaible + +PYVER:=$(shell python3 -c 'from sys import version_info as v; print("{0}.{1}".format(v[0], v[1]))') PYTHON = python$(PYVER) # You can set these variables from the command line. diff --git a/doc/source/user/whatisnumpy.rst b/doc/source/user/whatisnumpy.rst index dfd79671a..abaa2bfed 100644 --- a/doc/source/user/whatisnumpy.rst +++ b/doc/source/user/whatisnumpy.rst @@ -134,4 +134,4 @@ numerous methods and attributes. Many of its methods are mirrored by functions in the outer-most NumPy namespace, allowing the programmer to code in whichever paradigm they prefer. This flexibility has allowed the NumPy array dialect and NumPy `ndarray` class to become the *de-facto* language -of mulit-dimensional data interchange used in Python. +of multi-dimensional data interchange used in Python. diff --git a/numpy/lib/function_base.py b/numpy/lib/function_base.py index 2a66bdb3a..b61a64b8e 100644 --- a/numpy/lib/function_base.py +++ b/numpy/lib/function_base.py @@ -1292,9 +1292,9 @@ def interp(x, xp, fp, left=None, right=None, period=None): The x-coordinates at which to evaluate the interpolated values. xp : 1-D sequence of floats - The x-coordinates of the data points, must be strictly increasing if - argument `period` is not specified. Otherwise, `xp` is internally sorted - after normalizing the periodic boundaries with ``xp = xp % period``. + The x-coordinates of the data points, must be increasing if argument + `period` is not specified. Otherwise, `xp` is internally sorted after + normalizing the periodic boundaries with ``xp = xp % period``. fp : 1-D sequence of float or complex The y-coordinates of the data points, same length as `xp`. |