Fixing accidental removal of {localdeps}

Also - adding RTD dependency for runtimeconfig. - adding local paths to umbrella tox config "deps" as was done in googleapis#2733.
dhermes · Nov 14, 2016 · 2f64ec6 · 2f64ec6
1 parent 2500a6b
commit 2f64ec6
Show file tree

Hide file tree

Showing 17 changed files with 48 additions and 1 deletion.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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}