Goddamnit

.travis.yml

@@ -7,6 +7,10 @@ env:
     - DAV_SERVER=radicale_git RADICALE_STORAGE=database
 
 install:
-    - "sh install-deps.sh"
+    - "./install-deps.sh"
 
 script: py.test
+
+cache:
+    directories:
+        - /home/travis/virtualenv/python2.7/local/lib/python2.7/site-packages

install-deps.sh

@@ -1,19 +1,23 @@
+#!/bin/sh
 pip install --use-mirrors .
 pip install --use-mirrors -r requirements.txt
 [[ -z "$DAV_SERVER" ]] && DAV_SERVER=radicale
-
+[[ -z "$RADICALE_STORAGE" ]] && RADICALE_STORAGE=filesystem
-radicale_deps() {
-    if [[ "$RADICALE_STORAGE" == "database" ]]; then
-        pip install --use-mirrors sqlalchemy
-    fi
-}
 
 davserver_radicale() {
     pip install --use-mirrors radicale
+    radicale_deps
 }
 
 davserver_radicale_git() {
     pip install git+https://github.com/Kozea/Radicale.git
+    radicale_deps
 }
 
+radicale_deps() { radicale_storage_$RADICALE_STORAGE; }
+
+radicale_storage_database() { pip install --use-mirrors sqlalchemy pysqlite; }
+radicale_storage_filesystem() { true; }
+
+
 davserver_$DAV_SERVER

requirements.txt

@@ -1,4 +1,3 @@
 Werkzeug
 pytest
-pytest-capturelog
 mock