From 0b7d2103cf9227045fc64bff7697d11b26e74edb Mon Sep 17 00:00:00 2001 From: "philip.deegan" Date: Tue, 30 Jan 2018 11:23:56 +0100 Subject: [PATCH] prepare for v0.4 - update to docker image with tensorflow installed --- .travis.yml | 6 +++--- MANIFEST.in | 2 +- tools/travis/docker_run.sh | 1 - 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/.travis.yml b/.travis.yml index 93673e5d7..29887b171 100644 --- a/.travis.yml +++ b/.travis.yml @@ -15,17 +15,17 @@ matrix: - os: linux services: docker env: - - DOCKER_IMAGE=xdatainitiative/tick_ubuntu:1.3 + - DOCKER_IMAGE=xdatainitiative/tick_ubuntu:1.4 - PYVER=3.4.6 - os: linux services: docker env: - - DOCKER_IMAGE=xdatainitiative/tick_ubuntu:1.3 + - DOCKER_IMAGE=xdatainitiative/tick_ubuntu:1.4 - PYVER=3.5.3 - os: linux services: docker env: - - DOCKER_IMAGE=xdatainitiative/tick_ubuntu:1.3 + - DOCKER_IMAGE=xdatainitiative/tick_ubuntu:1.4 - PYVER=3.6.1 - os: osx language: generic diff --git a/MANIFEST.in b/MANIFEST.in index 76dee0d89..8249414e5 100644 --- a/MANIFEST.in +++ b/MANIFEST.in @@ -5,4 +5,4 @@ global-include *.i global-include *.inl # Getting the Cereal header-only library -recursive-include tick/third_party/cereal/include *.h *.hpp \ No newline at end of file +recursive-include lib/third_party/cereal/include *.h *.hpp \ No newline at end of file diff --git a/tools/travis/docker_run.sh b/tools/travis/docker_run.sh index 03780e980..5658e6bc2 100755 --- a/tools/travis/docker_run.sh +++ b/tools/travis/docker_run.sh @@ -11,7 +11,6 @@ eval "$(pyenv init -)" pyenv global ${PYVER} pyenv local ${PYVER} -python -m pip install tensorflow python setup.py cpplint build_ext --inplace cpptest pytest export PYTHONPATH=${PYTHONPATH}:`pwd` && (cd doc && make doctest)