Skip to content

Commit

Permalink
Merge 320effb into 0953497
Browse files Browse the repository at this point in the history
  • Loading branch information
Matt Willer committed Oct 1, 2018
2 parents 0953497 + 320effb commit 009d768
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 5 deletions.
4 changes: 1 addition & 3 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ matrix:
env: TOX_ENV=pycodestyle
- python: 2.7
env: TOX_ENV=pylint
- python: 2.7
- python: 3.5
env: TOX_ENV=coverage

# commands to install dependencies
Expand All @@ -38,5 +38,3 @@ install:
# commands to run
script:
- ./.travis/run.sh
after_success:
- if [ "-x$TOX_ENV" = "xcoverage" ]; then coveralls; fi
1 change: 1 addition & 0 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -97,6 +97,7 @@ def main():
'pytest>=2.8.3',
'pytest-cov',
'pytest-xdist',
'python-coveralls',
'pytz',
]
extra_requires['test'] = test_requires
Expand Down
12 changes: 10 additions & 2 deletions tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -45,8 +45,16 @@ commands =
deps = -rrequirements-dev.txt

[testenv:coverage]
commands = py.test --cov boxsdk test/unit test/integration
deps = -rrequirements-dev.txt
basepython = python3.5
commands =
py.test --cov boxsdk --cov-report term-missing test/unit test/integration
coveralls
deps =
-rrequirements-dev.txt
passenv =
TRAVIS
TRAVIS_BRANCH
TRAVIS_JOB_ID

[testenv:docs]
changedir = docs
Expand Down

0 comments on commit 009d768

Please sign in to comment.