From 95334930475b70f7e5cbf21314093bdc088d9d75 Mon Sep 17 00:00:00 2001
From: Thomas Waldmann <tw@waldmann-edv.de>
Date: Wed, 4 Jan 2017 00:57:35 +0100
Subject: [PATCH 1/3] tox / travis: also test on Python 3.6

---
 .travis.yml | 8 ++++++++
 tox.ini     | 2 +-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 36c38d631..e1433a173 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -16,6 +16,10 @@ matrix:
           os: linux
           dist: trusty
           env: TOXENV=py35
+        - python: 3.6
+          os: linux
+          dist: trusty
+          env: TOXENV=py36
         - python: 3.5
           os: linux
           dist: trusty
@@ -28,6 +32,10 @@ matrix:
           os: osx
           osx_image: xcode6.4
           env: TOXENV=py35
+        - language: generic
+          os: osx
+          osx_image: xcode6.4
+          env: TOXENV=py36
     allow_failures:
         - os: osx
 
diff --git a/tox.ini b/tox.ini
index 699ef251a..d44009e46 100644
--- a/tox.ini
+++ b/tox.ini
@@ -2,7 +2,7 @@
 # fakeroot -u tox --recreate
 
 [tox]
-envlist = py{34,35},flake8
+envlist = py{34,35,36},flake8
 
 [testenv]
 # Change dir to avoid import problem for cython code. The directory does

From 7d4d7e79012ea4798f7281a34ad9579ebf4de16d Mon Sep 17 00:00:00 2001
From: Thomas Waldmann <tw@waldmann-edv.de>
Date: Wed, 4 Jan 2017 01:02:25 +0100
Subject: [PATCH 2/3] setup.py: add Python 3.6 qualifier

---
 setup.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/setup.py b/setup.py
index 00e48f3f3..4f2ca8681 100644
--- a/setup.py
+++ b/setup.py
@@ -292,6 +292,7 @@ setup(
         'Programming Language :: Python :: 3',
         'Programming Language :: Python :: 3.4',
         'Programming Language :: Python :: 3.5',
+        'Programming Language :: Python :: 3.6',
         'Topic :: Security :: Cryptography',
         'Topic :: System :: Archiving :: Backup',
     ],

From c412b86455ced36a3b9e77c2b91143381f8096b6 Mon Sep 17 00:00:00 2001
From: Thomas Waldmann <tw@waldmann-edv.de>
Date: Wed, 4 Jan 2017 01:06:57 +0100
Subject: [PATCH 3/3] vagrant: add Python 3.6.0

---
 Vagrantfile | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/Vagrantfile b/Vagrantfile
index df636ce3e..26dcfc044 100644
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -223,6 +223,7 @@ def install_pythons(boxname)
     . ~/.bash_profile
     pyenv install 3.4.0  # tests
     pyenv install 3.5.0  # tests
+    pyenv install 3.6.0  # tests
     pyenv install 3.5.2  # binary build, use latest 3.5.x release
     pyenv rehash
   EOF
@@ -315,7 +316,7 @@ def run_tests(boxname)
     . ../borg-env/bin/activate
     if which pyenv 2> /dev/null; then
       # for testing, use the earliest point releases of the supported python versions:
-      pyenv global 3.4.0 3.5.0
+      pyenv global 3.4.0 3.5.0 3.6.0
     fi
     # otherwise: just use the system python
     if which fakeroot 2> /dev/null; then