fix: restore local gapic-generator dependencies and make gapic_v1 imports conditional

Author: hebaalazzeh

packages/gapic-generator/gapic/templates/setup.py.j2

@@ -36,7 +36,7 @@ else:
     release_status = "Development Status :: 5 - Production/Stable"
 
 dependencies = [
-    "google-api-core @ git+https://github.com/googleapis/google-cloud-python.git#egg=google-api-core&subdirectory=packages/google-api-core",
+    "google-api-core[grpc] >= 2.25.0, <3.0.0",
     # Exclude incompatible versions of `google-auth`
     # See https://github.com/googleapis/google-cloud-python/issues/12364
     "google-auth >= 2.14.1, <3.0.0,!=2.24.0,!=2.25.0",

packages/gapic-generator/gapic/templates/testing/_default_constraints.j2

@@ -1,7 +1,7 @@
 {% from '_pypi_packages.j2' import pypi_packages %}
 # This constraints file is required for unit tests.
 # List all library dependencies and extras in this file.
-google-api-core @ git+https://github.com/googleapis/google-cloud-python.git#egg=google-api-core&subdirectory=packages/google-api-core
+google-api-core
 google-auth
 grpcio
 proto-plus

packages/gapic-generator/gapic/templates/testing/constraints-3.10-async-rest.txt.j2

@@ -8,7 +8,7 @@
 # pinning their versions to their lower bounds.
 # For example, if setup.py has "google-cloud-foo >= 1.14.0, < 2.0.0",
 # then this file should have google-cloud-foo==1.14.0
-google-api-core @ git+https://github.com/googleapis/google-cloud-python.git#egg=google-api-core&subdirectory=packages/google-api-core
+google-api-core==2.25.0
 google-auth==2.35.0
 grpcio==1.59.0
 proto-plus==1.26.1

packages/gapic-generator/gapic/templates/testing/constraints-3.10.txt.j2

@@ -5,7 +5,7 @@
 # pinning their versions to their lower bounds.
 # For example, if setup.py has "google-cloud-foo >= 1.14.0, < 2.0.0",
 # then this file should have google-cloud-foo==1.14.0
-google-api-core @ git+https://github.com/googleapis/google-cloud-python.git#egg=google-api-core&subdirectory=packages/google-api-core
+google-api-core==2.25.0
 google-auth==2.14.1
 grpcio==1.59.0
 proto-plus==1.26.1

packages/gapic-generator/gapic/templates/testing/constraints-3.13.txt.j2

@@ -6,7 +6,7 @@
 # Require the latest major version be installed for each dependency.
 # e.g., if setup.py has "google-cloud-foo >= 1.14.0, < 2.0.0",
 # Then this file should have google-cloud-foo>=1
-google-api-core @ git+https://github.com/googleapis/google-cloud-python.git#egg=google-api-core&subdirectory=packages/google-api-core
+google-api-core>=2
 google-auth>=2
 grpcio>=1
 proto-plus>=1

packages/gapic-generator/gapic/templates/testing/constraints-3.14.txt.j2

@@ -6,7 +6,7 @@
 # Require the latest major version be installed for each dependency.
 # e.g., if setup.py has "google-cloud-foo >= 1.14.0, < 2.0.0",
 # Then this file should have google-cloud-foo>=1
-google-api-core @ git+https://github.com/googleapis/google-cloud-python.git#egg=google-api-core&subdirectory=packages/google-api-core
+google-api-core>=2
 google-auth>=2
 grpcio>=1
 proto-plus>=1

packages/gapic-generator/gapic/templates/testing/constraints-3.15.txt.j2

@@ -6,7 +6,7 @@
 # Require the latest major version be installed for each dependency.
 # e.g., if setup.py has "google-cloud-foo >= 1.14.0, < 2.0.0",
 # Then this file should have google-cloud-foo>=1
-google-api-core @ git+https://github.com/googleapis/google-cloud-python.git#egg=google-api-core&subdirectory=packages/google-api-core
+google-api-core>=2
 google-auth>=2
 grpcio>=1
 proto-plus>=1

packages/gapic-generator/requirements.in

@@ -1,5 +1,5 @@
 click
-google-api-core @ git+https://github.com/googleapis/google-cloud-python.git#egg=google-api-core&subdirectory=packages/google-api-core
+google-api-core
 googleapis-common-protos
 jinja2
 MarkupSafe

packages/gapic-generator/requirements.txt

@@ -560,7 +560,9 @@ frozenlist==1.8.0 \
     # via
     #   aiohttp
     #   aiosignal
-google-api-core @ git+https://github.com/googleapis/google-cloud-python.git#egg=google-api-core&subdirectory=packages/google-api-core
+google-api-core==2.30.3 \
+    --hash=sha256:a85761ba72c444dad5d611c2220633480b2b6be2521eca69cca2dbb3ffd6bfe8 \
+    --hash=sha256:e601a37f148585319b26db36e219df68c5d07b6382cff2d580e83404e44d641b
     # via -r requirements.in
 google-auth==2.52.0 \
     --hash=sha256:01f30e1a9e3638698d89464f5e603ce29d18e1c0e63ec31ac570aba4e164aaf5 \

packages/gapic-generator/setup.py

@@ -28,7 +28,7 @@
     # Ensure that the lower bounds of these dependencies match what we have in the
     # templated setup.py.j2: https://github.com/googleapis/gapic-generator-python/blob/main/gapic/templates/setup.py.j2
     "click >= 6.7",
-    "google-api-core @ git+https://github.com/googleapis/google-cloud-python.git#egg=google-api-core&subdirectory=packages/google-api-core",
+    "google-api-core[grpc] >= 2.25.0, < 3.0.0",
     "googleapis-common-protos >= 1.55.0, < 2.0.0",
     "grpcio >= 1.24.3, < 2.0.0",
     # 2.11.0 is required which adds the `default` argument to `jinja-filters.map()`