From c1bc1619ba0f5364b95b55bd7b39c369c4c348d2 Mon Sep 17 00:00:00 2001
From: Alistair Miles <alimanfoo@googlemail.com>
Date: Thu, 23 Feb 2017 23:26:04 +0000
Subject: [PATCH 1/2] includ py36 in test matrix

---
 .travis.yml  | 1 +
 appveyor.yml | 6 ++++++
 tox.ini      | 8 ++++----
 3 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 8641b1b4..db3a3589 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -11,6 +11,7 @@ python:
   - 2.7
   - 3.4
   - 3.5
+  - 3.6
 
 install:
   - pip install -U tox-travis
diff --git a/appveyor.yml b/appveyor.yml
index 73f40192..77a4e453 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -28,6 +28,12 @@ environment:
     - PYTHON: "C:\\Python35-x64"
       PYTHON_VERSION: "3.5"
 
+    - PYTHON: "C:\\Python36"
+      PYTHON_VERSION: "3.6"
+
+    - PYTHON: "C:\\Python36-x64"
+      PYTHON_VERSION: "3.6"
+
 install:
   - "SET PATH=%PYTHON%;%PYTHON%\\Scripts;%PATH%"
   - git submodule update --init --recursive
diff --git a/tox.ini b/tox.ini
index 8cfa6f3c..26c54ef0 100644
--- a/tox.ini
+++ b/tox.ini
@@ -4,7 +4,7 @@
 # and then run "tox" from this directory.
 
 [tox]
-envlist = py27, py34, py35, docs
+envlist = py27, py34, py35, py36, docs
 
 [testenv]
 setenv =
@@ -12,9 +12,9 @@ setenv =
 commands =
     py27: pip install -U backports.lzma
     python setup.py build_ext --inplace
-    py27: nosetests -v numcodecs
-    py34,py35: nosetests -v --with-coverage --cover-erase --cover-min-percentage=100 --cover-package=numcodecs --with-doctest --doctest-options=+NORMALIZE_WHITESPACE numcodecs
-    py35: flake8 numcodecs
+    py27,py34,py35: nosetests -v numcodecs
+    py36: nosetests -v --with-coverage --cover-erase --cover-package=numcodecs --with-doctest --doctest-options=+NORMALIZE_WHITESPACE numcodecs
+    py36: flake8 numcodecs
     python setup.py bdist_wheel
 deps =
     -rrequirements_test.txt

From 8a8a235e007b8efc151e729adf5fd0530ccf05d8 Mon Sep 17 00:00:00 2001
From: Alistair Miles <alimanfoo@googlemail.com>
Date: Thu, 23 Feb 2017 23:49:14 +0000
Subject: [PATCH 2/2] build only master branch

---
 .travis.yml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/.travis.yml b/.travis.yml
index db3a3589..e02ee8c1 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,5 +1,9 @@
 language: python
 
+branches:
+  only:
+    - master
+
 sudo: false
 
 addons: