Merge pull request #327 from hannosch/travis-cache

Make use of the new travis-ci caching mechanism.

Author: bbangert

.gitignore

@@ -24,6 +24,7 @@ man/
 parts/
 share/
 site-packages/
+zookeeper/
 .coverage
 .idea
 .pip_cache

.travis.yml

@@ -1,3 +1,15 @@
+sudo: false
+
+addons:
+  apt:
+    packages:
+    - libevent-dev
+
+cache:
+  directories:
+    - $HOME/.cache/pip
+    - zookeeper
+
 language: python
 python:
     - "2.7"
@@ -39,9 +51,6 @@ matrix:
 notifications:
   email: false
 
-before_install:
-    - sudo apt-get install libevent-dev
-
 install:
     - pip install tox
 

Makefile

@@ -3,7 +3,9 @@ BIN = $(HERE)/bin
 PYTHON = $(BIN)/python
 PIP_DOWNLOAD_CACHE ?= $(HERE)/.pip_cache
 INSTALL = $(BIN)/pip install
-INSTALL += --download-cache $(PIP_DOWNLOAD_CACHE)
+ifneq ($(TRAVIS), true)
+    INSTALL += --download-cache $(PIP_DOWNLOAD_CACHE)
+endif
 TOX_VENV ?= py27
 BUILD_DIRS = bin build include lib lib64 man share
 

ensure-zookeeper-env.sh

@@ -3,16 +3,17 @@
 set -e
 
 HERE=`pwd`
-ZOO_BASE_DIR="$HERE/bin/"
+ZOO_BASE_DIR="$HERE/zookeeper"
 ZOOKEEPER_VERSION=${ZOOKEEPER_VERSION:-3.4.6}
-ZOOKEEPER_PATH="$ZOO_BASE_DIR/zookeeper-$ZOOKEEPER_VERSION"
+ZOOKEEPER_PATH="$ZOO_BASE_DIR/$ZOOKEEPER_VERSION"
 ZOO_MIRROR_URL="http://apache.osuosl.org/"
 
 
 function download_zookeeper(){
     mkdir -p $ZOO_BASE_DIR
     cd $ZOO_BASE_DIR
     curl --silent -C - $ZOO_MIRROR_URL/zookeeper/zookeeper-$ZOOKEEPER_VERSION/zookeeper-$ZOOKEEPER_VERSION.tar.gz | tar -zx
+    mv zookeeper-$ZOOKEEPER_VERSION $ZOOKEEPER_VERSION
     chmod a+x $ZOOKEEPER_PATH/bin/zkServer.sh
 }