Skip to content

Commit a12ab98

Browse files
dhermesdhermes
committed
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.
1 parent d2fc2c2 commit a12ab98

File tree

15 files changed

+21
-35
lines changed

15 files changed

+21
-35
lines changed

‎bigquery/tox.ini‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,9 @@ envlist =
66
localdeps =
77
pip install --quiet --upgrade {toxinidir}/../core
88
deps =
9-
pytest
9+
{toxinidir}/../core
1010
mock
11+
pytest
1112
covercmd =
1213
py.test --quiet \
1314
--cov=google.cloud.bigquery \
@@ -17,7 +18,6 @@ covercmd =
1718

1819
[testenv]
1920
commands =
20-
{[testing]localdeps}
2121
py.test --quiet {posargs} unit_tests
2222
deps =
2323
{[testing]deps}
@@ -26,7 +26,6 @@ deps =
2626
basepython =
2727
python2.7
2828
commands =
29-
{[testing]localdeps}
3029
{[testing]covercmd}
3130
deps =
3231
{[testenv]deps}

‎bigtable/tox.ini‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ envlist =
66
localdeps =
77
pip install --quiet --upgrade {toxinidir}/../core
88
deps =
9+
{toxinidir}/../core
910
pytest
1011
covercmd =
1112
py.test --quiet \
@@ -16,7 +17,6 @@ covercmd =
1617

1718
[testenv]
1819
commands =
19-
{[testing]localdeps}
2020
py.test --quiet {posargs} unit_tests
2121
deps =
2222
{[testing]deps}
@@ -25,7 +25,6 @@ deps =
2525
basepython =
2626
python2.7
2727
commands =
28-
{[testing]localdeps}
2928
{[testing]covercmd}
3029
deps =
3130
{[testenv]deps}

‎datastore/tox.ini‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,9 @@ envlist =
66
localdeps =
77
pip install --quiet --upgrade {toxinidir}/../core
88
deps =
9-
pytest
9+
{toxinidir}/../core
1010
mock
11+
pytest
1112
covercmd =
1213
py.test --quiet \
1314
--cov=google.cloud.datastore \
@@ -17,7 +18,6 @@ covercmd =
1718

1819
[testenv]
1920
commands =
20-
{[testing]localdeps}
2121
py.test --quiet {posargs} unit_tests
2222
deps =
2323
{[testing]deps}
@@ -26,7 +26,6 @@ deps =
2626
basepython =
2727
python2.7
2828
commands =
29-
{[testing]localdeps}
3029
{[testing]covercmd}
3130
deps =
3231
{[testenv]deps}

‎dns/tox.ini‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ envlist =
66
localdeps =
77
pip install --quiet --upgrade {toxinidir}/../core
88
deps =
9+
{toxinidir}/../core
910
pytest
1011
covercmd =
1112
py.test --quiet \
@@ -16,7 +17,6 @@ covercmd =
1617

1718
[testenv]
1819
commands =
19-
{[testing]localdeps}
2020
py.test --quiet {posargs} unit_tests
2121
deps =
2222
{[testing]deps}
@@ -25,7 +25,6 @@ deps =
2525
basepython =
2626
python2.7
2727
commands =
28-
{[testing]localdeps}
2928
{[testing]covercmd}
3029
deps =
3130
{[testenv]deps}

‎error_reporting/tox.ini‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,8 @@ localdeps =
88
{toxinidir}/../core \
99
{toxinidir}/../logging
1010
deps =
11+
{toxinidir}/../core
12+
{toxinidir}/../logging
1113
pytest
1214
covercmd =
1315
py.test --quiet \
@@ -18,7 +20,6 @@ covercmd =
1820

1921
[testenv]
2022
commands =
21-
{[testing]localdeps}
2223
py.test --quiet {posargs} unit_tests
2324
deps =
2425
{[testing]deps}
@@ -27,7 +28,6 @@ deps =
2728
basepython =
2829
python2.7
2930
commands =
30-
{[testing]localdeps}
3131
{[testing]covercmd}
3232
deps =
3333
{[testenv]deps}

