fixes from review, cleanups, improve README

Author: mattip

.travis.yml

@@ -5,8 +5,6 @@ env:
         - BUILD_COMMIT=e94cec800304a6a467cf90ce4e7d3e207770b4b4
         - BUILD_DEPENDS=cython
         - TEST_DEPENDS="pytest hypothesis"
-        - PLAT=x86_64
-        - UNICODE_WIDTH=32
         - WHEELHOUSE_UPLOADER_USERNAME=travis-worker
         # Following generated with
         # travis encrypt -r MacPython/numpy-wheels WHEELHOUSE_UPLOADER_SECRET=<the api key>
@@ -17,7 +15,6 @@ env:
         - EXTRA_ARGV="'--disable-pytest-warnings'"
 
 language: python
-python: 3.7
 dist: bionic
 services: docker
 os: linux
@@ -28,6 +25,7 @@ jobs:
       env:
         - MB_PYTHON_VERSION=3.6
         - MB_ML_VER=2010
+        - PLAT=x86_64
     - os: linux
       env:
         - MB_PYTHON_VERSION=3.6
@@ -39,6 +37,7 @@ jobs:
       env:
         - MB_PYTHON_VERSION=3.7
         - MB_ML_VER=2010
+        - PLAT=x86_64
     - os: linux
       env:
         - MB_PYTHON_VERSION=3.7
@@ -50,6 +49,7 @@ jobs:
       env:
         - MB_PYTHON_VERSION=3.8
         - MB_ML_VER=2010
+        - PLAT=x86_64
     - os: linux
       env:
         - MB_PYTHON_VERSION=3.8

README.rst

@@ -19,18 +19,20 @@ How it works
 
 The wheel-building repository:
 
-* does a fresh build of any required C / C++ libraries;
-* builds a numpy wheel, linking against these fresh builds;
+* checks out either a known version of NumPy or master's HEAD
+* downloads OpenBLAS using numpy/tools/openblas_support.py
+* builds a numpy wheel, linking against the downloaded library and using
+  the appropriate additional variables from `env_vars.sh` or `env_vars32.sh`
 * processes the wheel using delocate_ (OSX) or auditwheel_ ``repair``
-  (Manylinux1_).  ``delocate`` and ``auditwheel`` copy the required dynamic
+  (manylinux_).  ``delocate`` and ``auditwheel`` copy the required dynamic
   libraries into the wheel and relinks the extension modules against the
   copied libraries;
 * uploads the built wheels to http://wheels.scipy.org (a Rackspace container
   kindly donated by Rackspace to scikit-learn).
 
 The resulting wheels are therefore self-contained and do not need any external
 dynamic libraries apart from those provided as standard by OSX / Linux as
-defined by the manylinux1 standard.
+defined by the manylinux standard.
 
 The ``.travis.yml`` file in this repository has a line containing the API key
 for the Rackspace container encrypted with an RSA key that is unique to the
@@ -132,7 +134,7 @@ upload them to PyPI.
 
 Of course, you will need permissions to upload to PyPI, for this to work.
 
-.. _manylinux1: https://www.python.org/dev/peps/pep-0513
+.. _manylinux: https://www.python.org/dev/peps/pep-0513
 .. _twine: https://pypi.python.org/pypi/twine
 .. _bs4: https://pypi.python.org/pypi/beautifulsoup4
 .. _delocate: https://pypi.python.org/pypi/delocate

config.sh

@@ -17,11 +17,14 @@ function build_wheel {
 }
 
 function build_libs {
-    # Use the same incantation as numpy/tools/travis-before-install.sh
+    # Use the same incantation as numpy/tools/travis-before-install.sh to
+    # download and un-tar the openblas libraries. The python call returns
+    # the un-tar root directory, then the files are copied into /usr/local.
+    # Could utilize a site.cfg instead to prevent the copy.
     python -mpip install urllib3
-    target=$(python numpy/tools/openblas_support.py)
-    $use_sudo cp -r $target/lib/* /usr/local/lib
-    $use_sudo cp $target/include/* /usr/local/include
+    basedir=$(python numpy/tools/openblas_support.py)
+    $use_sudo cp -r $basedir/lib/* /usr/local/lib
+    $use_sudo cp $basedir/include/* /usr/local/include
 }
 
 function get_test_cmd {

env_vars_32.sh

@@ -1,4 +1,6 @@
-# Environment variables for build
+# Environment variables for 32-bit build.
+# The important difference from the 64-bit build is `-msse2` to
+# compile sse loops for ufuncs.
 OPENBLAS_VERSION="v0.3.7"
 MACOSX_DEPLOYMENT_TARGET=10.9
 CFLAGS="-msse2 -std=c99 -fno-strict-aliasing"