Skip to content

Commit fb96ae6

Browse files
daniel-sanchedaniel-sanche
committed
updated noxfiles to use local packages instead of over network
1 parent 76da0b7 commit fb96ae6

8 files changed

Lines changed: 101 additions & 62 deletions

File tree

‎packages/db-dtypes/noxfile.py‎

Lines changed: 13 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -512,16 +512,21 @@ def core_deps_from_source(session, protobuf_implementation):
512512
install_unittest_dependencies(session, "-c", constraints_path)
513513

514514
core_dependencies_from_source = [
515-
"googleapis-common-protos @ git+https://github.com/googleapis/google-cloud-python#egg=googleapis-common-protos&subdirectory=packages/googleapis-common-protos",
516-
"google-api-core @ git+https://github.com/googleapis/google-cloud-python#egg=google-api-core&subdirectory=packages/google-api-core",
517-
"google-auth @ git+https://github.com/googleapis/google-cloud-python#egg=google-auth&subdirectory=packages/google-auth",
518-
"grpc-google-iam-v1 @ git+https://github.com/googleapis/google-cloud-python#egg=grpc-google-iam-v1&subdirectory=packages/grpc-google-iam-v1",
519-
"proto-plus @ git+https://github.com/googleapis/google-cloud-python#egg=proto-plus&subdirectory=packages/proto-plus",
515+
"googleapis-common-protos",
516+
"google-api-core",
517+
"google-auth",
518+
"grpc-google-iam-v1",
519+
"proto-plus",
520520
]
521521

522-
for dep in core_dependencies_from_source:
523-
session.install(dep, "--no-deps", "--ignore-installed")
524-
print(f"Installed {dep}")
522+
deps_dir = CURRENT_DIRECTORY.parent
523+
while deps_dir.name != "packages" and deps_dir.parent != deps_dir:
524+
deps_dir = deps_dir.parent
525+
526+
local_paths = [str(deps_dir / dep) for dep in core_dependencies_from_source if (deps_dir / dep).exists()]
527+
if local_paths:
528+
session.install(*local_paths, "--no-deps", "--ignore-installed")
529+
print(f"Installed {', '.join(core_dependencies_from_source)} locally from {deps_dir}")
525530

