From 5e8fae3a9761bd603a580be57eb0058197d87f17 Mon Sep 17 00:00:00 2001
From: Brad Pitcher <bradpitcher@gmail.com>
Date: Tue, 20 Feb 2018 15:12:26 -0700
Subject: [PATCH 1/5] upgrade travis python to 3.6

---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 9c50862..5cca0f6 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,5 +1,5 @@
 language: python
-python: 3.5
+python: 3.6
 env:
   # Avoid testing pypy on travis until the following issue is fixed:
   #   https://github.com/travis-ci/travis-ci/issues/4756

From 4faf9bf112e77f4cb5eba1489377f45b3cd73320 Mon Sep 17 00:00:00 2001
From: Brad Pitcher <bradpitcher@gmail.com>
Date: Tue, 20 Feb 2018 15:19:57 -0700
Subject: [PATCH 2/5] simplify test configuration, support python 3.6 and pypy3

---
 .travis.yml | 21 +++++++++------------
 setup.py    |  1 +
 tox.ini     | 27 ++++++---------------------
 3 files changed, 16 insertions(+), 33 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 5cca0f6..67d8e3a 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,15 +1,12 @@
 language: python
-python: 3.6
-env:
-  # 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=py27
-  - TOX_ENV=docs
+python:
+  - pypy
+  - pypy3.3-5.2-alpha1
+  - 2.7
+  - 3.3
+  - 3.4
+  - 3.5
 install:
-  - pip install coveralls tox
-script: tox -e  $TOX_ENV
+  - pip install coveralls tox-travis
+script: tox
 after_success: coveralls
diff --git a/setup.py b/setup.py
index c17939a..f931edb 100644
--- a/setup.py
+++ b/setup.py
@@ -38,6 +38,7 @@
         'Programming Language :: Python :: 3.3',
         'Programming Language :: Python :: 3.4',
         'Programming Language :: Python :: 3.5',
+        'Programming Language :: Python :: 3.6',
         'Programming Language :: Python :: Implementation :: PyPy'
     ),
 )
diff --git a/tox.ini b/tox.ini
index 279b114..e19ff25 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,25 +1,10 @@
 [tox]
-envlist = pypy,py35,py34,py33,py27,docs
+envlist = pypy,pypy3,py36-docs,py36,py35,py34,py33,py27
 
 [testenv]
-commands = coverage run --source=fitbit setup.py test
+changedir =
+  docs: {toxinidir}/docs
+commands =
+  py{py,py3,36,35,34,33,27}: coverage run --source=fitbit setup.py test
+  docs: sphinx-build -W -b html docs docs/_build
 deps = -r{toxinidir}/requirements/test.txt
-
-[testenv:pypy]
-basepython = pypy
-
-[testenv:py35]
-basepython = python3.5
-
-[testenv:py34]
-basepython = python3.4
-
-[testenv:py33]
-basepython = python3.3
-
-[testenv:py27]
-basepython = python2.7
-
-[testenv:docs]
-basepython = python3.4
-commands = sphinx-build -W -b html docs docs/_build

From 41a7419852054c57e300f10dbf69fd3ef095739b Mon Sep 17 00:00:00 2001
From: Brad Pitcher <bradpitcher@gmail.com>
Date: Tue, 20 Feb 2018 15:23:55 -0700
Subject: [PATCH 3/5] whoops, add python 3.6 to travis matrix

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

diff --git a/.travis.yml b/.travis.yml
index 67d8e3a..219cc33 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -6,6 +6,7 @@ python:
   - 3.3
   - 3.4
   - 3.5
+  - 3.6
 install:
   - pip install coveralls tox-travis
 script: tox

From 6755500a1bb15aef16b1ae09a4b0579e8910313c Mon Sep 17 00:00:00 2001
From: Brad Pitcher <bradpitcher@gmail.com>
Date: Tue, 20 Feb 2018 15:31:51 -0700
Subject: [PATCH 4/5] fix docs test

---
 tox.ini | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tox.ini b/tox.ini
index e19ff25..5f471b4 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,10 +1,10 @@
 [tox]
-envlist = pypy,pypy3,py36-docs,py36,py35,py34,py33,py27
+envlist = pypy-test,pypy3-test,py36-test,py35-test,py34-test,py33-test,py27-test,py36-docs
 
 [testenv]
 changedir =
   docs: {toxinidir}/docs
 commands =
-  py{py,py3,36,35,34,33,27}: coverage run --source=fitbit setup.py test
+  test: coverage run --source=fitbit setup.py test
   docs: sphinx-build -W -b html docs docs/_build
 deps = -r{toxinidir}/requirements/test.txt

From b8a8404ed394d5b10dc3c5063d27aaf1d16c9b2f Mon Sep 17 00:00:00 2001
From: Brad Pitcher <bradpitcher@gmail.com>
Date: Tue, 20 Feb 2018 15:36:10 -0700
Subject: [PATCH 5/5] fix docs test, part 2

---
 tox.ini | 2 --
 1 file changed, 2 deletions(-)

diff --git a/tox.ini b/tox.ini
index 5f471b4..f8a6d07 100644
--- a/tox.ini
+++ b/tox.ini
@@ -2,8 +2,6 @@
 envlist = pypy-test,pypy3-test,py36-test,py35-test,py34-test,py33-test,py27-test,py36-docs
 
 [testenv]
-changedir =
-  docs: {toxinidir}/docs
 commands =
   test: coverage run --source=fitbit setup.py test
   docs: sphinx-build -W -b html docs docs/_build