From 6433c5dc151e894d5be9c2c1e87b38664a7b9be9 Mon Sep 17 00:00:00 2001
From: Markus Unterwaditzer <markus@unterwaditzer.net>
Date: Tue, 4 Mar 2014 17:41:26 +0100
Subject: [PATCH] Better builds

---
 .travis.yml                              |  5 ++++-
 README.md                                |  2 +-
 install-deps.sh                          | 14 ++++++++++++++
 dev_requirements.txt => requirements.txt |  1 -
 4 files changed, 19 insertions(+), 3 deletions(-)
 create mode 100644 install-deps.sh
 rename dev_requirements.txt => requirements.txt (79%)

diff --git a/.travis.yml b/.travis.yml
index 1a86a57..9a31db5 100644
--- a/.travis.yml
+++ b/.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
diff --git a/README.md b/README.md
index 8684f4e..57ad626 100644
--- a/README.md
+++ b/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
diff --git a/install-deps.sh b/install-deps.sh
new file mode 100644
index 0000000..c4e5d56
--- /dev/null
+++ b/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
diff --git a/dev_requirements.txt b/requirements.txt
similarity index 79%
rename from dev_requirements.txt
rename to requirements.txt
index dcaafff..d350a9c 100644
--- a/dev_requirements.txt
+++ b/requirements.txt
@@ -1,4 +1,3 @@
-Radicale
 Werkzeug
 pytest
 pytest-capturelog