diff --git a/bigquery/tox.ini b/bigquery/tox.ini index 4a5000739647..001444516350 100644 --- a/bigquery/tox.ini +++ b/bigquery/tox.ini @@ -3,8 +3,9 @@ envlist = py27,py34,py35,cover [testing] +localdeps = + pip install --upgrade {toxinidir}/../core deps = - {toxinidir}/../core pytest covercmd = py.test --quiet \ @@ -15,6 +16,7 @@ covercmd = [testenv] commands = + {[testing]localdeps} py.test --quiet {posargs} unit_tests deps = {[testing]deps} @@ -23,6 +25,7 @@ deps = basepython = python2.7 commands = + {[testing]localdeps} {[testing]covercmd} deps = {[testenv]deps} diff --git a/bigtable/tox.ini b/bigtable/tox.ini index b5b080543a4c..f6336268a816 100644 --- a/bigtable/tox.ini +++ b/bigtable/tox.ini @@ -3,8 +3,9 @@ envlist = py27,py34,py35,cover [testing] +localdeps = + pip install --upgrade {toxinidir}/../core deps = - {toxinidir}/../core pytest covercmd = py.test --quiet \ @@ -15,6 +16,7 @@ covercmd = [testenv] commands = + {[testing]localdeps} py.test --quiet {posargs} unit_tests deps = {[testing]deps} @@ -23,6 +25,7 @@ deps = basepython = python2.7 commands = + {[testing]localdeps} {[testing]covercmd} deps = {[testenv]deps} diff --git a/datastore/tox.ini b/datastore/tox.ini index 64f0d45463dd..e40bcca54c94 100644 --- a/datastore/tox.ini +++ b/datastore/tox.ini @@ -3,8 +3,9 @@ envlist = py27,py34,py35,cover [testing] +localdeps = + pip install --upgrade {toxinidir}/../core deps = - {toxinidir}/../core pytest covercmd = py.test --quiet \ @@ -15,6 +16,7 @@ covercmd = [testenv] commands = + {[testing]localdeps} py.test --quiet {posargs} unit_tests deps = {[testing]deps} @@ -23,6 +25,7 @@ deps = basepython = python2.7 commands = + {[testing]localdeps} {[testing]covercmd} deps = {[testenv]deps} diff --git a/dns/tox.ini b/dns/tox.ini index 125c7ec7ef15..7c9a899bfa8c 100644 --- a/dns/tox.ini +++ b/dns/tox.ini @@ -3,8 +3,9 @@ envlist = py27,py34,py35,cover [testing] +localdeps = + pip install --upgrade {toxinidir}/../core deps = - {toxinidir}/../core pytest covercmd = py.test --quiet \ @@ -15,6 +16,7 @@ covercmd = [testenv] commands = + {[testing]localdeps} py.test --quiet {posargs} unit_tests deps = {[testing]deps} @@ -23,6 +25,7 @@ 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 db24f5455afe..5148d52b86dc 100644 --- a/error_reporting/tox.ini +++ b/error_reporting/tox.ini @@ -3,9 +3,11 @@ envlist = py27,py34,py35,cover [testing] +localdeps = + pip install --upgrade \ + {toxinidir}/../core \ + {toxinidir}/../logging deps = - {toxinidir}/../core - {toxinidir}/../logging pytest covercmd = py.test --quiet \ @@ -16,6 +18,7 @@ covercmd = [testenv] commands = + {[testing]localdeps} py.test --quiet {posargs} unit_tests deps = {[testing]deps} @@ -24,6 +27,7 @@ deps = basepython = python2.7 commands = + {[testing]localdeps} {[testing]covercmd} deps = {[testenv]deps} diff --git a/language/tox.ini b/language/tox.ini index 9823ae7507a8..08aff2638142 100644 --- a/language/tox.ini +++ b/language/tox.ini @@ -3,8 +3,9 @@ envlist = py27,py34,py35,cover [testing] +localdeps = + pip install --upgrade {toxinidir}/../core deps = - {toxinidir}/../core pytest covercmd = py.test --quiet \ @@ -15,6 +16,7 @@ covercmd = [testenv] commands = + {[testing]localdeps} py.test --quiet {posargs} unit_tests deps = {[testing]deps} @@ -23,6 +25,7 @@ deps = basepython = python2.7 commands = + {[testing]localdeps} {[testing]covercmd} deps = {[testenv]deps} diff --git a/logging/tox.ini b/logging/tox.ini index abfe42a6d8e2..5dd0b038e806 100644 --- a/logging/tox.ini +++ b/logging/tox.ini @@ -3,8 +3,9 @@ envlist = py27,py34,py35,cover [testing] +localdeps = + pip install --upgrade {toxinidir}/../core deps = - {toxinidir}/../core pytest covercmd = py.test --quiet \ @@ -15,6 +16,7 @@ covercmd = [testenv] commands = + {[testing]localdeps} py.test --quiet {posargs} unit_tests deps = {[testing]deps} @@ -23,6 +25,7 @@ deps = basepython = python2.7 commands = + {[testing]localdeps} {[testing]covercmd} deps = {[testenv]deps} diff --git a/monitoring/tox.ini b/monitoring/tox.ini index 67205f03764e..75ae90e2cf49 100644 --- a/monitoring/tox.ini +++ b/monitoring/tox.ini @@ -3,8 +3,9 @@ envlist = py27,py34,py35,cover,{py27,py34,py35}-{pandas} [testing] +localdeps = + pip install --upgrade {toxinidir}/../core deps = - {toxinidir}/../core pytest covercmd = py.test --quiet \ @@ -15,6 +16,7 @@ covercmd = [testenv] commands = + {[testing]localdeps} py.test --quiet {posargs} unit_tests deps = {[testing]deps} @@ -24,6 +26,7 @@ deps = basepython = python2.7 commands = + {[testing]localdeps} {[testing]covercmd} deps = {[testing]deps} diff --git a/pubsub/tox.ini b/pubsub/tox.ini index 9a9990704fbe..a05bed81c961 100644 --- a/pubsub/tox.ini +++ b/pubsub/tox.ini @@ -3,8 +3,9 @@ envlist = py27,py34,py35,cover [testing] +localdeps = + pip install --upgrade {toxinidir}/../core deps = - {toxinidir}/../core pytest covercmd = py.test --quiet \ @@ -15,6 +16,7 @@ covercmd = [testenv] commands = + {[testing]localdeps} py.test --quiet {posargs} unit_tests deps = {[testing]deps} @@ -23,6 +25,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 9ec0730ee03c..a4bf151e7d1f 100644 --- a/resource_manager/tox.ini +++ b/resource_manager/tox.ini @@ -3,8 +3,9 @@ envlist = py27,py34,py35,cover [testing] +localdeps = + pip install --upgrade {toxinidir}/../core deps = - {toxinidir}/../core pytest covercmd = py.test --quiet \ @@ -15,6 +16,7 @@ covercmd = [testenv] commands = + {[testing]localdeps} py.test --quiet {posargs} unit_tests deps = {[testing]deps} @@ -23,6 +25,7 @@ deps = basepython = python2.7 commands = + {[testing]localdeps} {[testing]covercmd} deps = {[testenv]deps} diff --git a/runtimeconfig/tox.ini b/runtimeconfig/tox.ini index 0f35dccadd2b..9c3ea1a81896 100644 --- a/runtimeconfig/tox.ini +++ b/runtimeconfig/tox.ini @@ -3,8 +3,9 @@ envlist = py27,py34,py35,cover [testing] +localdeps = + pip install --upgrade {toxinidir}/../core deps = - {toxinidir}/../core pytest covercmd = py.test --quiet \ @@ -15,6 +16,7 @@ covercmd = [testenv] commands = + {[testing]localdeps} py.test --quiet {posargs} unit_tests deps = {[testing]deps} @@ -23,6 +25,7 @@ deps = basepython = python2.7 commands = + {[testing]localdeps} {[testing]covercmd} deps = {[testenv]deps} diff --git a/speech/tox.ini b/speech/tox.ini index 8aec90a4b2f9..0977c8e2aeca 100644 --- a/speech/tox.ini +++ b/speech/tox.ini @@ -3,8 +3,9 @@ envlist = py27,py34,py35,cover [testing] +localdeps = + pip install --upgrade {toxinidir}/../core deps = - {toxinidir}/../core pytest covercmd = py.test --quiet \ @@ -15,6 +16,7 @@ covercmd = [testenv] commands = + {[testing]localdeps} py.test --quiet {posargs} unit_tests deps = {[testing]deps} @@ -23,6 +25,7 @@ deps = basepython = python2.7 commands = + {[testing]localdeps} {[testing]covercmd} deps = {[testenv]deps} diff --git a/storage/tox.ini b/storage/tox.ini index c6df74529bed..e105c83cd6b4 100644 --- a/storage/tox.ini +++ b/storage/tox.ini @@ -3,8 +3,9 @@ envlist = py27,py34,py35,cover [testing] +localdeps = + pip install --upgrade {toxinidir}/../core deps = - {toxinidir}/../core pytest covercmd = py.test --quiet \ @@ -15,6 +16,7 @@ covercmd = [testenv] commands = + {[testing]localdeps} py.test --quiet {posargs} unit_tests deps = {[testing]deps} @@ -23,6 +25,7 @@ deps = basepython = python2.7 commands = + {[testing]localdeps} {[testing]covercmd} deps = {[testenv]deps} diff --git a/tox.ini b/tox.ini index af0055a4b139..d0b2dd9985cc 100644 --- a/tox.ini +++ b/tox.ini @@ -4,23 +4,25 @@ envlist = [testing] deps = - {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 pytest +localdeps = + pip install --upgrade \ + {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 covercmd = py.test --quiet \ --cov=google.cloud \ @@ -138,6 +140,7 @@ commands = basepython = python2.7 commands = + {[testing]localdeps} {[testing]covercmd} deps = {[testing]deps} @@ -147,6 +150,7 @@ deps = [testenv:coveralls] basepython = {[testenv:umbrella-cover]basepython} commands = + {[testing]localdeps} {[testing]covercmd} coveralls ignore_errors = True @@ -159,6 +163,7 @@ passenv = {[testenv:system-tests]passenv} basepython = python2.7 commands = + {[testing]localdeps} python -c \ "import shutil; shutil.rmtree('docs/_build/json', ignore_errors=True)" {toxinidir}/scripts/update_json_docs.sh @@ -176,6 +181,7 @@ passenv = basepython = python2.7 commands = + {[testing]localdeps} python -c \ "import shutil; shutil.rmtree('docs/_build', ignore_errors=True)" sphinx-build -W -b html -d docs/_build/doctrees docs docs/_build/html @@ -187,10 +193,9 @@ deps = passenv = {[testenv:system-tests]passenv} SPHINX_RELEASE READTHEDOCS [testenv:docs-doc2dash] -setenv = - PYTHONPATH = {toxinidir}/_testing basepython = {[testenv:docs]basepython} commands = + {[testing]localdeps} sphinx-build -W -b html -d docs/_build_doc2dash/doctrees \ docs docs/_build_doc2dash/html doc2dash -vv --force -n google-cloud-python \ @@ -214,6 +219,7 @@ verbose = 1 basepython = python2.7 commands = + {[testing]localdeps} python {toxinidir}/scripts/pycodestyle_on_repo.py python {toxinidir}/scripts/run_pylint.py deps = @@ -226,6 +232,7 @@ passenv = {[testenv:system-tests]passenv} basepython = python2.7 commands = + {[testing]localdeps} python {toxinidir}/system_tests/attempt_system_tests.py {posargs} deps = {[testing]deps} @@ -235,6 +242,7 @@ passenv = GOOGLE_* TRAVIS* encrypted_* basepython = python3.4 commands = + {[testing]localdeps} python {toxinidir}/system_tests/attempt_system_tests.py {posargs} deps = {[testing]deps} diff --git a/translate/tox.ini b/translate/tox.ini index 2d3e79d8c50e..27c94d2fb0f2 100644 --- a/translate/tox.ini +++ b/translate/tox.ini @@ -3,8 +3,9 @@ envlist = py27,py34,py35,cover [testing] +localdeps = + pip install --upgrade {toxinidir}/../core deps = - {toxinidir}/../core pytest covercmd = py.test --quiet \ @@ -15,6 +16,7 @@ covercmd = [testenv] commands = + {[testing]localdeps} py.test --quiet {posargs} unit_tests deps = {[testing]deps} @@ -23,6 +25,7 @@ deps = basepython = python2.7 commands = + {[testing]localdeps} {[testing]covercmd} deps = {[testenv]deps} diff --git a/vision/tox.ini b/vision/tox.ini index 7202958b4940..6f6bd2fe5665 100644 --- a/vision/tox.ini +++ b/vision/tox.ini @@ -3,8 +3,9 @@ envlist = py27,py34,py35,cover [testing] +localdeps = + pip install --upgrade {toxinidir}/../core deps = - {toxinidir}/../core pytest covercmd = py.test --quiet \ @@ -15,6 +16,7 @@ covercmd = [testenv] commands = + {[testing]localdeps} py.test --quiet {posargs} unit_tests deps = {[testing]deps} @@ -23,6 +25,7 @@ deps = basepython = python2.7 commands = + {[testing]localdeps} {[testing]covercmd} deps = {[testenv]deps}