Skip to content

Commit a8af701

Browse files
partheaparthea
committed
work in progress
1 parent 39dcbaa commit a8af701

11 files changed

Lines changed: 55 additions & 730 deletions

File tree

‎packages/gapic-generator/WORKSPACE‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -123,8 +123,3 @@ switched_rules_by_language(
123123
gapic = True,
124124
grpc = True,
125125
)
126-
load("@rules_python//python:repositories.bzl", "python_register_toolchains")
127-
python_register_toolchains(
128-
name = "python311",
129-
python_version = "3.11",
130-
)

‎packages/gapic-generator/gapic/templates/noxfile.py.j2‎

Lines changed: 5 additions & 81 deletions
Original file line numberDiff line numberDiff line change
@@ -46,31 +46,6 @@ LOWER_BOUND_REQUIREMENTS_FILE = (
4646
)
4747
PACKAGE_NAME = "{{ api.naming.warehouse_package_name }}"
4848

49-
UNIT_TEST_STANDARD_DEPENDENCIES = [
50-
"mock",
51-
"asyncmock",
52-
"pytest",
53-
"pytest-cov",
54-
"pytest-asyncio",
55-
]
56-
UNIT_TEST_EXTERNAL_DEPENDENCIES: List[str] = []
57-
UNIT_TEST_LOCAL_DEPENDENCIES: List[str] = []
58-
UNIT_TEST_DEPENDENCIES: List[str] = []
59-
UNIT_TEST_EXTRAS: List[str] = []
60-
UNIT_TEST_EXTRAS_BY_PYTHON: Dict[str, List[str]] = {}
61-
62-
SYSTEM_TEST_PYTHON_VERSIONS: List[str] = ALL_PYTHON
63-
SYSTEM_TEST_STANDARD_DEPENDENCIES = [
64-
"mock",
65-
"pytest",
66-
"google-cloud-testutils",
67-
]
68-
SYSTEM_TEST_EXTERNAL_DEPENDENCIES: List[str] = []
69-
SYSTEM_TEST_LOCAL_DEPENDENCIES: List[str] = []
70-
SYSTEM_TEST_DEPENDENCIES: List[str] = []
71-
SYSTEM_TEST_EXTRAS: List[str] = []
72-
SYSTEM_TEST_EXTRAS_BY_PYTHON: Dict[str, List[str]] = {}
73-
7449
nox.options.sessions = [
7550
"unit",
7651
"system",
@@ -234,31 +209,11 @@ def lint_setup_py(session):
234209

235210

236211
def install_unittest_dependencies(session, *requirements):
237-
standard_deps = UNIT_TEST_STANDARD_DEPENDENCIES + UNIT_TEST_DEPENDENCIES
238-
session.install(*standard_deps, *requirements)
239-
240-
if UNIT_TEST_EXTERNAL_DEPENDENCIES:
241-
warnings.warn(
242-
"'unit_test_external_dependencies' is deprecated. Instead, please "
243-
"use 'unit_test_dependencies' or 'unit_test_local_dependencies'.",
244-
DeprecationWarning,
245-
)
246-
session.install(*UNIT_TEST_EXTERNAL_DEPENDENCIES, *requirements)
247-
248-
if UNIT_TEST_LOCAL_DEPENDENCIES:
249-
session.install(*UNIT_TEST_LOCAL_DEPENDENCIES, *requirements)
250-
251-
if UNIT_TEST_EXTRAS_BY_PYTHON:
252-
extras = UNIT_TEST_EXTRAS_BY_PYTHON.get(session.python, [])
253-
elif UNIT_TEST_EXTRAS:
254-
extras = UNIT_TEST_EXTRAS
255-
else:
256-
extras = []
257-
258-
if extras:
259-
session.install("-e", f".[{','.join(extras)}]", *requirements)
260-
else:
261-
session.install("-e", ".", *requirements)
212+
requirements_path = str(
213+
CURRENT_DIRECTORY / "testing" / f"requirements-{session.python}.txt"
214+
)
215+
session.install("-r", requirements_path)
216+
session.install("-e", ".", "--no-deps")
262217

263218

264219
@nox.session(python=ALL_PYTHON)
@@ -298,37 +253,6 @@ def unit(session, protobuf_implementation):
298253
{# TODO(https://github.com/googleapis/gapic-generator-python/issues/2201) Add a `unit_rest_async` nox session to run tests with [async_rest] extra installed. #}
299254

300255

301-
def install_systemtest_dependencies(session, *requirements):
302-
{# Note that grpcio<=1.62.2 works on Python 3.11 but fails on 3.12+ because it requires pkg_resources for its source build. #}
303-
if session.python >= "3.12":
304-
session.install("--pre", "grpcio>=1.75.1")
305-
else:
306-
session.install("--pre", "grpcio<=1.62.2")
307-
308-
session.install(*SYSTEM_TEST_STANDARD_DEPENDENCIES, *requirements)
309-
310-
if SYSTEM_TEST_EXTERNAL_DEPENDENCIES:
311-
session.install(*SYSTEM_TEST_EXTERNAL_DEPENDENCIES, *requirements)
312-
313-
if SYSTEM_TEST_LOCAL_DEPENDENCIES:
314-
session.install("-e", *SYSTEM_TEST_LOCAL_DEPENDENCIES, *requirements)
315-
316-
if SYSTEM_TEST_DEPENDENCIES:
317-
session.install("-e", *SYSTEM_TEST_DEPENDENCIES, *requirements)
318-
319-
if SYSTEM_TEST_EXTRAS_BY_PYTHON:
320-
extras = SYSTEM_TEST_EXTRAS_BY_PYTHON.get(session.python, [])
321-
elif SYSTEM_TEST_EXTRAS:
322-
extras = SYSTEM_TEST_EXTRAS
323-
else:
324-
extras = []
325-
326-
if extras:
327-
session.install("-e", f".[{','.join(extras)}]", *requirements)
328-
else:
329-
session.install("-e", ".", *requirements)
330-
331-
332256
@nox.session(python=SYSTEM_TEST_PYTHON_VERSIONS)
333257
def system(session):
334258
"""Run the system test suite."""

‎packages/gapic-generator/noxfile.py‎

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -150,7 +150,11 @@ def __call__(self, frag):
150150
requirements_path = str(
151151
f"{tmp_dir}/testing/requirements-{self.session.python}.txt"
152152
)
153-
self.session.install(tmp_dir, "-e", ".", "-qqq", "-r", requirements_path)
153+
self.session.install(
154+
"-r",
155+
requirements_path,
156+
)
157+
self.session.install(tmp_dir, "-e", ".", "--no-deps")
154158

155159
# Run the fragment's generated unit tests.
156160
# Don't bother parallelizing them: we already parallelize
@@ -359,7 +363,6 @@ def showcase_library(
359363
requirements_path = str(
360364
f"{tmp_dir}/testing/requirements-{session.python}.txt"
361365
)
362-
extras = ""
363366
if rest_async_io_enabled:
364367
async_rest_requirements_path = str(
365368
f"{tmp_dir}/testing/requirements-{session.python}-async-rest.txt"
@@ -371,9 +374,12 @@ def showcase_library(
371374
session.log(
372375
f"{async_rest_requirements_path} not found. Using base requirements file"
373376
)
374-
extras = "[async_rest]"
375377

376-
session.install("-e", f"{tmp_dir}{extras}", "-r", requirements_path)
378+
session.install(
379+
"-r",
380+
requirements_path,
381+
)
382+
session.install(tmp_dir, "--no-deps")
377383
else:
378384
# The ads templates do not have requirements files.
379385
# See https://github.com/googleapis/gapic-generator-python/issues/1788

‎packages/gapic-generator/tests/integration/goldens/asset/noxfile.py‎

Lines changed: 5 additions & 80 deletions
Original file line numberDiff line numberDiff line change
@@ -53,31 +53,6 @@
5353
)
5454
PACKAGE_NAME = "google-cloud-asset"
5555

56-
UNIT_TEST_STANDARD_DEPENDENCIES = [
57-
"mock",
58-
"asyncmock",
59-
"pytest",
60-
"pytest-cov",
61-
"pytest-asyncio",
62-
]
63-
UNIT_TEST_EXTERNAL_DEPENDENCIES: List[str] = []
64-
UNIT_TEST_LOCAL_DEPENDENCIES: List[str] = []
65-
UNIT_TEST_DEPENDENCIES: List[str] = []
66-
UNIT_TEST_EXTRAS: List[str] = []
67-
UNIT_TEST_EXTRAS_BY_PYTHON: Dict[str, List[str]] = {}
68-
69-
SYSTEM_TEST_PYTHON_VERSIONS: List[str] = ALL_PYTHON
70-
SYSTEM_TEST_STANDARD_DEPENDENCIES = [
71-
"mock",
72-
"pytest",
73-
"google-cloud-testutils",
74-
]
75-
SYSTEM_TEST_EXTERNAL_DEPENDENCIES: List[str] = []
76-
SYSTEM_TEST_LOCAL_DEPENDENCIES: List[str] = []
77-
SYSTEM_TEST_DEPENDENCIES: List[str] = []
78-
SYSTEM_TEST_EXTRAS: List[str] = []
79-
SYSTEM_TEST_EXTRAS_BY_PYTHON: Dict[str, List[str]] = {}
80-
8156
nox.options.sessions = [
8257
"unit",
8358
"system",
@@ -232,31 +207,11 @@ def lint_setup_py(session):
232207

233208

234209
def install_unittest_dependencies(session, *requirements):
235-
standard_deps = UNIT_TEST_STANDARD_DEPENDENCIES + UNIT_TEST_DEPENDENCIES
236-
session.install(*standard_deps, *requirements)
237-
238-
if UNIT_TEST_EXTERNAL_DEPENDENCIES:
239-
warnings.warn(
240-
"'unit_test_external_dependencies' is deprecated. Instead, please "
241-
"use 'unit_test_dependencies' or 'unit_test_local_dependencies'.",
242-
DeprecationWarning,
243-
)
244-
session.install(*UNIT_TEST_EXTERNAL_DEPENDENCIES, *requirements)
245-
246-
if UNIT_TEST_LOCAL_DEPENDENCIES:
247-
session.install(*UNIT_TEST_LOCAL_DEPENDENCIES, *requirements)
248-
249-
if UNIT_TEST_EXTRAS_BY_PYTHON:
250-
extras = UNIT_TEST_EXTRAS_BY_PYTHON.get(session.python, [])
251-
elif UNIT_TEST_EXTRAS:
252-
extras = UNIT_TEST_EXTRAS
253-
else:
254-
extras = []
255-
256-
if extras:
257-
session.install("-e", f".[{','.join(extras)}]", *requirements)
258-
else:
259-
session.install("-e", ".", *requirements)
210+
requirements_path = str(
211+
CURRENT_DIRECTORY / "testing" / f"requirements-{session.python}.txt"
212+
)
213+
session.install("-r", requirements_path)
214+
session.install("-e", ".", "--no-deps")
260215

261216

262217
@nox.session(python=ALL_PYTHON)
@@ -291,36 +246,6 @@ def unit(session, protobuf_implementation):
291246
)
292247

293248

294-
def install_systemtest_dependencies(session, *requirements):
295-
if session.python >= "3.12":
296-
session.install("--pre", "grpcio>=1.75.1")
297-
else:
298-
session.install("--pre", "grpcio<=1.62.2")
299-
300-
session.install(*SYSTEM_TEST_STANDARD_DEPENDENCIES, *requirements)
301-
302-
if SYSTEM_TEST_EXTERNAL_DEPENDENCIES:
303-
session.install(*SYSTEM_TEST_EXTERNAL_DEPENDENCIES, *requirements)
304-
305-
if SYSTEM_TEST_LOCAL_DEPENDENCIES:
306-
session.install("-e", *SYSTEM_TEST_LOCAL_DEPENDENCIES, *requirements)
307-
308-
if SYSTEM_TEST_DEPENDENCIES:
309-
session.install("-e", *SYSTEM_TEST_DEPENDENCIES, *requirements)
310-
311-
if SYSTEM_TEST_EXTRAS_BY_PYTHON:
312-
extras = SYSTEM_TEST_EXTRAS_BY_PYTHON.get(session.python, [])
313-
elif SYSTEM_TEST_EXTRAS:
314-
extras = SYSTEM_TEST_EXTRAS
315-
else:
316-
extras = []
317-
318-
if extras:
319-
session.install("-e", f".[{','.join(extras)}]", *requirements)
320-
else:
321-
session.install("-e", ".", *requirements)
322-
323-
324249
@nox.session(python=SYSTEM_TEST_PYTHON_VERSIONS)
325250
def system(session):
326251
"""Run the system test suite."""

‎packages/gapic-generator/tests/integration/goldens/credentials/noxfile.py‎

Lines changed: 5 additions & 80 deletions
Original file line numberDiff line numberDiff line change
@@ -53,31 +53,6 @@
5353
)
5454
PACKAGE_NAME = "google-iam-credentials"
5555

56-
UNIT_TEST_STANDARD_DEPENDENCIES = [
57-
"mock",
58-
"asyncmock",
59-
"pytest",
60-
"pytest-cov",
61-
"pytest-asyncio",
62-
]
63-
UNIT_TEST_EXTERNAL_DEPENDENCIES: List[str] = []
64-
UNIT_TEST_LOCAL_DEPENDENCIES: List[str] = []
65-
UNIT_TEST_DEPENDENCIES: List[str] = []
66-
UNIT_TEST_EXTRAS: List[str] = []
67-
UNIT_TEST_EXTRAS_BY_PYTHON: Dict[str, List[str]] = {}
68-
69-
SYSTEM_TEST_PYTHON_VERSIONS: List[str] = ALL_PYTHON
70-
SYSTEM_TEST_STANDARD_DEPENDENCIES = [
71-
"mock",
72-
"pytest",
73-
"google-cloud-testutils",
74-
]
75-
SYSTEM_TEST_EXTERNAL_DEPENDENCIES: List[str] = []
76-
SYSTEM_TEST_LOCAL_DEPENDENCIES: List[str] = []
77-
SYSTEM_TEST_DEPENDENCIES: List[str] = []
78-
SYSTEM_TEST_EXTRAS: List[str] = []
79-
SYSTEM_TEST_EXTRAS_BY_PYTHON: Dict[str, List[str]] = {}
80-
8156
nox.options.sessions = [
8257
"unit",
8358
"system",
@@ -232,31 +207,11 @@ def lint_setup_py(session):
232207

233208

234209
def install_unittest_dependencies(session, *requirements):
235-
standard_deps = UNIT_TEST_STANDARD_DEPENDENCIES + UNIT_TEST_DEPENDENCIES
236-
session.install(*standard_deps, *requirements)
237-
238-
if UNIT_TEST_EXTERNAL_DEPENDENCIES:
239-
warnings.warn(
240-
"'unit_test_external_dependencies' is deprecated. Instead, please "
241-
"use 'unit_test_dependencies' or 'unit_test_local_dependencies'.",
242-
DeprecationWarning,
243-
)
244-
session.install(*UNIT_TEST_EXTERNAL_DEPENDENCIES, *requirements)
245-
246-
if UNIT_TEST_LOCAL_DEPENDENCIES:
247-
session.install(*UNIT_TEST_LOCAL_DEPENDENCIES, *requirements)
248-
249-
if UNIT_TEST_EXTRAS_BY_PYTHON:
250-
extras = UNIT_TEST_EXTRAS_BY_PYTHON.get(session.python, [])
251-
elif UNIT_TEST_EXTRAS:
252-
extras = UNIT_TEST_EXTRAS
253-
else:
254-
extras = []
255-
256-
if extras:
257-
session.install("-e", f".[{','.join(extras)}]", *requirements)
258-
else:
259-
session.install("-e", ".", *requirements)
210+
requirements_path = str(
211+
CURRENT_DIRECTORY / "testing" / f"requirements-{session.python}.txt"
212+
)
213+
session.install("-r", requirements_path)
214+
session.install("-e", ".", "--no-deps")
260215

261216

262217
@nox.session(python=ALL_PYTHON)
@@ -291,36 +246,6 @@ def unit(session, protobuf_implementation):
291246
)
292247

293248

294-
def install_systemtest_dependencies(session, *requirements):
295-
if session.python >= "3.12":
296-
session.install("--pre", "grpcio>=1.75.1")
297-
else:
298-
session.install("--pre", "grpcio<=1.62.2")
299-
300-
session.install(*SYSTEM_TEST_STANDARD_DEPENDENCIES, *requirements)
301-
302-
if SYSTEM_TEST_EXTERNAL_DEPENDENCIES:
303-
session.install(*SYSTEM_TEST_EXTERNAL_DEPENDENCIES, *requirements)
304-
305-
if SYSTEM_TEST_LOCAL_DEPENDENCIES:
306-
session.install("-e", *SYSTEM_TEST_LOCAL_DEPENDENCIES, *requirements)
307-
308-
if SYSTEM_TEST_DEPENDENCIES:
309-
session.install("-e", *SYSTEM_TEST_DEPENDENCIES, *requirements)
310-
311-
if SYSTEM_TEST_EXTRAS_BY_PYTHON:
312-
extras = SYSTEM_TEST_EXTRAS_BY_PYTHON.get(session.python, [])
313-
elif SYSTEM_TEST_EXTRAS:
314-
extras = SYSTEM_TEST_EXTRAS
315-
else:
316-
extras = []
317-
318-
if extras:
319-
session.install("-e", f".[{','.join(extras)}]", *requirements)
320-
else:
321-
session.install("-e", ".", *requirements)
322-
323-
324249
@nox.session(python=SYSTEM_TEST_PYTHON_VERSIONS)
325250
def system(session):
326251
"""Run the system test suite."""

0 commit comments

Comments
 (0)