526531
tests_path = os.path.join("tests", "unit")
527532
session.run(

‎packages/google-cloud-documentai-toolbox/noxfile.py‎

Lines changed: 13 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -536,16 +536,21 @@ def core_deps_from_source(session, protobuf_implementation):
536536
install_unittest_dependencies(session, "-c", constraints_path)
537537

538538
core_dependencies_from_source = [
539-
"googleapis-common-protos @ git+https://github.com/googleapis/google-cloud-python#egg=googleapis-common-protos&subdirectory=packages/googleapis-common-protos",
540-
"google-api-core @ git+https://github.com/googleapis/google-cloud-python#egg=google-api-core&subdirectory=packages/google-api-core",
541-
"google-auth @ git+https://github.com/googleapis/google-cloud-python#egg=google-auth&subdirectory=packages/google-auth",
542-
"grpc-google-iam-v1 @ git+https://github.com/googleapis/google-cloud-python#egg=grpc-google-iam-v1&subdirectory=packages/grpc-google-iam-v1",
543-
"proto-plus @ git+https://github.com/googleapis/google-cloud-python#egg=proto-plus&subdirectory=packages/proto-plus",
539+
"googleapis-common-protos",
540+
"google-api-core",
541+
"google-auth",
542+
"grpc-google-iam-v1",
543+
"proto-plus",
544544
]
545545

546-
for dep in core_dependencies_from_source:
547-
session.install(dep, "--no-deps", "--ignore-installed")
548-
print(f"Installed {dep}")
546+
deps_dir = CURRENT_DIRECTORY.parent
547+
while deps_dir.name != "packages" and deps_dir.parent != deps_dir:
548+
deps_dir = deps_dir.parent
549+
550+
local_paths = [str(deps_dir / dep) for dep in core_dependencies_from_source if (deps_dir / dep).exists()]
551+
if local_paths:
552+
session.install(*local_paths, "--no-deps", "--ignore-installed")
553+
print(f"Installed {', '.join(core_dependencies_from_source)} locally from {deps_dir}")
549554

550555
tests_path = os.path.join("tests", "unit")
551556
session.run(

‎packages/google-cloud-ndb/noxfile.py‎

Lines changed: 13 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -504,16 +504,21 @@ def core_deps_from_source(session, protobuf_implementation):
504504
install_unittest_dependencies(session, "-c", constraints_path)
505505

506506
core_dependencies_from_source = [
507-
"googleapis-common-protos @ git+https://github.com/googleapis/google-cloud-python#egg=googleapis-common-protos&subdirectory=packages/googleapis-common-protos",
508-
"google-api-core @ git+https://github.com/googleapis/google-cloud-python#egg=google-api-core&subdirectory=packages/google-api-core",
509-
"google-auth @ git+https://github.com/googleapis/google-cloud-python#egg=google-auth&subdirectory=packages/google-auth",
510-
"grpc-google-iam-v1 @ git+https://github.com/googleapis/google-cloud-python#egg=grpc-google-iam-v1&subdirectory=packages/grpc-google-iam-v1",
511-
"proto-plus @ git+https://github.com/googleapis/google-cloud-python#egg=proto-plus&subdirectory=packages/proto-plus",
507+
"googleapis-common-protos",
508+
"google-api-core",
509+
"google-auth",
510+
"grpc-google-iam-v1",
511+
"proto-plus",
512512
]
513513

514-
for dep in core_dependencies_from_source:
515-
session.install(dep, "--no-deps", "--ignore-installed")
516-
print(f"Installed {dep}")
514+
deps_dir = CURRENT_DIRECTORY.parent
515+
while deps_dir.name != "packages" and deps_dir.parent != deps_dir:
516+
deps_dir = deps_dir.parent
517+
518+
local_paths = [str(deps_dir / dep) for dep in core_dependencies_from_source if (deps_dir / dep).exists()]
519+
if local_paths:
520+
session.install(*local_paths, "--no-deps", "--ignore-installed")
521+
print(f"Installed {', '.join(core_dependencies_from_source)} locally from {deps_dir}")
517522

518523
tests_path = os.path.join("tests", "unit")
519524
session.run(

‎packages/googleapis-common-protos/noxfile.py‎

Lines changed: 13 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -558,16 +558,21 @@ def core_deps_from_source(session, protobuf_implementation):
558558
# Note: If a dependency is added to the `core_dependencies_from_source` list,
559559
# the `prerel_deps` list in the `prerelease_deps` nox session should also be updated.
560560
core_dependencies_from_source = [
561-
f"{CURRENT_DIRECTORY}/../googleapis-common-protos",
562-
"google-api-core @ git+https://github.com/googleapis/google-cloud-python#egg=google-api-core&subdirectory=packages/google-api-core",
563-
"google-auth @ git+https://github.com/googleapis/google-cloud-python#egg=google-auth&subdirectory=packages/google-auth",
564-
f"{CURRENT_DIRECTORY}/../grpc-google-iam-v1",
565-
"proto-plus @ git+https://github.com/googleapis/google-cloud-python#egg=proto-plus&subdirectory=packages/proto-plus",
561+
"googleapis-common-protos",
562+
"google-api-core",
563+
"google-auth",
564+
"grpc-google-iam-v1",
565+
"proto-plus",
566566
]
567567

568-
for dep in core_dependencies_from_source:
569-
session.install(dep, "--no-deps", "--ignore-installed")
570-
print(f"Installed {dep}")
568+
deps_dir = CURRENT_DIRECTORY.parent
569+
while deps_dir.name != "packages" and deps_dir.parent != deps_dir:
570+
deps_dir = deps_dir.parent
571+
572+
local_paths = [str(deps_dir / dep) for dep in core_dependencies_from_source if (deps_dir / dep).exists()]
573+
if local_paths:
574+
session.install(*local_paths, "--no-deps", "--ignore-installed")
575+
print(f"Installed {', '.join(core_dependencies_from_source)} locally from {deps_dir}")
571576

572577
session.run(
573578
"py.test",

‎packages/pandas-gbq/noxfile.py‎

Lines changed: 13 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -584,16 +584,21 @@ def core_deps_from_source(session, protobuf_implementation):
584584
install_unittest_dependencies(session, "-c", constraints_path)
585585

586586
core_dependencies_from_source = [
587-
"googleapis-common-protos @ git+https://github.com/googleapis/google-cloud-python#egg=googleapis-common-protos&subdirectory=packages/googleapis-common-protos",
588-
"google-api-core @ git+https://github.com/googleapis/google-cloud-python#egg=google-api-core&subdirectory=packages/google-api-core",
589-
"google-auth @ git+https://github.com/googleapis/google-cloud-python#egg=google-auth&subdirectory=packages/google-auth",
590-
"grpc-google-iam-v1 @ git+https://github.com/googleapis/google-cloud-python#egg=grpc-google-iam-v1&subdirectory=packages/grpc-google-iam-v1",
591-
"proto-plus @ git+https://github.com/googleapis/google-cloud-python#egg=proto-plus&subdirectory=packages/proto-plus",
587+
"googleapis-common-protos",
588+
"google-api-core",
589+
"google-auth",
590+
"grpc-google-iam-v1",
591+
"proto-plus",
592592
]
593593

594-
for dep in core_dependencies_from_source:
595-
session.install(dep, "--no-deps", "--ignore-installed")
596-
print(f"Installed {dep}")
594+
deps_dir = CURRENT_DIRECTORY.parent
595+
while deps_dir.name != "packages" and deps_dir.parent != deps_dir:
596+
deps_dir = deps_dir.parent
597+
598+
local_paths = [str(deps_dir / dep) for dep in core_dependencies_from_source if (deps_dir / dep).exists()]
599+
if local_paths:
600+
session.install(*local_paths, "--no-deps", "--ignore-installed")
601+
print(f"Installed {', '.join(core_dependencies_from_source)} locally from {deps_dir}")
597602

598603
tests_path = os.path.join("tests", "unit")
599604
session.run(

‎packages/proto-plus/noxfile.py‎

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -167,14 +167,18 @@ def core_deps_from_source(session, implementation):
167167
# Note: If a dependency is added to the `core_dependencies_from_source` list,
168168
# the `prerel_deps` list in the `prerelease_deps` nox session should also be updated.
169169
core_dependencies_from_source = [
170-
"google-api-core @ git+https://github.com/googleapis/google-cloud-python#egg=google-api-core&subdirectory=packages/google-api-core",
171-
# dependency of google-api-core
172-
"googleapis-common-protos @ git+https://github.com/googleapis/google-cloud-python#egg=googleapis-common-protos&subdirectory=packages/googleapis-common-protos",
170+
"google-api-core",
171+
"googleapis-common-protos",
173172
]
174173

175-
for dep in core_dependencies_from_source:
176-
session.install(dep, "--no-deps", "--ignore-installed")
177-
print(f"Installed {dep}")
174+
deps_dir = CURRENT_DIRECTORY.parent
175+
while deps_dir.name != "packages" and deps_dir.parent != deps_dir:
176+
deps_dir = deps_dir.parent
177+
178+
local_paths = [str(deps_dir / dep) for dep in core_dependencies_from_source if (deps_dir / dep).exists()]
179+
if local_paths:
180+
session.install(*local_paths, "--no-deps", "--ignore-installed")
181+
print(f"Installed {', '.join(core_dependencies_from_source)} locally from {deps_dir}")
178182

179183
# TODO(https://github.com/googleapis/google-cloud-python/issues/15115): Install protobuf from source at HEAD
180184
session.install("--pre", "--upgrade", "protobuf")

‎packages/sqlalchemy-bigquery/noxfile.py‎

Lines changed: 13 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -706,16 +706,21 @@ def core_deps_from_source(session, protobuf_implementation):
706706
session.install("-e", install_target, "-c", constraints_path)
707707

708708
core_dependencies_from_source = [
709-
"googleapis-common-protos @ git+https://github.com/googleapis/google-cloud-python#egg=googleapis-common-protos&subdirectory=packages/googleapis-common-protos",
710-
"google-api-core @ git+https://github.com/googleapis/google-cloud-python#egg=google-api-core&subdirectory=packages/google-api-core",
711-
"google-auth @ git+https://github.com/googleapis/google-cloud-python#egg=google-auth&subdirectory=packages/google-auth",
712-
"grpc-google-iam-v1 @ git+https://github.com/googleapis/google-cloud-python#egg=grpc-google-iam-v1&subdirectory=packages/grpc-google-iam-v1",
713-
"proto-plus @ git+https://github.com/googleapis/google-cloud-python#egg=proto-plus&subdirectory=packages/proto-plus",
709+
"googleapis-common-protos",
710+
"google-api-core",
711+
"google-auth",
712+
"grpc-google-iam-v1",
713+
"proto-plus",
714714
]
715715

716-
for dep in core_dependencies_from_source:
717-
session.install(dep, "--no-deps", "--ignore-installed")
718-
print(f"Installed {dep}")
716+
deps_dir = CURRENT_DIRECTORY.parent
717+
while deps_dir.name != "packages" and deps_dir.parent != deps_dir:
718+
deps_dir = deps_dir.parent
719+
720+
local_paths = [str(deps_dir / dep) for dep in core_dependencies_from_source if (deps_dir / dep).exists()]
721+
if local_paths:
722+
session.install(*local_paths, "--no-deps", "--ignore-installed")
723+
print(f"Installed {', '.join(core_dependencies_from_source)} locally from {deps_dir}")
719724

720725
tests_path = os.path.join("tests", "unit")
721726
session.run(

‎packages/sqlalchemy-spanner/noxfile.py‎

Lines changed: 13 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -547,16 +547,21 @@ def core_deps_from_source(session, protobuf_implementation):
547547
session.install(".")
548548

549549
core_dependencies_from_source = [
550-
"googleapis-common-protos @ git+https://github.com/googleapis/google-cloud-python#egg=googleapis-common-protos&subdirectory=packages/googleapis-common-protos",
551-
"google-api-core @ git+https://github.com/googleapis/google-cloud-python#egg=google-api-core&subdirectory=packages/google-api-core",
552-
"google-auth @ git+https://github.com/googleapis/google-cloud-python#egg=google-auth&subdirectory=packages/google-auth",
553-
"grpc-google-iam-v1 @ git+https://github.com/googleapis/google-cloud-python#egg=grpc-google-iam-v1&subdirectory=packages/grpc-google-iam-v1",
554-
"proto-plus @ git+https://github.com/googleapis/google-cloud-python#egg=proto-plus&subdirectory=packages/proto-plus",
550+
"googleapis-common-protos",
551+
"google-api-core",
552+
"google-auth",
553+
"grpc-google-iam-v1",
554+
"proto-plus",
555555
]
556556

557-
for dep in core_dependencies_from_source:
558-
session.install(dep, "--no-deps", "--ignore-installed")
559-
print(f"Installed {dep}")
557+
deps_dir = CURRENT_DIRECTORY.parent
558+
while deps_dir.name != "packages" and deps_dir.parent != deps_dir:
559+
deps_dir = deps_dir.parent
560+
561+
local_paths = [str(deps_dir / dep) for dep in core_dependencies_from_source if (deps_dir / dep).exists()]
562+
if local_paths:
563+
session.install(*local_paths, "--no-deps", "--ignore-installed")
564+
print(f"Installed {', '.join(core_dependencies_from_source)} locally from {deps_dir}")
560565

561566
tests_path = os.path.join("tests", "unit")
562567
session.run(

0 commit comments

Comments
 (0)