From 855be466bdb74a15126e7f3c1e4ea80b585d2837 Mon Sep 17 00:00:00 2001
From: Markus Unterwaditzer <markus@unterwaditzer.net>
Date: Thu, 5 Jan 2017 23:57:54 +0100
Subject: [PATCH] Test Python 3.6

---
 .travis.yml                | 78 ++++++++++++++++++++++----------------
 scripts/make_travisconf.py | 12 ++++--
 2 files changed, 53 insertions(+), 37 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index a7b4bc4..a368956 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -16,91 +16,103 @@
     "include": [
       {
         "env": "BUILD=style BUILD_PRS=true",
+        "python": "3.6"
+      },
+      {
+        "env": "BUILD=test DAV_SERVER=radicale REQUIREMENTS=devel BUILD_PRS=false",
+        "python": "3.3"
+      },
+      {
+        "env": "BUILD=test DAV_SERVER=radicale REQUIREMENTS=release BUILD_PRS=false",
+        "python": "3.3"
+      },
+      {
+        "env": "BUILD=test DAV_SERVER=radicale REQUIREMENTS=minimal BUILD_PRS=false",
+        "python": "3.3"
+      },
+      {
+        "env": "BUILD=test DAV_SERVER=radicale REQUIREMENTS=devel BUILD_PRS=false",
+        "python": "3.4"
+      },
+      {
+        "env": "BUILD=test DAV_SERVER=radicale REQUIREMENTS=release BUILD_PRS=false",
+        "python": "3.4"
+      },
+      {
+        "env": "BUILD=test DAV_SERVER=radicale REQUIREMENTS=minimal BUILD_PRS=false",
+        "python": "3.4"
+      },
+      {
+        "env": "BUILD=test DAV_SERVER=radicale REQUIREMENTS=devel BUILD_PRS=false",
         "python": "3.5"
       },
-      {
-        "env": "BUILD=test DAV_SERVER=radicale REQUIREMENTS=devel BUILD_PRS=false",
-        "python": "3.3"
-      },
       {
         "env": "BUILD=test DAV_SERVER=radicale REQUIREMENTS=release BUILD_PRS=false",
-        "python": "3.3"
+        "python": "3.5"
       },
       {
         "env": "BUILD=test DAV_SERVER=radicale REQUIREMENTS=minimal BUILD_PRS=false",
-        "python": "3.3"
-      },
-      {
-        "env": "BUILD=test DAV_SERVER=radicale REQUIREMENTS=devel BUILD_PRS=false",
-        "python": "3.4"
-      },
-      {
-        "env": "BUILD=test DAV_SERVER=radicale REQUIREMENTS=release BUILD_PRS=false",
-        "python": "3.4"
-      },
-      {
-        "env": "BUILD=test DAV_SERVER=radicale REQUIREMENTS=minimal BUILD_PRS=false",
-        "python": "3.4"
+        "python": "3.5"
       },
       {
         "env": "BUILD=test DAV_SERVER=radicale REQUIREMENTS=devel BUILD_PRS=true",
-        "python": "3.5"
+        "python": "3.6"
       },
       {
         "env": "BUILD=test DAV_SERVER=radicale REQUIREMENTS=release BUILD_PRS=true",
-        "python": "3.5"
+        "python": "3.6"
       },
       {
         "env": "BUILD=test DAV_SERVER=radicale REQUIREMENTS=minimal BUILD_PRS=true",
-        "python": "3.5"
+        "python": "3.6"
       },
       {
         "env": "BUILD=test DAV_SERVER=owncloud REQUIREMENTS=devel BUILD_PRS=false",
-        "python": "3.5"
+        "python": "3.6"
       },
       {
         "env": "BUILD=test DAV_SERVER=owncloud REQUIREMENTS=release BUILD_PRS=false",
-        "python": "3.5"
+        "python": "3.6"
       },
       {
         "env": "BUILD=test DAV_SERVER=owncloud REQUIREMENTS=minimal BUILD_PRS=false",
-        "python": "3.5"
+        "python": "3.6"
       },
       {
         "env": "BUILD=test DAV_SERVER=nextcloud REQUIREMENTS=devel BUILD_PRS=false",
-        "python": "3.5"
+        "python": "3.6"
       },
       {
         "env": "BUILD=test DAV_SERVER=nextcloud REQUIREMENTS=release BUILD_PRS=false",
-        "python": "3.5"
+        "python": "3.6"
       },
       {
         "env": "BUILD=test DAV_SERVER=nextcloud REQUIREMENTS=minimal BUILD_PRS=false",
-        "python": "3.5"
+        "python": "3.6"
       },
       {
         "env": "BUILD=test DAV_SERVER=baikal REQUIREMENTS=devel BUILD_PRS=false",
-        "python": "3.5"
+        "python": "3.6"
       },
       {
         "env": "BUILD=test DAV_SERVER=baikal REQUIREMENTS=release BUILD_PRS=false",
-        "python": "3.5"
+        "python": "3.6"
       },
       {
         "env": "BUILD=test DAV_SERVER=baikal REQUIREMENTS=minimal BUILD_PRS=false",
-        "python": "3.5"
+        "python": "3.6"
       },
       {
         "env": "BUILD=test DAV_SERVER=davical REQUIREMENTS=devel BUILD_PRS=false",
-        "python": "3.5"
+        "python": "3.6"
       },
       {
         "env": "BUILD=test DAV_SERVER=davical REQUIREMENTS=release BUILD_PRS=false",
-        "python": "3.5"
+        "python": "3.6"
       },
       {
         "env": "BUILD=test DAV_SERVER=davical REQUIREMENTS=minimal BUILD_PRS=false",
-        "python": "3.5"
+        "python": "3.6"
       },
       {
         "env": "BUILD=test",
diff --git a/scripts/make_travisconf.py b/scripts/make_travisconf.py
index 0e97ee0..e9cb5f4 100644
--- a/scripts/make_travisconf.py
+++ b/scripts/make_travisconf.py
@@ -2,6 +2,9 @@ import itertools
 import json
 import sys
 
+python_versions = ("3.3", "3.4", "3.5", "3.6")
+latest_python = "3.6"
+
 
 def script(x):
     return """
@@ -40,12 +43,13 @@ matrix = []
 cfg['matrix'] = {'include': matrix}
 
 matrix.append({
-    'python': "3.5",
+    'python': latest_python,
     'env': 'BUILD=style BUILD_PRS=true'
 })
 
-for python in ("3.3", "3.4", "3.5"):
-    if python == "3.5":
+
+for python in python_versions:
+    if python == latest_python:
         dav_servers = ("radicale", "owncloud", "nextcloud", "baikal",
                        "davical")
         rs_servers = ()
@@ -61,7 +65,7 @@ for python in ("3.3", "3.4", "3.5"):
         ("devel", "release", "minimal")
     ):
         build_prs = (
-            python == "3.5" and
+            python == latest_python and
             server_type == 'DAV' and
             server == 'radicale'
         )