Skip to content

fix(build): Merge coverage reports #80

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
untitaker merged 4 commits into from
Sep 25, 2018
Merged

fix(build): Merge coverage reports #80

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
767a212
fix(build): Merge coverage reports
untitaker Sep 25, 2018
8e7dcb6
Merge remote-tracking branch 'origin/master' into fix/merge-cov-reports
untitaker Sep 25, 2018
416a602
fix: Remove double-erase
untitaker Sep 25, 2018
43b5666
fix: typo
untitaker Sep 25, 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
3 changes: 2 additions & 1 deletion .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,8 @@ install:
- sh scripts/download-semaphore.sh

script:
- ./scripts/runtox.sh
- coverage erase
- ./scripts/runtox.sh '' --cov=sentry_sdk --cov-append --cov-report=
- codecov

notifications:
Expand Down
7 changes: 6 additions & 1 deletion scripts/runtox.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,13 @@
#!/bin/bash
set -xe

# Usage: sh scripts/runtox.sh py3.7 <pytest-args>
# Runs all environments with substring py3.7 and the given arguments for pytest

if [ -z "$1" ]; then
searchstring="$(echo py$TRAVIS_PYTHON_VERSION | sed -e 's/pypypy/pypy/g' -e 's/-dev//g')"
else
searchstring="$1"
fi

exec tox -e $(tox -l | grep $searchstring | tr '\n' ',')
exec tox -e $(tox -l | grep $searchstring | tr '\n' ',') -- "${@:2}"
2 changes: 1 addition & 1 deletion tox.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ basepython =
pypy: pypy

commands =
py.test {env:TESTPATH} --cov=sentry_sdk {posargs}
py.test {env:TESTPATH} {posargs}

[testenv:linters]
commands =
Expand Down