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.
richkadel · Nov 14, 2016 · 066a199 · 066a199
1 parent ab5c2bd
commit 066a199
Show file tree

Hide file tree

Showing 15 changed files with 21 additions and 35 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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}