From 066a199d0b8d2f5a142af74517c34a91ed8f9a01 Mon Sep 17 00:00:00 2001
From: Danny Hermes <daniel.j.hermes@gmail.com>
Date: Mon, 14 Nov 2016 14:11:34 -0800
Subject: [PATCH] Need to install from local deps first.

The `pip install --upgrade` still is needed to ensure
freshness but by removing the filesystem paths from deps
we made the initial install grab from PyPI (by mistake).
This way, all local package deps are grabbed from
the local filesystem.
---
 bigquery/tox.ini         | 5 ++---
 bigtable/tox.ini         | 3 +--
 datastore/tox.ini        | 5 ++---
 dns/tox.ini              | 3 +--
 error_reporting/tox.ini  | 4 ++--
 language/tox.ini         | 3 +--
 logging/tox.ini          | 5 ++---
 monitoring/tox.ini       | 3 +--
 pubsub/tox.ini           | 5 ++---
 resource_manager/tox.ini | 3 +--
 runtimeconfig/tox.ini    | 3 +--
 speech/tox.ini           | 3 +--
 storage/tox.ini          | 5 ++---
 translate/tox.ini        | 3 +--
 vision/tox.ini           | 3 +--
 15 files changed, 21 insertions(+), 35 deletions(-)

diff --git a/bigquery/tox.ini b/bigquery/tox.ini
index 2966a8546dec..51d238d48c1c 100644
--- a/bigquery/tox.ini
+++ b/bigquery/tox.ini
@@ -6,8 +6,9 @@ envlist =
 localdeps =
     pip install --quiet --upgrade {toxinidir}/../core
 deps =
-    pytest
+    {toxinidir}/../core
     mock
+    pytest
 covercmd =
     py.test --quiet \
       --cov=google.cloud.bigquery \
@@ -17,7 +18,6 @@ covercmd =
 
 [testenv]
 commands =
-    {[testing]localdeps}
     py.test --quiet {posargs} unit_tests
 deps =
     {[testing]deps}
@@ -26,7 +26,6 @@ deps =
 basepython =
     python2.7
 commands =
-    {[testing]localdeps}
     {[testing]covercmd}
 deps =
     {[testenv]deps}
diff --git a/bigtable/tox.ini b/bigtable/tox.ini
index 36f5e1d2a950..94006dd1c3ad 100644
--- a/bigtable/tox.ini
+++ b/bigtable/tox.ini
@@ -6,6 +6,7 @@ envlist =
 localdeps =
     pip install --quiet --upgrade {toxinidir}/../core
 deps =
+    {toxinidir}/../core
     pytest
 covercmd =
     py.test --quiet \
@@ -16,7 +17,6 @@ covercmd =
 
 [testenv]
 commands =
-    {[testing]localdeps}
     py.test --quiet {posargs} unit_tests
 deps =
     {[testing]deps}
@@ -25,7 +25,6 @@ deps =
 basepython =
     python2.7
 commands =
-    {[testing]localdeps}
     {[testing]covercmd}
 deps =
     {[testenv]deps}
diff --git a/datastore/tox.ini b/datastore/tox.ini
index 22efa3321840..0209be892cdf 100644
--- a/datastore/tox.ini
+++ b/datastore/tox.ini
@@ -6,8 +6,9 @@ envlist =
 localdeps =
     pip install --quiet --upgrade {toxinidir}/../core
 deps =
-    pytest
+    {toxinidir}/../core
     mock
+    pytest
 covercmd =
     py.test --quiet \
       --cov=google.cloud.datastore \
@@ -17,7 +18,6 @@ covercmd =
 
 [testenv]
 commands =
-    {[testing]localdeps}
     py.test --quiet {posargs} unit_tests
 deps =
     {[testing]deps}
@@ -26,7 +26,6 @@ deps =
 basepython =
     python2.7
 commands =
-    {[testing]localdeps}
     {[testing]covercmd}
 deps =
     {[testenv]deps}
diff --git a/dns/tox.ini b/dns/tox.ini
index 24f5e68c23cb..a783fb8fd8ed 100644
--- a/dns/tox.ini
+++ b/dns/tox.ini
@@ -6,6 +6,7 @@ envlist =
 localdeps =
     pip install --quiet --upgrade {toxinidir}/../core
 deps =
+    {toxinidir}/../core
     pytest
 covercmd =
     py.test --quiet \
@@ -16,7 +17,6 @@ covercmd =
 
 [testenv]
 commands =
-    {[testing]localdeps}
     py.test --quiet {posargs} unit_tests
 deps =
     {[testing]deps}
@@ -25,7 +25,6 @@ deps =
 basepython =
     python2.7
 commands =
