Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions .coveragerc
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ include =
datastore/*
localtesting/*
storage/*
blog/*
[report]
exclude_lines =
pragma: NO COVER
3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@

.coveralls.yml
coverage-gae.json
*.pyc
.coverage
.tox
Expand Down
34 changes: 16 additions & 18 deletions tox.ini
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[tox]
skipsdist = True
envlist = py27, pep8, cover
envlist = gae, py27, pep8

[testenv]
passenv = PYTHONPATH GOOGLE_* GCLOUD_* TEST_* TRAVIS*
Expand All @@ -13,28 +13,12 @@ deps =
nose
coverage
nose-exclude
nosexcover
coverargs =
--with-xunit
--with-xcoverage
--with-coverage
--cover-tests
--cover-branches
--cover-inclusive

[testenv:py27]
deps =
{[testenv]deps}
gcloud
commands =
nosetests \
--exclude-dir=bigquery/tests/appengine \
--exclude-dir=bigquery/samples/appengine_auth \
--exclude-dir=appengine \
--exclude-dir=datastore/ndb \
--exclude-dir=localtesting \
{[testenv]coverargs} \
{posargs}

[testenv:gae]
deps =
{[testenv]deps}
Expand All @@ -51,6 +35,20 @@ commands =
setenv =
PYTHONPATH={env:GAE_PYTHONPATH:}

[testenv:py27]
deps =
{[testenv]deps}
gcloud
commands =
nosetests \
--exclude-dir=bigquery/tests/appengine \
--exclude-dir=bigquery/samples/appengine_auth \
--exclude-dir=appengine \
--exclude-dir=datastore/ndb \
--exclude-dir=localtesting \
{[testenv]coverargs} \
{posargs}

[testenv:pep8]
deps =
flake8
Expand Down