Merge pull request #40 from s/issue29

adds python3.4 and 3.5, updates license year, fixes #29
emre · Apr 23, 2016 · 0798400 · 0798400
2 parents 9f7d324 + 219845a
commit 0798400
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/.travis.yml b/.travis.yml
@@ -5,6 +5,8 @@ python:
   - "2.7"
   - "3.2"
   - "3.3"
+  - "3.4"
+  - "3.5"
 install:
   - if [[ $TRAVIS_PYTHON_VERSION == '2.6' ]]; then pip install argparse unittest2; fi
   - pip install -r requirements.txt

diff --git a/setup.py b/setup.py
@@ -2,7 +2,7 @@
     kaptan
     ~~~~~~
 
-    :copyright: (c) 2013-2015 by the authors and contributors (See AUTHORS file).
+    :copyright: (c) 2013-2016 by the authors and contributors (See AUTHORS file).
     :license: BSD, see LICENSE for more details.
 """
 
@@ -37,6 +37,8 @@
         'Programming Language :: Python :: 3',
         'Programming Language :: Python :: 3.2',
         'Programming Language :: Python :: 3.3',
+        'Programming Language :: Python :: 3.4',
+        'Programming Language :: Python :: 3.5'
     ),
 )