Edit debug statements to deal with MacOS failure

2 files changed, 29 insertions, 23 deletions

diff --git a/.travis.yml b/.travis.yml
index 3fa0812..588f51c 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -17,19 +17,19 @@ matrix:
         - PIP="pip3"
         - CIBW_BEFORE_BUILD="yum install -y atlas-devel lapack-devel && pip install numpy Cython"
 
-          #    - os: osx
-          #      language: generic
-          #      before_install:
-          #        - brew update
-          #        - brew install openblas
-          #        - brew install lapack
-          #      env:
-          #        - CC="gcc"
-          #          # avoids build errors on OSx
-          #        - CFLAGS="-fcommon"
-          #        - PYTHON="python3"
-          #        - PIP="pip3"
-          #        - CIBW_BEFORE_BUILD="pip install numpy Cython"
+    - os: osx
+      language: generic
+      before_install:
+        - brew update
+        - brew install openblas
+        - brew install lapack
+      env:
+        - CC="gcc"
+          # avoids build errors on OSx
+        - CFLAGS="-fcommon"
+        - PYTHON="python3"
+        - PIP="pip3"
+        - CIBW_BEFORE_BUILD="pip install numpy Cython"
 
           #    - os: windows
           #      language: shell
diff --git a/setup.py b/setup.py
index 206a430..cc0bfa0 100644
--- a/setup.py
+++ b/setup.py
@@ -155,17 +155,18 @@ def _skl_get_blas_info():
         return ["libopenblas"], blas_info
 
     blas_info = get_info("blas_opt", notfound_action=2)
-    print("\n\n*** blas_info: \n%r\n\n ***\n\n" % blas_info)
-    print(
-        "\n\n*** os.environ.get('OPENBLAS') = %r ***\n\n"
-        % (os.environ.get("OPENBLAS", None))
-    )
     if (not blas_info) or atlas_not_found(blas_info):
         cblas_libs = ["cblas"]
         blas_info.pop("libraries", None)
     else:
         cblas_libs = blas_info.pop("libraries", [])
 
+    print("\n\n*** blas_info: \n%r\n\n ***\n\n" % blas_info)
+    print(
+        "\n\n*** os.environ.get('OPENBLAS') = %r ***\n\n"
+        % (os.environ.get("OPENBLAS", None))
+    )
+
     return cblas_libs, blas_info
 
 
@@ -220,11 +221,7 @@ def get_lapack_info():
         return ["libopenblas"], lapack_info
 
     lapack_info = get_info("lapack_opt", notfound_action=2)
-    print("\n\n*** lapack_info: \n%r\n\n ***\n\n" % lapack_info)
-    print(
-        "\n\n*** os.environ.get('LAPACK') = %r ***\n\n"
-        % (os.environ.get("LAPACK", None))
-    )
+
     if (not lapack_info) or atlas_not_found(lapack_info):
         # This is a guess, but seems to work in practice. Need more systems to
         # test this fully.
@@ -233,6 +230,12 @@ def get_lapack_info():
     else:
         lapack_libs = lapack_info.pop("libraries", [])
 
+    print("\n\n*** lapack_info: \n%r\n\n ***\n\n" % lapack_info)
+    print(
+        "\n\n*** os.environ.get('LAPACK') = %r ***\n\n"
+        % (os.environ.get("LAPACK", None))
+    )
+
     return lapack_libs, lapack_info
 
 
@@ -288,6 +291,9 @@ def configuration():
     if USE_CYTHON:
         config.ext_modules = cythonize(config.ext_modules)
 
+    print("\n\n *** CONFIG ***\n")
+    print(config)
+
     return config