From 2f64ec632920f68d9b034cd60a60b07b9fc97cc9 Mon Sep 17 00:00:00 2001 From: Danny Hermes Date: Mon, 14 Nov 2016 14:58:42 -0800 Subject: [PATCH] Fixing accidental removal of {localdeps} Also - adding RTD dependency for runtimeconfig. - adding local paths to umbrella tox config "deps" as was done in #2733. --- bigquery/tox.ini | 2 ++ bigtable/tox.ini | 2 ++ datastore/tox.ini | 2 ++ dns/tox.ini | 2 ++ docs/requirements.txt | 1 + error_reporting/tox.ini | 2 ++ language/tox.ini | 2 ++ logging/tox.ini | 2 ++ monitoring/tox.ini | 2 ++ pubsub/tox.ini | 2 ++ resource_manager/tox.ini | 2 ++ runtimeconfig/tox.ini | 2 ++ speech/tox.ini | 2 ++ storage/tox.ini | 2 ++ tox.ini | 18 +++++++++++++++++- translate/tox.ini | 2 ++ vision/tox.ini | 2 ++ 17 files changed, 48 insertions(+), 1 deletion(-) diff --git a/bigquery/tox.ini b/bigquery/tox.ini index 51d238d48c1c..2d142ba71df6 100644 --- a/bigquery/tox.ini +++ b/bigquery/tox.ini @@ -18,6 +18,7 @@ covercmd = [testenv] commands = + {[testing]localdeps} py.test --quiet {posargs} unit_tests deps = {[testing]deps} @@ -26,6 +27,7 @@ deps = basepython = python2.7 commands = + {[testing]localdeps} {[testing]covercmd} deps = {[testenv]deps} diff --git a/bigtable/tox.ini b/bigtable/tox.ini index 94006dd1c3ad..ac77cf8fe314 100644 --- a/bigtable/tox.ini +++ b/bigtable/tox.ini @@ -17,6 +17,7 @@ covercmd = [testenv] commands = + {[testing]localdeps} py.test --quiet {posargs} unit_tests deps = {[testing]deps} @@ -25,6 +26,7 @@ deps = basepython = python2.7 commands = + {[testing]localdeps} {[testing]covercmd} deps = {[testenv]deps} diff --git a/datastore/tox.ini b/datastore/tox.ini index 0209be892cdf..76ffb1f2a8b5 100644 --- a/datastore/tox.ini +++ b/datastore/tox.ini @@ -18,6 +18,7 @@ covercmd = [testenv] commands = + {[testing]localdeps} py.test --quiet {posargs} unit_tests deps = {[testing]deps} @@ -26,6 +27,7 @@ deps = basepython = python2.7 commands = + {[testing]localdeps} {[testing]covercmd} deps = {[testenv]deps} diff --git a/dns/tox.ini b/dns/tox.ini index a783fb8fd8ed..227f7ef09ce0 100644 --- a/dns/tox.ini +++ b/dns/tox.ini @@ -17,6 +17,7 @@ covercmd = [testenv] commands = + {[testing]localdeps} py.test --quiet {posargs} unit_tests deps = {[testing]deps} @@ -25,6 +26,7 @@ deps = basepython = python2.7 commands = + {[testing]localdeps} {[testing]covercmd} deps = {[testenv]deps} diff --git a/docs/requirements.txt b/docs/requirements.txt index 90e321eccb4b..c829f9ab5a58 100644 --- a/docs/requirements.txt +++ b/docs/requirements.txt @@ -9,6 +9,7 @@ error_reporting/ monitoring/ pubsub/ resource_manager/ +runtimeconfig/ speech/ storage/ translate/ diff --git a/error_reporting/tox.ini b/error_reporting/tox.ini index d589a736faa9..cfc610759673 100644 --- a/error_reporting/tox.ini +++ b/error_reporting/tox.ini @@ -20,6 +20,7 @@ covercmd = [testenv] commands = + {[testing]localdeps} py.test --quiet {posargs} unit_tests deps = {[testing]deps} @@ -28,6 +29,7 @@ deps = basepython = python2.7 commands = + {[testing]localdeps} {[testing]covercmd} deps = {[testenv]deps} diff --git a/language/tox.ini b/language/tox.ini index 98aa5a0b8f4a..77ee3f7f0c67 100644 --- a/language/tox.ini +++ b/language/tox.ini @@ -17,6 +17,7 @@ covercmd = [testenv] commands = + {[testing]localdeps} py.test --quiet {posargs} unit_tests deps = {[testing]deps} @@ -25,6 +26,7 @@ deps = basepython = python2.7 commands = + {[testing]localdeps} {[testing]covercmd} deps = {[testenv]deps} diff --git a/logging/tox.ini b/logging/tox.ini index ea41e5413c43..db3e8a654954 100644 --- a/logging/tox.ini +++ b/logging/tox.ini @@ -18,6 +18,7 @@ covercmd = [testenv] commands = + {[testing]localdeps} py.test --quiet {posargs} unit_tests deps = {[testing]deps} @@ -26,6 +27,7 @@ deps = basepython = python2.7 commands = + {[testing]localdeps} {[testing]covercmd} deps = {[testenv]deps} diff --git a/monitoring/tox.ini b/monitoring/tox.ini index ecc2529aa96a..684f93fddfb7 100644 --- a/monitoring/tox.ini +++ b/monitoring/tox.ini @@ -17,6 +17,7 @@ covercmd = [testenv] commands = + {[testing]localdeps} py.test --quiet {posargs} unit_tests deps = {[testing]deps} @@ -26,6 +27,7 @@ deps = basepython = python2.7 commands = + {[testing]localdeps} {[testing]covercmd} deps = {[testing]deps} diff --git a/pubsub/tox.ini b/pubsub/tox.ini index 25e6fae5ea27..001886c51e9a 100644 --- a/pubsub/tox.ini +++ b/pubsub/tox.ini @@ -18,6 +18,7 @@ covercmd = [testenv] commands = + {[testing]localdeps} py.test --quiet {posargs} unit_tests deps = {[testing]deps} @@ -26,6 +27,7 @@ deps = basepython = python2.7 commands = + {[testing]localdeps} {[testing]covercmd} deps = {[testenv]deps} diff --git a/resource_manager/tox.ini b/resource_manager/tox.ini index 886922cc4c13..55414628dff7 100644 --- a/resource_manager/tox.ini +++ b/resource_manager/tox.ini @@ -17,6 +17,7 @@ covercmd = [testenv] commands = + {[testing]localdeps} py.test --quiet {posargs} unit_tests deps = {[testing]deps} @@ -25,6 +26,7 @@ deps = basepython = python2.7 commands = + {[testing]localdeps} {[testing]covercmd} deps = {[testenv]deps} diff --git a/runtimeconfig/tox.ini b/runtimeconfig/tox.ini index c0c03fe81dce..def122db9960 100644 --- a/runtimeconfig/tox.ini +++ b/runtimeconfig/tox.ini @@ -17,6 +17,7 @@ covercmd = [testenv] commands = + {[testing]localdeps} py.test --quiet {posargs} unit_tests deps = {[testing]deps} @@ -25,6 +26,7 @@ deps = basepython = python2.7 commands = + {[testing]localdeps} {[testing]covercmd} deps = {[testenv]deps} diff --git a/speech/tox.ini b/speech/tox.ini index d5e3e45339e4..f829dcf5b262 100644 --- a/speech/tox.ini +++ b/speech/tox.ini @@ -17,6 +17,7 @@ covercmd = [testenv] commands = + {[testing]localdeps} py.test --quiet {posargs} unit_tests deps = {[testing]deps} @@ -25,6 +26,7 @@ deps = basepython = python2.7 commands = + {[testing]localdeps} {[testing]covercmd} deps = {[testenv]deps} diff --git a/storage/tox.ini b/storage/tox.ini index 605d42d6f677..21a37c145f0e 100644 --- a/storage/tox.ini +++ b/storage/tox.ini @@ -18,6 +18,7 @@ covercmd = [testenv] commands = + {[testing]localdeps} py.test --quiet {posargs} unit_tests deps = {[testing]deps} @@ -26,6 +27,7 @@ deps = basepython = python2.7 commands = + {[testing]localdeps} {[testing]covercmd} deps = {[testenv]deps} diff --git a/tox.ini b/tox.ini index dc6e229f8a72..083778e98c50 100644 --- a/tox.ini +++ b/tox.ini @@ -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* diff --git a/translate/tox.ini b/translate/tox.ini index aaa39a706d93..c51673432353 100644 --- a/translate/tox.ini +++ b/translate/tox.ini @@ -18,6 +18,7 @@ covercmd = [testenv] commands = + {[testing]localdeps} py.test --quiet {posargs} unit_tests deps = {[testing]deps} @@ -26,6 +27,7 @@ deps = basepython = python2.7 commands = + {[testing]localdeps} {[testing]covercmd} deps = {[testenv]deps} diff --git a/vision/tox.ini b/vision/tox.ini index 70312f58ff34..a72e9b8216de 100644 --- a/vision/tox.ini +++ b/vision/tox.ini @@ -17,6 +17,7 @@ covercmd = [testenv] commands = + {[testing]localdeps} py.test --quiet {posargs} unit_tests deps = {[testing]deps} @@ -25,6 +26,7 @@ deps = basepython = python2.7 commands = + {[testing]localdeps} {[testing]covercmd} deps = {[testenv]deps}