merge .travis.yml

rmcgibbo · rmcgibbo · commit 920bdaf767f8 · 2016-02-01T13:57:50.000-08:00
diff --git a/setup.py b/setup.py
@@ -3,7 +3,8 @@
 extension_module = Extension(
     'pymanylinuxdemo.extension',
      sources=['pymanylinuxdemo/extension.c'],
-     library_dirs=['/usr/lib64/atlas/'],
+     library_dirs=['/usr/lib64/atlas/', '/usr/lib/atlas'],
+     include_dirs=['/usr/include'],
      libraries=['cblas']
 )
 
diff --git a/travis/build-wheels.sh b/travis/build-wheels.sh
@@ -1,3 +1,4 @@
+#!/bin/bash
 PYTHON_VERSIONS="2.7 3.4 3.5"
 
 # Install a system package required by our library

Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,8 @@`
`3`	`3`	`extension_module = Extension(`
`4`	`4`	`'pymanylinuxdemo.extension',`
`5`	`5`	`sources=['pymanylinuxdemo/extension.c'],`
`6`		`- library_dirs=['/usr/lib64/atlas/'],`
	`6`	`+ library_dirs=['/usr/lib64/atlas/', '/usr/lib/atlas'],`
	`7`	`+ include_dirs=['/usr/include'],`
`7`	`8`	`libraries=['cblas']`
`8`	`9`	`)`
`9`	`10`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,4 @@`
	`1`	`+#!/bin/bash`
`1`	`2`	`PYTHON_VERSIONS="2.7 3.4 3.5"`
`2`	`3`
`3`	`4`	`# Install a system package required by our library`