-    {[testing]localdeps}
     {[testing]covercmd}
 deps =
     {[testenv]deps}
diff --git a/error_reporting/tox.ini b/error_reporting/tox.ini
index 631fb8930ea2..d589a736faa9 100644
--- a/error_reporting/tox.ini
+++ b/error_reporting/tox.ini
@@ -8,6 +8,8 @@ localdeps =
         {toxinidir}/../core \
         {toxinidir}/../logging
 deps =
+    {toxinidir}/../core
+    {toxinidir}/../logging
     pytest
 covercmd =
     py.test --quiet \
@@ -18,7 +20,6 @@ covercmd =
 
 [testenv]
 commands =
-    {[testing]localdeps}
     py.test --quiet {posargs} unit_tests
 deps =
     {[testing]deps}
@@ -27,7 +28,6 @@ deps =
 basepython =
     python2.7
 commands =
-    {[testing]localdeps}
     {[testing]covercmd}
 deps =
     {[testenv]deps}
diff --git a/language/tox.ini b/language/tox.ini
index fba072feb365..98aa5a0b8f4a 100644
--- a/language/tox.ini
+++ b/language/tox.ini
@@ -6,6 +6,7 @@ envlist =
 localdeps =
     pip install --quiet --upgrade {toxinidir}/../core
 deps =
+    {toxinidir}/../core
     pytest
 covercmd =
     py.test --quiet \
@@ -16,7 +17,6 @@ covercmd =
 
 [testenv]
 commands =
-    {[testing]localdeps}
     py.test --quiet {posargs} unit_tests
 deps =
     {[testing]deps}
@@ -25,7 +25,6 @@ deps =
 basepython =
     python2.7
 commands =
-    {[testing]localdeps}
     {[testing]covercmd}
 deps =
     {[testenv]deps}
diff --git a/logging/tox.ini b/logging/tox.ini
index dd8c14186e5b..ea41e5413c43 100644
--- a/logging/tox.ini
+++ b/logging/tox.ini
@@ -6,8 +6,9 @@ envlist =
 localdeps =
     pip install --quiet --upgrade {toxinidir}/../core
 deps =
-    pytest
+    {toxinidir}/../core
     mock
+    pytest
 covercmd =
     py.test --quiet \
       --cov=google.cloud.logging \
@@ -17,7 +18,6 @@ covercmd =
 
 [testenv]
 commands =
-    {[testing]localdeps}
     py.test --quiet {posargs} unit_tests
 deps =
     {[testing]deps}
@@ -26,7 +26,6 @@ deps =
 basepython =
     python2.7
 commands =
-    {[testing]localdeps}
     {[testing]covercmd}
 deps =
     {[testenv]deps}
diff --git a/monitoring/tox.ini b/monitoring/tox.ini
index d825482792cd..ecc2529aa96a 100644
--- a/monitoring/tox.ini
+++ b/monitoring/tox.ini
@@ -6,6 +6,7 @@ envlist =
 localdeps =
     pip install --quiet --upgrade {toxinidir}/../core
 deps =
+    {toxinidir}/../core
     pytest
 covercmd =
     py.test --quiet \
@@ -16,7 +17,6 @@ covercmd =
 
 [testenv]
 commands =
-    {[testing]localdeps}
     py.test --quiet {posargs} unit_tests
 deps =
     {[testing]deps}
@@ -26,7 +26,6 @@ deps =
 basepython =
     python2.7
 commands =
-    {[testing]localdeps}
     {[testing]covercmd}
 deps =
     {[testing]deps}
diff --git a/pubsub/tox.ini b/pubsub/tox.ini
index 212ba8f7d619..25e6fae5ea27 100644
--- a/pubsub/tox.ini
+++ b/pubsub/tox.ini
@@ -6,8 +6,9 @@ envlist =
 localdeps =
     pip install --quiet --upgrade {toxinidir}/../core
 deps =
-    pytest
+    {toxinidir}/../core
     mock
+    pytest
 covercmd =
     py.test --quiet \
       --cov=google.cloud.pubsub \
@@ -17,7 +18,6 @@ covercmd =
 
 [testenv]
 commands =
-    {[testing]localdeps}
     py.test --quiet {posargs} unit_tests
 deps =
     {[testing]deps}
@@ -26,7 +26,6 @@ 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 8eb59e9cedab..886922cc4c13 100644
--- a/resource_manager/tox.ini
+++ b/resource_manager/tox.ini
@@ -6,6 +6,7 @@ envlist =
 localdeps =
     pip install --quiet --upgrade {toxinidir}/../core
 deps =
+    {toxinidir}/../core
     pytest
 covercmd =
     py.test --quiet \
