From 75eb5a06d75f7007a0ff6ac2b586b16bca22ad55 Mon Sep 17 00:00:00 2001 From: Markus Unterwaditzer Date: Sun, 9 Mar 2014 22:04:54 +0100 Subject: [PATCH] Fix missing sqlalchemy dependency --- .travis.yml | 4 ++-- install-deps.sh | 28 ++++++++++++++++------------ 2 files changed, 18 insertions(+), 14 deletions(-) diff --git a/.travis.yml b/.travis.yml index db6a8a7..33ced51 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,8 +3,8 @@ python: "2.7" env: - DAV_SERVER=radicale RADICALE_STORAGE=filesystem - DAV_SERVER=radicale RADICALE_STORAGE=database - - DAV_SERVER=radicale-git RADICALE_STORAGE=filesystem - - DAV_SERVER=radicale-git RADICALE_STORAGE=database + - DAV_SERVER=radicale_git RADICALE_STORAGE=filesystem + - DAV_SERVER=radicale_git RADICALE_STORAGE=database install: - "sh install-deps.sh" diff --git a/install-deps.sh b/install-deps.sh index d130e64..e2b17f0 100644 --- a/install-deps.sh +++ b/install-deps.sh @@ -1,15 +1,19 @@ pip install --use-mirrors . pip install --use-mirrors -r requirements.txt [[ -z "$DAV_SERVER" ]] && DAV_SERVER=radicale -case "$DAV_SERVER" in - "radicale") - pip install --use-mirrors radicale - ;; - "radicale-git") - pip install git+https://github.com/Kozea/Radicale.git - ;; - *) - echo "$DAV_SERVER is not known." - exit 1 - ;; -esac + +radicale_deps() { + if [[ "$RADICALE_STORAGE" == "database" ]]; then + pip install --use-mirrors sqlalchemy + fi +} + +davserver_radicale() { + pip install --use-mirrors radicale +} + +davserver_radicale_git() { + pip install git+https://github.com/Kozea/Radicale.git +} + +davserver_$DAV_SERVER