Skip to content

Commit

Permalink
Fixing accidental removal of {localdeps}
Browse files Browse the repository at this point in the history
Also

- adding RTD  dependency for runtimeconfig.
- adding local paths to umbrella tox config "deps"
  as was done in googleapis#2733.
  • Loading branch information
dhermes committed Nov 14, 2016
1 parent 288a8a3 commit bfa651a
Show file tree
Hide file tree
Showing 17 changed files with 48 additions and 1 deletion.
2 changes: 2 additions & 0 deletions bigquery/tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ covercmd =

[testenv]
commands =
{[testing]localdeps}
py.test --quiet {posargs} unit_tests
deps =
{[testing]deps}
Expand All @@ -26,6 +27,7 @@ deps =
basepython =
python2.7
commands =
{[testing]localdeps}
{[testing]covercmd}
deps =
{[testenv]deps}
Expand Down
2 changes: 2 additions & 0 deletions bigtable/tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ covercmd =

[testenv]
commands =
{[testing]localdeps}
py.test --quiet {posargs} unit_tests
deps =
{[testing]deps}
Expand All @@ -25,6 +26,7 @@ deps =
basepython =
python2.7
commands =
{[testing]localdeps}
{[testing]covercmd}
deps =
{[testenv]deps}
Expand Down
2 changes: 2 additions & 0 deletions datastore/tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ covercmd =

[testenv]
commands =
{[testing]localdeps}
py.test --quiet {posargs} unit_tests
deps =
{[testing]deps}
Expand All @@ -26,6 +27,7 @@ deps =
basepython =
python2.7
commands =
{[testing]localdeps}
{[testing]covercmd}
deps =
{[testenv]deps}
Expand Down
2 changes: 2 additions & 0 deletions dns/tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ covercmd =

[testenv]
commands =
{[testing]localdeps}
py.test --quiet {posargs} unit_tests
deps =
{[testing]deps}
Expand All @@ -25,6 +26,7 @@ deps =
basepython =
python2.7
commands =
{[testing]localdeps}
{[testing]covercmd}
deps =
{[testenv]deps}
Expand Down
1 change: 1 addition & 0 deletions docs/requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ error_reporting/
monitoring/
pubsub/
resource_manager/
runtimeconfig/
speech/
storage/
translate/
Expand Down
2 changes: 2 additions & 0 deletions error_reporting/tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ covercmd =

[testenv]
commands =
{[testing]localdeps}
py.test --quiet {posargs} unit_tests
deps =
{[testing]deps}
Expand All @@ -28,6 +29,7 @@ deps =
basepython =
python2.7
commands =
{[testing]localdeps}
{[testing]covercmd}
deps =
{[testenv]deps}
Expand Down
2 changes: 2 additions & 0 deletions language/tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ covercmd =

[testenv]
commands =
{[testing]localdeps}
py.test --quiet {posargs} unit_tests
deps =
{[testing]deps}
Expand All @@ -25,6 +26,7 @@ deps =
basepython =
python2.7
commands =
{[testing]localdeps}
{[testing]covercmd}
deps =
{[testenv]deps}
Expand Down
2 changes: 2 additions & 0 deletions logging/tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ covercmd =

[testenv]
commands =
{[testing]localdeps}
py.test --quiet {posargs} unit_tests
deps =
{[testing]deps}
Expand All @@ -26,6 +27,7 @@ deps =
basepython =
python2.7
commands =
{[testing]localdeps}
{[testing]covercmd}
deps =
{[testenv]deps}
Expand Down
2 changes: 2 additions & 0 deletions monitoring/tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ covercmd =

[testenv]
commands =
{[testing]localdeps}
py.test --quiet {posargs} unit_tests
deps =
{[testing]deps}
Expand All @@ -26,6 +27,7 @@ deps =
basepython =
python2.7
commands =
{[testing]localdeps}
{[testing]covercmd}
deps =
{[testing]deps}
Expand Down
2 changes: 2 additions & 0 deletions pubsub/tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ covercmd =

[testenv]
commands =
{[testing]localdeps}
py.test --quiet {posargs} unit_tests
deps =
{[testing]deps}
Expand All @@ -26,6 +27,7 @@ deps =
basepython =
python2.7
commands =
{[testing]localdeps}
{[testing]covercmd}
deps =
{[testenv]deps}
Expand Down
2 changes: 2 additions & 0 deletions resource_manager/tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ covercmd =

[testenv]
commands =
{[testing]localdeps}
py.test --quiet {posargs} unit_tests
deps =
{[testing]deps}
Expand All @@ -25,6 +26,7 @@ deps =
basepython =
python2.7
commands =
{[testing]localdeps}
{[testing]covercmd}
deps =
{[testenv]deps}
Expand Down
2 changes: 2 additions & 0 deletions runtimeconfig/tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ covercmd =

[testenv]
commands =
{[testing]localdeps}
py.test --quiet {posargs} unit_tests
deps =
{[testing]deps}
Expand All @@ -25,6 +26,7 @@ deps =
basepython =
python2.7
commands =
{[testing]localdeps}
{[testing]covercmd}
deps =
{[testenv]deps}
Expand Down
2 changes: 2 additions & 0 deletions speech/tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ covercmd =

[testenv]
commands =
{[testing]localdeps}
py.test --quiet {posargs} unit_tests
deps =
{[testing]deps}
Expand All @@ -25,6 +26,7 @@ deps =
basepython =
python2.7
commands =
{[testing]localdeps}
{[testing]covercmd}
deps =
{[testenv]deps}
Expand Down
2 changes: 2 additions & 0 deletions storage/tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ covercmd =

[testenv]
commands =
{[testing]localdeps}
py.test --quiet {posargs} unit_tests
deps =
{[testing]deps}
Expand All @@ -26,6 +27,7 @@ deps =
basepython =
python2.7
commands =
{[testing]localdeps}
{[testing]covercmd}
deps =
{[testenv]deps}
Expand Down
18 changes: 17 additions & 1 deletion tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,24 @@ envlist =

[testing]
deps =
pytest
{toxinidir}/core
{toxinidir}/bigtable
{toxinidir}/storage
{toxinidir}/datastore
{toxinidir}/bigquery
{toxinidir}/pubsub
{toxinidir}/logging
{toxinidir}/dns
{toxinidir}/language
{toxinidir}/error_reporting
{toxinidir}/resource_manager
{toxinidir}/monitoring
{toxinidir}/vision
{toxinidir}/translate
{toxinidir}/speech
{toxinidir}/runtimeconfig
mock
pytest
passenv =
CI_*
CIRCLE*
Expand Down
2 changes: 2 additions & 0 deletions translate/tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ covercmd =

[testenv]
commands =
{[testing]localdeps}
py.test --quiet {posargs} unit_tests
deps =
{[testing]deps}
Expand All @@ -26,6 +27,7 @@ deps =
basepython =
python2.7
commands =
{[testing]localdeps}
{[testing]covercmd}
deps =
{[testenv]deps}
Expand Down
2 changes: 2 additions & 0 deletions vision/tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ covercmd =

[testenv]
commands =
{[testing]localdeps}
py.test --quiet {posargs} unit_tests
deps =
{[testing]deps}
Expand All @@ -25,6 +26,7 @@ deps =
basepython =
python2.7
commands =
{[testing]localdeps}
{[testing]covercmd}
deps =
{[testenv]deps}
Expand Down

0 comments on commit bfa651a

Please sign in to comment.