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