@@ -16,7 +17,6 @@ covercmd =
 
 [testenv]
 commands =
-    {[testing]localdeps}
     py.test --quiet {posargs} unit_tests
 deps =
     {[testing]deps}
@@ -25,7 +25,6 @@ deps =
 basepython =
     python2.7
 commands =
-    {[testing]localdeps}
     {[testing]covercmd}
 deps =
     {[testenv]deps}
diff --git a/runtimeconfig/tox.ini b/runtimeconfig/tox.ini
index 7596626071ad..c0c03fe81dce 100644
--- a/runtimeconfig/tox.ini
+++ b/runtimeconfig/tox.ini
@@ -6,6 +6,7 @@ envlist =
 localdeps =
     pip install --quiet --upgrade {toxinidir}/../core
 deps =
+    {toxinidir}/../core
     pytest
 covercmd =
     py.test --quiet \
@@ -16,7 +17,6 @@ covercmd =
 
 [testenv]
 commands =
-    {[testing]localdeps}
     py.test --quiet {posargs} unit_tests
 deps =
     {[testing]deps}
@@ -25,7 +25,6 @@ deps =
 basepython =
     python2.7
 commands =
-    {[testing]localdeps}
     {[testing]covercmd}
 deps =
     {[testenv]deps}
diff --git a/speech/tox.ini b/speech/tox.ini
index 7725027aea32..d5e3e45339e4 100644
--- a/speech/tox.ini
+++ b/speech/tox.ini
@@ -6,6 +6,7 @@ envlist =
 localdeps =
     pip install --quiet --upgrade {toxinidir}/../core
 deps =
+    {toxinidir}/../core
     pytest
 covercmd =
     py.test --quiet \
@@ -16,7 +17,6 @@ covercmd =
 
 [testenv]
 commands =
-    {[testing]localdeps}
     py.test --quiet {posargs} unit_tests
 deps =
     {[testing]deps}
@@ -25,7 +25,6 @@ deps =
 basepython =
     python2.7
 commands =
-    {[testing]localdeps}
     {[testing]covercmd}
 deps =
     {[testenv]deps}
diff --git a/storage/tox.ini b/storage/tox.ini
index 7c87032c5ed4..605d42d6f677 100644
--- a/storage/tox.ini
+++ b/storage/tox.ini
@@ -6,8 +6,9 @@ envlist =
 localdeps =
     pip install --quiet --upgrade {toxinidir}/../core
 deps =
-    pytest
+    {toxinidir}/../core
     mock
+    pytest
 covercmd =
     py.test --quiet \
       --cov=google.cloud.storage \
@@ -17,7 +18,6 @@ covercmd =
 
 [testenv]
 commands =
-    {[testing]localdeps}
     py.test --quiet {posargs} unit_tests
 deps =
     {[testing]deps}
@@ -26,7 +26,6 @@ deps =
 basepython =
     python2.7
 commands =
-    {[testing]localdeps}
     {[testing]covercmd}
 deps =
     {[testenv]deps}
diff --git a/translate/tox.ini b/translate/tox.ini
index 168559383e71..aaa39a706d93 100644
--- a/translate/tox.ini
+++ b/translate/tox.ini
@@ -6,6 +6,7 @@ envlist =
 localdeps =
     pip install --quiet --upgrade {toxinidir}/../core
 deps =
+    {toxinidir}/../core
     mock
     pytest
 covercmd =
@@ -17,7 +18,6 @@ covercmd =
 
 [testenv]
 commands =
-    {[testing]localdeps}
     py.test --quiet {posargs} unit_tests
 deps =
     {[testing]deps}
@@ -26,7 +26,6 @@ deps =
 basepython =
     python2.7
 commands =
-    {[testing]localdeps}
     {[testing]covercmd}
 deps =
     {[testenv]deps}
diff --git a/vision/tox.ini b/vision/tox.ini
index d9e71cf21664..70312f58ff34 100644
--- a/vision/tox.ini
+++ b/vision/tox.ini
@@ -6,6 +6,7 @@ envlist =
 localdeps =
     pip install --quiet --upgrade {toxinidir}/../core
 deps =
+    {toxinidir}/../core
     pytest
 covercmd =
     py.test --quiet \
@@ -16,7 +17,6 @@ covercmd =
 
 [testenv]
 commands =
-    {[testing]localdeps}
     py.test --quiet {posargs} unit_tests
 deps =
     {[testing]deps}
@@ -25,7 +25,6 @@ deps =
 basepython =
     python2.7
 commands =
-    {[testing]localdeps}
     {[testing]covercmd}
 deps =
     {[testenv]deps}