Merge pull request awslabs#165 from JordonPhillips/support-36

JordonPhillips · web-flow · commit b9975fa9f0bb · 2016-12-29T14:39:51.000-08:00
Update language support tests and docs
diff --git a/.travis.yml b/.travis.yml
@@ -1,9 +1,20 @@
 language: python
-env:
-  - TOXENV=py26
-  - TOXENV=py27
-  - TOXENV=py33
-  - TOXENV=py34
+
+matrix:
+    include:
+        - python: 2.6
+          env: TOXENV=py26
+        - 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
+
 sudo: false
 install:
   - travis_retry pip install tox
diff --git a/setup.py b/setup.py
@@ -53,5 +53,7 @@
         'Programming Language :: Python :: 3',
         'Programming Language :: Python :: 3.3',
         'Programming Language :: Python :: 3.4',
+        'Programming Language :: Python :: 3.5',
+        'Programming Language :: Python :: 3.6',
     ),
 )
diff --git a/tox.ini b/tox.ini
@@ -1,5 +1,5 @@
 [tox]
-envlist = py26,py27,py33,py34,py35
+envlist = py26,py27,py33,py34,py35,py36
 
 [testenv]
 commands = py.test

Original file line number	Diff line number	Diff line change
`@@ -53,5 +53,7 @@`
`53`	`53`	`'Programming Language :: Python :: 3',`
`54`	`54`	`'Programming Language :: Python :: 3.3',`
`55`	`55`	`'Programming Language :: Python :: 3.4',`
	`56`	`+ 'Programming Language :: Python :: 3.5',`
	`57`	`+ 'Programming Language :: Python :: 3.6',`
`56`	`58`	`),`
`57`	`59`	`)`