‎language/tox.ini‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ envlist =
66
localdeps =
77
pip install --quiet --upgrade {toxinidir}/../core
88
deps =
9+
{toxinidir}/../core
910
pytest
1011
covercmd =
1112
py.test --quiet \
@@ -16,7 +17,6 @@ covercmd =
1617

1718
[testenv]
1819
commands =
19-
{[testing]localdeps}
2020
py.test --quiet {posargs} unit_tests
2121
deps =
2222
{[testing]deps}
@@ -25,7 +25,6 @@ deps =
2525
basepython =
2626
python2.7
2727
commands =
28-
{[testing]localdeps}
2928
{[testing]covercmd}
3029
deps =
3130
{[testenv]deps}

‎logging/tox.ini‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,9 @@ envlist =
66
localdeps =
77
pip install --quiet --upgrade {toxinidir}/../core
88
deps =
9-
pytest
9+
{toxinidir}/../core
1010
mock
11+
pytest
1112
covercmd =
1213
py.test --quiet \
1314
--cov=google.cloud.logging \
@@ -17,7 +18,6 @@ covercmd =
1718

1819
[testenv]
1920
commands =
20-
{[testing]localdeps}
2121
py.test --quiet {posargs} unit_tests
2222
deps =
2323
{[testing]deps}
@@ -26,7 +26,6 @@ deps =
2626
basepython =
2727
python2.7
2828
commands =
29-
{[testing]localdeps}
3029
{[testing]covercmd}
3130
deps =
3231
{[testenv]deps}

‎monitoring/tox.ini‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ envlist =
66
localdeps =
77
pip install --quiet --upgrade {toxinidir}/../core
88
deps =
9+
{toxinidir}/../core
910
pytest
1011
covercmd =
1112
py.test --quiet \
@@ -16,7 +17,6 @@ covercmd =
1617

1718
[testenv]
1819
commands =
19-
{[testing]localdeps}
2020
py.test --quiet {posargs} unit_tests
2121
deps =
2222
{[testing]deps}
@@ -26,7 +26,6 @@ deps =
2626
basepython =
2727
python2.7
2828
commands =
29-
{[testing]localdeps}
3029
{[testing]covercmd}
3130
deps =
3231
{[testing]deps}

‎pubsub/tox.ini‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,9 @@ envlist =
66
localdeps =
77
pip install --quiet --upgrade {toxinidir}/../core
88
deps =
9-
pytest
9+
{toxinidir}/../core
1010
mock
11+
pytest
1112
covercmd =
1213
py.test --quiet \
1314
--cov=google.cloud.pubsub \
@@ -17,7 +18,6 @@ covercmd =
1718

1819
[testenv]
1920
commands =
20-
{[testing]localdeps}
2121
py.test --quiet {posargs} unit_tests
2222
deps =
2323
{[testing]deps}
@@ -26,7 +26,6 @@ deps =
2626
basepython =
2727
python2.7
2828
commands =
29-
{[testing]localdeps}
3029
{[testing]covercmd}
3130
deps =
3231
{[testenv]deps}

‎resource_manager/tox.ini‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ envlist =
66
localdeps =
77
pip install --quiet --upgrade {toxinidir}/../core
88
deps =
9+
{toxinidir}/../core
910
pytest
1011
covercmd =
1112
py.test --quiet \
@@ -16,7 +17,6 @@ covercmd =
1617

1718
[testenv]
1819
commands =
19-
{[testing]localdeps}
2020
py.test --quiet {posargs} unit_tests
2121
deps =
2222
{[testing]deps}
@@ -25,7 +25,6 @@ deps =
2525
basepython =
2626
python2.7
2727
commands =
28-
{[testing]localdeps}
2928
{[testing]covercmd}
3029
deps =
3130
{[testenv]deps}

0 commit comments

Comments
 (0)