summaryrefslogtreecommitdiff
path: root/INSTALL.rst.txt
diff options
context:
space:
mode:
authorAnne Bonner <bonn0062@yahoo.com>2019-08-20 16:23:42 -0700
committerAnne Bonner <bonn0062@yahoo.com>2019-08-20 16:23:42 -0700
commit1132bfc74c2f1105b3b371d36766ffbc469b9b72 (patch)
treefc7e4513bb48679dbf5f042bf20a521521f7d0a7 /INSTALL.rst.txt
parent950dd4e15ea0976bb671148440e036c3ae2dc11d (diff)
downloadnumpy-1132bfc74c2f1105b3b371d36766ffbc469b9b72.tar.gz
DOC: add two commas, move one word
Diffstat (limited to 'INSTALL.rst.txt')
-rw-r--r--INSTALL.rst.txt7
1 files changed, 4 insertions, 3 deletions
diff --git a/INSTALL.rst.txt b/INSTALL.rst.txt
index 640ddafc7..bd2f4f92c 100644
--- a/INSTALL.rst.txt
+++ b/INSTALL.rst.txt
@@ -12,7 +12,7 @@ https://scipy.org/install.html.
Prerequisites
=============
-Building NumPy requires the following software installed:
+Building NumPy requires the following installed software:
1) For Python 3, Python__ 3.5.x or newer.
@@ -28,6 +28,7 @@ Building NumPy requires the following software installed:
2) Cython >= 0.29.2 (for development versions of numpy, not for released
versions)
+
3) pytest__ (optional) 1.15 or later
This is required for testing numpy, but not for using it.
@@ -91,7 +92,7 @@ installed then ``g77`` will be detected and used first. To explicitly select
Windows
-------
-On Windows, building from source can be difficult. Currently the most robust
+On Windows, building from source can be difficult. Currently, the most robust
option is to use the Intel compilers, or alternatively MSVC (the same version
as used to build Python itself) with Intel ifort. Intel itself maintains a
good `application note <https://software.intel.com/en-us/articles/numpyscipy-with-intel-mkl>`_
@@ -131,7 +132,7 @@ ATLAS) will also work.
Ubuntu/Debian
-------------
-For best performance a development package providing BLAS and CBLAS should be
+For best performance, a development package providing BLAS and CBLAS should be
installed. Some of the options available are:
- ``libblas-dev``: reference BLAS (not very optimized)