Skip to content

Fix the tests #127

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
brad merged 5 commits into from
Feb 20, 2018
Merged

Fix the tests #127

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
5e8fae3
upgrade travis python to 3.6
brad Feb 20, 2018
4faf9bf
simplify test configuration, support python 3.6 and pypy3
brad Feb 20, 2018
41a7419
whoops, add python 3.6 to travis matrix
brad Feb 20, 2018
6755500
fix docs test
brad Feb 20, 2018
b8a8404
fix docs test, part 2
brad Feb 20, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 10 additions & 12 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,13 @@
language: python
python: 3.5
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
- 3.6
install:
- pip install coveralls tox
script: tox -e $TOX_ENV
- pip install coveralls tox-travis
script: tox
after_success: coveralls
1 change: 1 addition & 0 deletions setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'
),
)
25 changes: 4 additions & 21 deletions tox.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,25 +1,8 @@
[tox]
envlist = pypy,py35,py34,py33,py27,docs
envlist = pypy-test,pypy3-test,py36-test,py35-test,py34-test,py33-test,py27-test,py36-docs

[testenv]
commands = coverage run --source=fitbit setup.py test
commands =
test: 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