CI: use wheels on all numpy dev builds

.travis.yml

@@ -42,7 +42,6 @@ matrix:
       - NOSE_ARGS="not slow and not disabled"
       - FULL_DEPS=true
       - CLIPBOARD_GUI=gtk2
-      - BUILD_TYPE=conda
       - DOC_BUILD=true # if rst files were changed, build docs in parallel with tests
     - python: 3.4
       env:
@@ -57,52 +56,37 @@ matrix:
       - NOSE_ARGS="not slow and not network and not disabled"
       - FULL_DEPS=true
       - CLIPBOARD=xsel
-      - BUILD_TYPE=conda
     - python: 2.7
       env:
       - JOB_NAME: "27_slow"
       - JOB_TAG=_SLOW
       - NOSE_ARGS="slow and not network and not disabled"
       - FULL_DEPS=true
-      - BUILD_TYPE=conda
     - python: 3.4
       env:
       - JOB_NAME: "34_slow"
       - JOB_TAG=_SLOW
       - NOSE_ARGS="slow and not network and not disabled"
       - FULL_DEPS=true
       - CLIPBOARD=xsel
-      - BUILD_TYPE=conda
     - python: 2.7
       env:
       - JOB_NAME: "27_build_test_conda"
       - JOB_TAG=_BUILD_TEST
       - NOSE_ARGS="not slow and not disabled"
       - FULL_DEPS=true
-      - BUILD_TYPE=conda
-      - BUILD_TEST=true
-    - python: 2.7
-      env:
-      - JOB_NAME: "27_build_test_pydata"
-      - JOB_TAG=_BUILD_TEST
-      - NOSE_ARGS="not slow and not disabled"
-      - FULL_DEPS=true
-      - BUILD_TYPE=pydata
       - BUILD_TEST=true
     - python: 2.7
       env:
-      - JOB_NAME: "27_numpy_master"
-      - JOB_TAG=_NUMPY_DEV_master
+      - JOB_NAME: "27_numpy_dev"
+      - JOB_TAG=_NUMPY_DEV
       - NOSE_ARGS="not slow and not network and not disabled"
-      - NUMPY_BUILD=master
-      - BUILD_TYPE=pydata
       - PANDAS_TESTING_MODE="deprecate"
     - python: 3.5
       env:
       - JOB_NAME: "35_numpy_dev"
       - JOB_TAG=_NUMPY_DEV
       - NOSE_ARGS="not slow and not network and not disabled"
-      - BUILD_TYPE=conda
       - PANDAS_TESTING_MODE="deprecate"
     allow_failures:
       - python: 2.7
@@ -111,45 +95,31 @@ matrix:
         - JOB_TAG=_SLOW
         - NOSE_ARGS="slow and not network and not disabled"
         - FULL_DEPS=true
-        - BUILD_TYPE=conda
       - python: 3.4
         env:
         - JOB_NAME: "34_slow"
         - JOB_TAG=_SLOW
         - NOSE_ARGS="slow and not network and not disabled"
         - FULL_DEPS=true
         - CLIPBOARD=xsel
-        - BUILD_TYPE=conda
       - python: 2.7
         env:
-        - JOB_NAME: "27_numpy_master"
-        - JOB_TAG=_NUMPY_DEV_master
+        - JOB_NAME: "27_numpy_dev"
+        - JOB_TAG=_NUMPY_DEV
         - NOSE_ARGS="not slow and not network and not disabled"
-        - NUMPY_BUILD=master
-        - BUILD_TYPE=pydata
         - PANDAS_TESTING_MODE="deprecate"
       - python: 2.7
         env:
         - JOB_NAME: "27_build_test_conda"
         - JOB_TAG=_BUILD_TEST
         - NOSE_ARGS="not slow and not disabled"
         - FULL_DEPS=true
-        - BUILD_TYPE=conda
-        - BUILD_TEST=true
-      - python: 2.7
-        env:
-        - JOB_NAME: "27_build_test_pydata"
-        - JOB_TAG=_BUILD_TEST
-        - NOSE_ARGS="not slow and not disabled"
-        - FULL_DEPS=true
-        - BUILD_TYPE=pydata
         - BUILD_TEST=true
       - python: 3.5
         env:
         - JOB_NAME: "35_numpy_dev"
         - JOB_TAG=_NUMPY_DEV
         - NOSE_ARGS="not slow and not network and not disabled"
-        - BUILD_TYPE=conda
         - PANDAS_TESTING_MODE="deprecate"
 
 before_install:
@@ -162,15 +132,15 @@ before_install:
   - pwd
   - uname -a
   - python -V
-  - ci/before_install.sh
+  - ci/before_install_travis.sh
   # Xvfb stuff for clipboard functionality; see the travis-ci documentation
   - export DISPLAY=:99.0
   - sh -e /etc/init.d/xvfb start
 
 install:
   - echo "install"
   - ci/prep_ccache.sh
-  - ci/install_${BUILD_TYPE}.sh
+  - ci/install_travis.sh
   - ci/submit_ccache.sh
 
 before_script:

ci/install-2.7_NUMPY_DEV.sh

@@ -0,0 +1,20 @@
+#!/bin/bash
+
+source activate pandas
+
+echo "install numpy master wheel"
+
+# remove the system installed numpy
+pip uninstall numpy -y
+
+# we need these for numpy
+
+# these wheels don't play nice with the conda libgfortran / openblas
+# time conda install -n pandas libgfortran openblas || exit 1
+
+time sudo apt-get $APT_ARGS install libatlas-base-dev gfortran
+
+# install numpy wheel from master
+pip install --pre --upgrade --no-index --timeout=60 --trusted-host travis-dev-wheels.scipy.org -f http://travis-dev-wheels.scipy.org/ numpy
+
+true

ci/requirements-2.7_NUMPY_DEV_master.build → ci/requirements-2.7_NUMPY_DEV.build

@@ -1,3 +1,3 @@
 python-dateutil
 pytz
-cython==0.19.1
+cython

ci/requirements-2.7_NUMPY_DEV.run

@@ -0,0 +1,2 @@
+python-dateutil
+pytz