add support for python 3.5

brad · brad · commit 1d9e76499f9b · 2015-10-09T14:14:36.000-07:00
diff --git a/.travis.yml b/.travis.yml
@@ -1,7 +1,11 @@
 language: python
-python: 3.4
+python: 3.5
 env:
-  - TOX_ENV=pypy
+  # Avoid testing pypy on travis until the following issue is fixed:
+  #   https://github.com/travis-ci/travis-ci/issues/4756
+  #- TOX_ENV=pypy
+  - TOX_ENV=py35
+  - TOX_ENV=py34
   - TOX_ENV=py33
   - TOX_ENV=py32
   - TOX_ENV=py27
diff --git a/setup.py b/setup.py
@@ -39,6 +39,7 @@
         'Programming Language :: Python :: 3.2',
         'Programming Language :: Python :: 3.3',
         'Programming Language :: Python :: 3.4',
+        'Programming Language :: Python :: 3.5',
         'Programming Language :: Python :: Implementation :: PyPy'
     ),
 )
diff --git a/tox.ini b/tox.ini
@@ -1,5 +1,5 @@
 [tox]
-envlist = pypy,py34,py33,py32,py27,py26,docs
+envlist = pypy,py35,py34,py33,py32,py27,py26,docs
 
 [testenv]
 commands = coverage run --source=fitbit setup.py test
@@ -8,6 +8,9 @@ deps = -r{toxinidir}/requirements/test.txt
 [testenv:pypy]
 basepython = pypy
 
+[testenv:py35]
+basepython = python3.5
+
 [testenv:py34]
 basepython = python3.4
 

Original file line number	Diff line number	Diff line change
`@@ -39,6 +39,7 @@`
`39`	`39`	`'Programming Language :: Python :: 3.2',`
`40`	`40`	`'Programming Language :: Python :: 3.3',`
`41`	`41`	`'Programming Language :: Python :: 3.4',`
	`42`	`+ 'Programming Language :: Python :: 3.5',`
`42`	`43`	`'Programming Language :: Python :: Implementation :: PyPy'`
`43`	`44`	`),`
`44`	`45`	`)`