Merge pull request #27 from glyph/ci36

add python 3.6 support

.travis.yml

@@ -10,14 +10,13 @@ matrix:
   include:
     - python: "2.7"
       env: TOXENV=py27
-    - python: "3.3"
-      env: TOXENV=py33
     - python: "3.4"
       env: TOXENV=py34
     - python: "3.5"
       env: TOXENV=py35
+    - python: "3.6"
+      env: TOXENV=py36
   allow_failures:
-    - env: TOXENV=py33
     - env: TOXENV=py34
     - env: TOXENV=py35
 

tox.ini

@@ -1,9 +1,9 @@
 [tox]
-envlist = py26,py27,py33,py34,py35
+envlist = py26,py27,py34,py35,py36
 skipsdist = true
 
 
 [testenv]
 commands = python test_docstring_wrap.py
 deps =
-     py26: unittest2
+     py26: unittest2