Better builds

.travis.yml

@@ -1,8 +1,11 @@
 language: python
 python: "2.7"
+env:
+    - DAV_SERVER=radicale
+    - DAV_SERVER=radicale-git
 
 install:
     - "pip install ."
-    - "pip install -r dev_requirements.txt"
+    - "sh install_deps.sh"
 
 script: py.test

README.md

@@ -20,5 +20,5 @@ Run `vdirsyncer --help`.
 ## How to run the tests
 
     pip install .
-    pip install -r dev_requirements.txt
+    sh install_deps.sh
     py.test

install-deps.sh

@@ -0,0 +1,14 @@
+pip install -r requirements.txt
+[[ -z "$DAV_SERVER" ]] && DAV_SERVER=radicale
+case "$DAV_SERVER" in
+    "radicale")
+        pip install radicale
+        ;;
+    "radicale-git")
+        pip install git+https://github.com/Kozea/Radicale.git
+        ;;
+    *)
+        echo "$DAV_SERVER is not known."
+        exit 1
+        ;;
+esac

requirements.txt

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