From 563f9c9d3476b73738ef3c7eddccbd07645d0d6f Mon Sep 17 00:00:00 2001
From: Markus Unterwaditzer <markus@unterwaditzer.net>
Date: Thu, 17 Dec 2015 14:24:52 +0100
Subject: [PATCH] Re-add minimal requirements build

Testing older lxml against radicale
---
 .travis.yml                               | 10 ++++++++++
 scripts/make_travisconf.py                |  3 ---
 tests/storage/servers/radicale/install.sh |  2 +-
 3 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index a3142da..d706717 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -20,6 +20,8 @@ matrix:
           env: BUILD=test DAV_SERVER=radicale REQUIREMENTS=devel
         - python: 2.7
           env: BUILD=test DAV_SERVER=radicale REQUIREMENTS=release
+        - python: 2.7
+          env: BUILD=test DAV_SERVER=radicale REQUIREMENTS=minimal
         - python: 2.7
           env: BUILD=test DAV_SERVER=owncloud REQUIREMENTS=devel
         - python: 2.7
@@ -38,18 +40,24 @@ matrix:
           env: BUILD=test DAV_SERVER=radicale REQUIREMENTS=devel
         - python: 3.3
           env: BUILD=test DAV_SERVER=radicale REQUIREMENTS=release
+        - python: 3.3
+          env: BUILD=test DAV_SERVER=radicale REQUIREMENTS=minimal
         - python: 3.4
           env: BUILD=style
         - python: 3.4
           env: BUILD=test DAV_SERVER=radicale REQUIREMENTS=devel
         - python: 3.4
           env: BUILD=test DAV_SERVER=radicale REQUIREMENTS=release
+        - python: 3.4
+          env: BUILD=test DAV_SERVER=radicale REQUIREMENTS=minimal
         - python: 3.5
           env: BUILD=style
         - python: 3.5
           env: BUILD=test DAV_SERVER=radicale REQUIREMENTS=devel
         - python: 3.5
           env: BUILD=test DAV_SERVER=radicale REQUIREMENTS=release
+        - python: 3.5
+          env: BUILD=test DAV_SERVER=radicale REQUIREMENTS=minimal
         - python: 3.5
           env: BUILD=test DAV_SERVER=owncloud REQUIREMENTS=devel
         - python: 3.5
@@ -68,5 +76,7 @@ matrix:
           env: BUILD=test DAV_SERVER=radicale REQUIREMENTS=devel
         - python: pypy
           env: BUILD=test DAV_SERVER=radicale REQUIREMENTS=release
+        - python: pypy
+          env: BUILD=test DAV_SERVER=radicale REQUIREMENTS=minimal
 
 
diff --git a/scripts/make_travisconf.py b/scripts/make_travisconf.py
index 3b6f30e..03a67e7 100644
--- a/scripts/make_travisconf.py
+++ b/scripts/make_travisconf.py
@@ -48,9 +48,6 @@ with section("matrix"):
                 dav_servers,
                 ("devel", "release", "minimal")
             ):
-                if dav_server == "radicale" and requirements == "minimal":
-                    # only the latest radicale is supported
-                    continue
                 h()
                 p("  env: BUILD=test DAV_SERVER={} REQUIREMENTS={}"
                   .format(dav_server, requirements))
diff --git a/tests/storage/servers/radicale/install.sh b/tests/storage/servers/radicale/install.sh
index 99624ae..e25923e 100644
--- a/tests/storage/servers/radicale/install.sh
+++ b/tests/storage/servers/radicale/install.sh
@@ -6,7 +6,7 @@ if [ -z "$RADICALE_BACKEND" ]; then
     false
 fi
 
-if [ "$REQUIREMENTS" = "release" ]; then
+if [ "$REQUIREMENTS" = "release" ] || [ "$REQUIREMENTS" = "minimal" ]; then
     radicale_pkg="radicale"
 elif [ "$REQUIREMENTS" = "devel" ]; then
     radicale_pkg="git+https://github.com/Kozea/Radicale.git"