bump wheel version, add license files, minor fixes (from review)

Author: mattip

.github/workflows/windows.yml

@@ -96,6 +96,7 @@ jobs:
         rm local/scipy_openblas64/lib/*.a
         rm local/scipy_openblas64/lib/*.exp
         rm local/scipy_openblas64/lib/*.def
+        rm -rf local/scipy_openblas64/lib/pkgconfig
         if [[ -d local/scipy_openblas64/64 ]]; then
             rm -rf local/scipy_openblas64/64
         else
@@ -110,7 +111,7 @@ jobs:
             sed -e "s/openblas_get_config64_/openblas_get_config/" -i local/scipy_openblas32/__init__.py
             sed -e "s/openblas64/openblas32/" -i local/scipy_openblas32/__main__.py
         fi
-
+        cat tools/LICENSE_win32.txt >> LICENSE.txt
         python -m pip wheel -w dist -vv .
         # move the mis-named scipy_openblas64-none-any.whl to a platform-specific name
         for f in dist/*.whl; do mv $f "${f/%any.whl/$WHEEL_PLAT.whl}"; done

.travis.yml

@@ -88,7 +88,10 @@ script:
     - build_lib "$PLAT" "$INTERFACE64"
     - libc=${MB_ML_LIBC:-manylinux}
     - docker_image=quay.io/pypa/${libc}${MB_ML_VER}_${PLAT}
-    - docker run --rm -e INTERFACE64="${INTERFACE64}" -v $(pwd):/openblas $docker_image /bin/bash -xe /openblas/travis-ci/build_wheel.sh
+    - docker run --rm -e INTERFACE64="${INTERFACE64}" \
+        -e MB_ML_LIBC="${MB_ML_LIBC}" \
+        -v $(pwd):/openblas $docker_image \
+        /bin/bash -xe /openblas/travis-ci/build_wheel.sh
 
 after_success:
     # Upload libraries to the shared staging area on anaconda.org

pyproject.toml

@@ -8,7 +8,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "scipy_openblas64"
-version = "0.3.23.293"
+version = "0.3.23.293.1"
 requires-python = ">=3.7"
 description = "Provides OpenBLAS for python packaging"
 readme = "README.md"

travis-ci/build_wheel.sh

@@ -10,26 +10,29 @@ if [ "$?" != "0" ]; then
     # inside docker
     cd /openblas
 fi
+PYTHON=python3.7
 
 mkdir -p local/openblas
 mkdir -p dist
-python3.7 -m pip install wheel auditwheel
+$PYTHON -m pip install wheel auditwheel
 
 # This will fail if there is more than one file in libs
 tar -C local/scipy_openblas64 --strip-components=2 -xf libs/openblas*.tar.gz
 
 # do not package the static libs and symlinks, only take the shared object
 find local/scipy_openblas64/lib -maxdepth 1 -type l -delete
 rm local/scipy_openblas64/lib/*.a
+# Do not package the pkgconfig stuff, use the wheel functionality instead
+rm -rf local/scipy_openblas64/lib/pkgconfig
 # cleanup from a possible earlier run of the script
 rm -f local/scipy_openblas64/lib/libopenblas_python.so
 mv local/scipy_openblas64/lib/libopenblas* local/scipy_openblas64/lib/libopenblas_python.so
 
-if [ $(uname) != "Darwin" ]; then
+if [ $(uname) == "Darwin" ]; then
+    cat tools/LICENSE_osx.txt >> LICENSE.txt
+else
     patchelf --set-soname libopenblas_python.so local/scipy_openblas64/lib/libopenblas_python.so
-elif [ "{PLAT}" == "arm64" ]; then
-    source multibuild/osx_utils.sh
-    macos_arm64_cross_build_setup
+    cat tools/LICENSE_linux.txt >> LICENSE.txt
 fi
 
 if [ "${INTERFACE64}" != "1" ]; then
@@ -48,12 +51,12 @@ if [ "${INTERFACE64}" != "1" ]; then
 fi
 
 rm -rf dist/*
-python3.7 -m pip wheel -w dist -vv .
+$PYTHON -m pip wheel -w dist -vv .
 
 if [ $(uname) == "Darwin" ]; then
-    python3.7 -m pip install delocate
+    $PYTHON -m pip install delocate
     # move the mis-named scipy_openblas64-none-any.whl to a platform-specific name
-    if [ "{PLAT}" == "arm64" ]; then
+    if [ "${PLAT}" == "arm64" ]; then
         for f in dist/*.whl; do mv $f "${f/%any.whl/macosx_11_0_$PLAT.whl}"; done
     else
         for f in dist/*.whl; do mv $f "${f/%any.whl/macosx_10_9_$PLAT.whl}"; done