Merge pull request #1 from rmcgibbo/new-images

Use new pypa/ docker images

Author: rmcgibbo

.travis.yml

@@ -1,15 +1,21 @@
-language: c
-sudo: required
 notifications:
   email: false
 
-services:
-  - docker
+matrix:
+  include:
+    - sudo: required
+      services:
+        - docker
+      env: DOCKER_IMAGE=quay.io/pypa/manylinux1_x86_64
+    - sudo: required
+      services:
+        - docker
+      env: DOCKER_IMAGE=quay.io/pypa/manylinux1_i686
+           PRE_CMD=linux32
 
 install:
-  - docker pull quay.io/manylinux/manylinux:latest
+  - docker pull $DOCKER_IMAGE
 
 script:
-  - docker run --rm -v `pwd`:/io quay.io/manylinux/manylinux:latest /bin/bash /io/travis/build-wheels.sh
+  - docker run --rm -v `pwd`:/io $DOCKER_IMAGE $PRE_CMD /io/travis/build-wheels.sh
   - ls wheelhouse/
-  

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']
 )
 

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