Skip to content

Commit 2dd7795

Browse files
tseavertseaver
authored
Nox: use inplace installs (#5865)
1 parent fa27f5d commit 2dd7795

File tree

19 files changed

+161
-102
lines changed

19 files changed

+161
-102
lines changed

‎bigquery/nox.py‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,10 @@ def default(session):
3434
Python corresponding to the ``nox`` binary the ``PATH`` can
3535
run the tests.
3636
"""
37-
# Install all test dependencies, then install this package in-place.
38-
session.install('mock', 'pytest', 'pytest-cov', *LOCAL_DEPS)
37+
# Install all test dependencies, then install local packages in-place.
38+
session.install('mock', 'pytest', 'pytest-cov')
39+
for local_dep in LOCAL_DEPS:
40+
session.install('-e', local_dep)
3941

4042
# Pyarrow does not support Python 3.7
4143
if session.interpreter == 'python3.7':
@@ -97,13 +99,12 @@ def system(session, py):
9799
# Use pre-release gRPC for system tests.
98100
session.install('--pre', 'grpcio')
99101

100-
# Install all test dependencies, then install this package into the
101-
# virtualenv's dist-packages.
102-
session.install('mock', 'pytest', *LOCAL_DEPS)
103-
session.install(
104-
os.path.join('..', 'storage'),
105-
os.path.join('..', 'test_utils'),
106-
)
102+
# Install all test dependencies, then install local packages in place.
103+
session.install('mock', 'pytest')
104+
for local_dep in LOCAL_DEPS:
105+
session.install('-e', local_dep)
106+
session.install('-e', os.path.join('..', 'storage'))
107+
session.install('-e', os.path.join('..', 'test_utils'))
107108
session.install('-e', '.[pandas]')
108109

109110
# IPython does not support Python 2 after version 5.x
@@ -136,13 +137,12 @@ def snippets(session, py):
136137
# Set the virtualenv dirname.
137138
session.virtualenv_dirname = 'snip-' + py
138139

139-
# Install all test dependencies, then install this package into the
140-
# virtualenv's dist-packages.
141-
session.install('mock', 'pytest', *LOCAL_DEPS)
142-
session.install(
143-
os.path.join('..', 'storage'),
144-
os.path.join('..', 'test_utils'),
145-
)
140+
# Install all test dependencies, then install local packages in place.
141+
session.install('mock', 'pytest')
142+
for local_dep in LOCAL_DEPS:
143+
session.install('-e', local_dep)
144+
session.install('-e', os.path.join('..', 'storage'))
145+
session.install('-e', os.path.join('..', 'test_utils'))
146146
session.install('-e', '.[pandas, pyarrow]')
147147

148148
# Run py.test against the system tests.

‎bigtable/nox.py‎

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,10 @@ def default(session):
3333
Python corresponding to the ``nox`` binary the ``PATH`` can
3434
run the tests.
3535
"""
36-
# Install all test dependencies, then install this package in-place.
37-
session.install('mock', 'pytest', 'pytest-cov', *LOCAL_DEPS)
36+
# Install all test dependencies, then install local packages in-place.
37+
session.install('mock', 'pytest', 'pytest-cov')
38+
for local_dep in LOCAL_DEPS:
39+
session.install('-e', local_dep)
3840
session.install('-e', '.')
3941

4042
# Run py.test against the unit tests.
@@ -86,8 +88,10 @@ def system(session, py):
8688

8789
# Install all test dependencies, then install this package into the
8890
# virtualenv's dist-packages.
89-
session.install('mock', 'pytest', *LOCAL_DEPS)
90-
session.install('../test_utils/')
91+
session.install('mock', 'pytest')
92+
for local_dep in LOCAL_DEPS:
93+
session.install('-e', local_dep)
94+
session.install('-e', '../test_utils/')
9195
session.install('-e', '.')
9296

9397
# Run py.test against the system tests.

‎container/nox.py‎

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,10 @@ def default(session):
3333
Python corresponding to the ``nox`` binary on the ``PATH`` can
3434
run the tests.
3535
"""
36-
# Install all test dependencies, then install this package in-place.
37-
session.install('mock', 'pytest', 'pytest-cov', *LOCAL_DEPS)
36+
# Install all test dependencies, then install local packages in-place.
37+
session.install('mock', 'pytest', 'pytest-cov')
38+
for local_dep in LOCAL_DEPS:
39+
session.install('-e', local_dep)
3840
session.install('-e', '.')
3941

4042
# Run py.test against the unit tests.
@@ -83,8 +85,10 @@ def system(session, py):
8385
# Install all test dependencies, then install this package into the
8486
# virtualenv's dist-packages.
8587
session.install('mock', 'pytest')
86-
session.install('../test_utils/')
87-
session.install('.')
88+
for local_dep in LOCAL_DEPS:
89+
session.install('-e', local_dep)
90+
session.install('-e', '../test_utils/')
91+
session.install('-e', '.')
8892

8993
# Run py.test against the system tests.
9094
session.run('py.test', '--quiet', 'tests/system/')

‎core/nox.py‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,14 +32,15 @@ def default(session):
3232
Python corresponding to the ``nox`` binary the ``PATH`` can
3333
run the tests.
3434
"""
35-
# Install all test dependencies, then install this package in-place.
35+
# Install all test dependencies, then install local packages in-place.
3636
session.install(
3737
'mock',
3838
'pytest',
3939
'pytest-cov',
4040
'grpcio >= 1.0.2',
41-
*LOCAL_DEPS
4241
)
42+
for local_dep in LOCAL_DEPS:
43+
session.install('-e', local_dep)
4344
session.install('-e', '.')
4445

4546
# Run py.test against the unit tests.

‎datastore/nox.py‎

Lines changed: 15 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,10 @@ def default(session):
3434
Python corresponding to the ``nox`` binary the ``PATH`` can
3535
run the tests.
3636
"""
37-
# Install all test dependencies, then install this package in-place.
38-
session.install('mock', 'pytest', 'pytest-cov', *LOCAL_DEPS)
37+
# Install all test dependencies, then install local packages in-place.
38+
session.install('mock', 'pytest', 'pytest-cov')
39+
for local_dep in LOCAL_DEPS:
40+
session.install('-e', local_dep)
3941
session.install('-e', '.')
4042

4143
# Run py.test against the unit tests.
@@ -85,11 +87,12 @@ def system(session, py):
8587
# Use pre-release gRPC for system tests.
8688
session.install('--pre', 'grpcio')
8789

88-
# Install all test dependencies, then install this package into the
89-
# virtualenv's dist-packages.
90-
session.install('mock', 'pytest', *LOCAL_DEPS)
91-
session.install('../test_utils/')
92-
session.install('.')
90+
# Install all test dependencies, then install local packages in-place.
91+
session.install('mock', 'pytest')
92+
for local_dep in LOCAL_DEPS:
93+
session.install('-e', local_dep)
94+
session.install('-e', '../test_utils/')
95+
session.install('-e', '.')
9396

9497
# Run py.test against the system tests.
9598
session.run('py.test', '--quiet', 'tests/system', *session.posargs)
@@ -111,9 +114,11 @@ def doctests(session):
111114

112115
# Install all test dependencies, then install this package into the
113116
# virtualenv's dist-packages.
114-
session.install('mock', 'pytest', 'sphinx', *LOCAL_DEPS)
115-
session.install('../test_utils/')
116-
session.install('.')
117+
session.install('mock', 'pytest', 'sphinx')
118+
for local_dep in LOCAL_DEPS:
119+
session.install('-e', local_dep)
120+
session.install('-e', '../test_utils/')
121+
session.install('-e', '.')
117122

118123
# Run py.test against the system tests.
119124
session.run('py.test', '--quiet', 'tests/doctests.py')

‎dns/nox.py‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,10 @@ def default(session):
3434
Python corresponding to the ``nox`` binary the ``PATH`` can
3535
run the tests.
3636
"""
37-
# Install all test dependencies, then install this package in-place.
38-
session.install('mock', 'pytest', 'pytest-cov', *LOCAL_DEPS)
37+
# Install all test dependencies, then install local packages in-place.
38+
session.install('mock', 'pytest', 'pytest-cov')
39+
for local_dep in LOCAL_DEPS:
40+
session.install('-e', local_dep)
3941
session.install('-e', '.')
4042

4143
# Run py.test against the unit tests.

‎error_reporting/nox.py‎

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,10 @@ def default(session):
3535
Python corresponding to the ``nox`` binary the ``PATH`` can
3636
run the tests.
3737
"""
38-
# Install all test dependencies, then install this package in-place.
39-
session.install('mock', 'pytest', 'pytest-cov', *LOCAL_DEPS)
38+
# Install all test dependencies, then install local packages in-place.
39+
session.install('mock', 'pytest', 'pytest-cov')
40+
for local_dep in LOCAL_DEPS:
41+
session.install('-e', local_dep)
4042
session.install('-e', '.')
4143

4244
# Run py.test against the unit tests.
@@ -111,11 +113,12 @@ def system(session, py):
111113
# Use pre-release gRPC for system tests.
112114
session.install('--pre', 'grpcio')
113115

114-
# Install all test dependencies, then install this package into the
115-
# virtualenv's dist-packages.
116-
session.install('mock', 'pytest', *LOCAL_DEPS)
117-
session.install('../test_utils/')
118-
session.install('.')
116+
# Install all test dependencies, then install local packages in-place.
117+
session.install('mock', 'pytest')
118+
for local_dep in LOCAL_DEPS:
119+
session.install('-e', local_dep)
120+
session.install('-e', '../test_utils/')
121+
session.install('-e', '.')
119122

120123
# Run py.test against the system tests.
121124
session.run('py.test', '-vvv', 'tests/system', *session.posargs)

‎firestore/nox.py‎

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,10 @@ def default(session):
3535
Python corresponding to the ``nox`` binary the ``PATH`` can
3636
run the tests.
3737
"""
38-
# Install all test dependencies, then install this package in-place.
39-
session.install('mock', 'pytest', 'pytest-cov', *LOCAL_DEPS)
38+
# Install all test dependencies, then install local packages in-place.
39+
session.install('mock', 'pytest', 'pytest-cov')
40+
for local_dep in LOCAL_DEPS:
41+
session.install('-e', local_dep)
4042
session.install('-e', '.')
4143

4244
# Run py.test against the unit tests.
@@ -86,11 +88,12 @@ def system(session, py):
8688
# Use pre-release gRPC for system tests.
8789
session.install('--pre', 'grpcio')
8890

89-
# Install all test dependencies, then install this package into the
90-
# virtualenv's dist-packages.
91-
session.install('mock', 'pytest', *LOCAL_DEPS)
92-
session.install(os.path.join('..', 'test_utils'))
93-
session.install('.')
91+
# Install all test dependencies, then install local packages in-place.
92+
session.install('mock', 'pytest')
93+
for local_dep in LOCAL_DEPS:
94+
session.install('-e', local_dep)
95+
session.install('-e', os.path.join('..', 'test_utils'))
96+
session.install('-e', '.')
9497

9598
# Run py.test against the system tests.
9699
session.run(

‎language/nox.py‎

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,10 @@ def default(session):
3434
Python corresponding to the ``nox`` binary the ``PATH`` can
3535
run the tests.
3636
"""
37-
# Install all test dependencies, then install this package in-place.
38-
session.install('mock', 'pytest', 'pytest-cov', *LOCAL_DEPS)
37+
# Install all test dependencies, then install local packages in-place.
38+
session.install('mock', 'pytest', 'pytest-cov')
39+
for local_dep in LOCAL_DEPS:
40+
session.install('-e', local_dep)
3941
session.install('-e', '.')
4042

4143
# Run py.test against the unit tests.
@@ -84,11 +86,13 @@ def system(session, py):
8486
# Use pre-release gRPC for system tests.
8587
session.install('--pre', 'grpcio')
8688

87-
# Install all test dependencies, then install this package into the
88-
# virtualenv's dist-packages.
89-
session.install('mock', 'pytest', *LOCAL_DEPS)
90-
session.install('../storage/', '../test_utils/')
91-
session.install('.')
89+
# Install all test dependencies, then install local packages in-place.
90+
session.install('mock', 'pytest')
91+
for local_dep in LOCAL_DEPS:
92+
session.install('-e', local_dep)
93+
session.install('-e', '../storage/')
94+
session.install('-e', '../test_utils/')
95+
session.install('-e', '.')
9296

9397
# Run py.test against the system tests.
9498
session.run('py.test', '--quiet', 'tests/system/')

‎logging/nox.py‎

Lines changed: 14 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -51,8 +51,9 @@ def default(session, django_dep=('django',)):
5151
else:
5252
deps += django_dep
5353

54-
deps += LOCAL_DEPS
5554
session.install(*deps)
55+
for local_dep in LOCAL_DEPS:
56+
session.install('-e', local_dep)
5657
session.install('-e', '.')
5758

5859
# Run py.test against the unit tests.
@@ -114,10 +115,18 @@ def system(session, py):
114115

115116
# Install all test dependencies, then install this package into the
116117
# virtualenv's dist-packages.
117-
session.install('mock', 'pytest', *LOCAL_DEPS)
118-
session.install('../test_utils/', '../bigquery/', '../pubsub/',
119-
'../storage/')
120-
session.install('.')
118+
session.install('mock', 'pytest')
119+
for local_dep in LOCAL_DEPS:
120+
session.install('-e', local_dep)
121+
systest_deps = [
122+
'../bigquery/',
123+
'../pubsub/',
124+
'../storage/',
125+
'../test_utils/',
126+
]
127+
for systest_dep in systest_deps:
128+
session.install('-e', systest_dep)
129+
session.install('-e', '.')
121130

122131
# Run py.test against the system tests.
123132
session.run(

0 commit comments

Comments
 (0)