wip

Author: parthea

packages/gapic-generator/WORKSPACE

@@ -123,10 +123,3 @@ switched_rules_by_language(
     gapic = True,
     grpc = True,
 )
-
-load("@rules_python//python:repositories.bzl", "python_register_toolchains")
-python_register_toolchains(
-    name = "python311",
-    python_version = "3.11",
-)
-

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

@@ -0,0 +1,26 @@
+{% from '_pypi_packages.j2' import pypi_packages %}
+# We use the requirements file for the latest Python version
+# to check that the latest major versions of dependencies are supported 
+# in setup.py.
+# List all library dependencies and extras in this file.
+# 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>=2
+google-auth>=2
+grpcio>=1
+proto-plus>=1
+protobuf>=7
+# pytest-asyncio is needed for tests otherwise async tests are skipped
+pytest-asyncio>=1
+# pytest/pytest-cov are needed for tests
+pytest>=9
+pytest-cov>=7
+{% for package_tuple, package_info in pypi_packages.items() %}
+{# Quick check to make sure `package_info.package_name` is not the package being generated so we don't circularly include this package in its own requirements file. #}
+{% if api.naming.warehouse_package_name != package_info.package_name %}
+{% if api.requires_package(package_tuple) %}
+{{ package_info.package_name }}>={{ (package_info.upper_bound.split(".")[0] | int) - 1 }}
+{% endif %}
+{% endif %}
+{% endfor %}

packages/gapic-generator/gapic/templates/testing/_update_hashes.py

@@ -228,8 +228,14 @@ def update_runtime(
 
     if dyn_type == "lower_bound":
         all_pins.update({pkg: f"=={info['lower_bound']}" for pkg, info in dynamic_packages.items()})
-    else:
+    elif dyn_type == "latest":
         all_pins.update({pkg: f"=={int(info['upper_bound'].split('.')[0]) - 1}.*" for pkg, info in dynamic_packages.items()})
+    else:
+        # For "default", we still want to include the dynamic packages to get their hashes,
+        # but we don't force a specific version if not already in base_pins.
+        for pkg in dynamic_packages:
+            if pkg not in all_pins:
+                all_pins[pkg] = ""
 
     compiled: str = run_pip_compile(all_pins, python_version)
     base_blocks, dynamic_data = parse_compiled_requirements(compiled, set(dynamic_packages.keys()))
@@ -260,7 +266,6 @@ def parse_requirements_template(template_path: Path) -> Dict[str, str]:
 
     # Handle simple inclusions. This allows templates like requirements-3.11.in.j2 
     # to pull in base requirements from _default_requirements.j2.
-    # Note: This is a shallow inclusion (non-recursive) suited for the current structure.
     includes = re.findall(r'{% include "testing/([^"]+)" %}', content)
     for include in includes:
         pins.update(parse_requirements_template(TESTING_DIR / include))
@@ -293,22 +298,24 @@ def main() -> None:
     # Dynamic packages are those whose versions are managed centrally in _pypi_packages.j2
     dynamic_packages: Dict[str, Dict[str, str]] = parse_dynamic_packages()
 
-    # Extract base pins from the templates. 
-    # Python 3.10 is typically our 'lower_bound' source.
-    # Python 3.13 is our 'latest' source for newer runtimes.
-    base_pins_lower: Dict[str, str] = parse_requirements_template(TESTING_DIR / "requirements-3.10.in.j2")
-    base_pins_latest: Dict[str, str] = parse_requirements_template(TESTING_DIR / "requirements-3.13.in.j2")
-
-    # Define the runtime matrix: (output_template, display_label, base_pins, bounds_type, target_python)
-    runtimes: List[Tuple[str, str, Dict[str, str], str, str]] = [
-        ("requirements-3.10.txt.j2", "Python 3.10", base_pins_lower, "lower_bound", "3.10"),
-        ("requirements-3.11.txt.j2", "Python 3.11", base_pins_latest, "latest", "3.11"),
-        ("requirements-3.12.txt.j2", "Python 3.12", base_pins_latest, "latest", "3.12"),
-        ("requirements-3.13.txt.j2", "Python 3.13", base_pins_latest, "latest", "3.13"),
-        ("requirements-3.14.txt.j2", "Python 3.14", base_pins_latest, "latest", "3.14"),
-        ("requirements-3.15.txt.j2", "Python 3.15", base_pins_latest, "latest", "3.15"),
+    # Define the runtime matrix: (output_template, display_label, in_template, bounds_type, target_python)
+    # 3.10: minimum version
+    # 3.11/3.12: default version
+    # 3.13/3.14/3.15: latest major version
+    runtime_configs = [
+        ("requirements-3.10.txt.j2", "Python 3.10", "requirements-3.10.in.j2", "lower_bound", "3.10"),
+        ("requirements-3.11.txt.j2", "Python 3.11", "requirements-3.11.in.j2", "default", "3.11"),
+        ("requirements-3.12.txt.j2", "Python 3.12", "requirements-3.12.in.j2", "default", "3.12"),
+        ("requirements-3.13.txt.j2", "Python 3.13", "requirements-3.13.in.j2", "latest", "3.13"),
+        ("requirements-3.14.txt.j2", "Python 3.14", "requirements-3.14.in.j2", "latest", "3.14"),
+        ("requirements-3.15.txt.j2", "Python 3.15", "requirements-3.15.in.j2", "latest", "3.15"),
     ]
 
+    runtimes = []
+    for out_f, label, in_f, b_type, py_ver in runtime_configs:
+        pins = parse_requirements_template(TESTING_DIR / in_f)
+        runtimes.append((out_f, label, pins, b_type, py_ver))
+
     # Run compilation in parallel to speed up the process.
     with concurrent.futures.ThreadPoolExecutor(max_workers=len(runtimes)) as executor:
         futures = [

packages/gapic-generator/gapic/templates/testing/requirements-3.10.in.j2

@@ -21,7 +21,7 @@ protobuf==6.33.5
 pytest-asyncio==1.3.0
 # pytest/pytest-cov are needed for tests
 pytest==9.0.3
-pytest-cov
+pytest-cov==7.1.0
 {% for package_tuple, package_info in pypi_packages.items() %}
 {# Quick check to make sure `package_info.package_name` is not the package being generated so we don't circularly include this package in its own requirements file. #}
 {% if api.naming.warehouse_package_name != package_info.package_name %}