diff --git a/.travis.yml b/.travis.yml index 9fdb98c0124b8..959a1f7e11e41 100644 --- a/.travis.yml +++ b/.travis.yml @@ -97,6 +97,13 @@ matrix: - 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 env: @@ -137,6 +144,13 @@ matrix: - 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: - echo "before_install" diff --git a/ci/install-3.5_NUMPY_DEV.sh b/ci/install-3.5_NUMPY_DEV.sh new file mode 100644 index 0000000000000..00b6255daf70f --- /dev/null +++ b/ci/install-3.5_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 diff --git a/ci/install_conda.sh b/ci/install_conda.sh index 465a4e3f63142..335286d7d1676 100755 --- a/ci/install_conda.sh +++ b/ci/install_conda.sh @@ -81,6 +81,14 @@ conda info -a || exit 1 # build deps REQ="ci/requirements-${TRAVIS_PYTHON_VERSION}${JOB_TAG}.build" time conda create -n pandas python=$TRAVIS_PYTHON_VERSION nose flake8 || exit 1 + +# may have additional installation instructions for this build +INSTALL="ci/install-${TRAVIS_PYTHON_VERSION}${JOB_TAG}.sh" +if [ -e ${INSTALL} ]; then + time bash $INSTALL || exit 1 +fi + +# install deps time conda install -n pandas --file=${REQ} || exit 1 source activate pandas diff --git a/ci/requirements-3.5.run b/ci/requirements-3.5.run index 64ed11b744ffd..2401a0fc11673 100644 --- a/ci/requirements-3.5.run +++ b/ci/requirements-3.5.run @@ -13,12 +13,10 @@ html5lib lxml matplotlib jinja2 +bottleneck +sqlalchemy +pymysql +psycopg2 -# currently causing some warnings -#sqlalchemy -#pymysql -#psycopg2 - -# not available from conda -#beautiful-soup -#bottleneck +# incompat with conda ATM +# beautiful-soup diff --git a/ci/requirements-3.5_NUMPY_DEV.build b/ci/requirements-3.5_NUMPY_DEV.build new file mode 100644 index 0000000000000..d15edbfa3d2c1 --- /dev/null +++ b/ci/requirements-3.5_NUMPY_DEV.build @@ -0,0 +1,3 @@ +python-dateutil +pytz +cython diff --git a/ci/requirements-3.5_NUMPY_DEV.run b/ci/requirements-3.5_NUMPY_DEV.run new file mode 100644 index 0000000000000..0aa987baefb1d --- /dev/null +++ b/ci/requirements-3.5_NUMPY_DEV.run @@ -0,0 +1,2 @@ +python-dateutil +pytz