chore(gapic): revert changes to client-post-processing YAMLs

Author: chalmerlowe

.librarian/generator-input/client-post-processing/bigtable-integration.yaml

@@ -613,6 +613,8 @@ replacements:
           ["python", "upb", "cpp"],
       )
       def unit(session, protobuf_implementation):
+          if session.python in ("3.7"):
+              session.skip("Python 3.7 is no longer supported")
 
           # Install all test dependencies, then install this package in-place.
           py_version = tuple([int(v) for v in session.python.split(".")])

.librarian/generator-input/client-post-processing/spanner-integration.yaml

@@ -816,6 +816,8 @@ replacements:
       def unit(session, protobuf_implementation):
           # Install all test dependencies, then install this package in-place.
 
+          if session.python in ("3.7",):
+              session.skip("Python 3.7 is no longer supported")
           if protobuf_implementation == "cpp" and session.python in (
               "3.11",
               "3.12",
@@ -1249,12 +1251,6 @@ replacements:
           system_test_path = os.path.join("tests", "system.py")
           system_test_folder_path = os.path.join("tests", "system")
 
-          system_test_exists = os.path.exists(system_test_path)
-          system_test_folder_exists = os.path.exists(system_test_folder_path)
-          # Sanity check: only run tests if found.
-          if not system_test_exists and not system_test_folder_exists:
-              session.skip("System tests were not found")
-
           if os.environ.get("SPANNER_EMULATOR_HOST"):
               # Run tests against the emulator
               run_system = True
@@ -1275,77 +1271,24 @@ replacements:
               run_system = False
 
           if run_system:
-              # Run py.test against the system tests.
-              if system_test_exists:
-                  args = [
-                      "py.test",
-                      "--quiet",
-                      "-o",
-                      "asyncio_mode=auto",
-                      f"--junitxml=system_{session.python}_sponge_log.xml",
-                  ]
-                  if not session.posargs:
-                      args.append(system_test_path)
-                  args.extend(session.posargs)
-  
-                  session.run(
-                      *args,
-                      env={
-                          "PROTOCOL_BUFFERS_PYTHON_IMPLEMENTATION": protobuf_implementation,
-                          "SPANNER_DATABASE_DIALECT": database_dialect,
-                          "SKIP_BACKUP_TESTS": "true",
-                      },
-                  )
-              elif system_test_folder_exists:
-                  # Run sync tests
-                  sync_args = [
-                      "py.test",
-                      "--quiet",
-                      "-o",
-                      "asyncio_mode=auto",
-                      f"--junitxml=system_{session.python}_sync_sponge_log.xml",
-                  ]
-                  if not session.posargs:
-                      sync_args.append(system_test_folder_path)
-                      sync_args.append(
-                          f"--ignore={os.path.join(system_test_folder_path, '_async')}"
-                      )
-                  else:
-                      sync_args.extend(session.posargs)
-
-                  session.run(
-                      *sync_args,
-                      env={
-                          "PROTOCOL_BUFFERS_PYTHON_IMPLEMENTATION": protobuf_implementation,
-                          "SPANNER_DATABASE_DIALECT": database_dialect,
-                          "SKIP_BACKUP_TESTS": "true",
-                      },
-                  )
-
-                  # Run async tests
-                  async_args = [
-                      "py.test",
-                      "--quiet",
-                      "-o",
-                      "asyncio_mode=auto",
-                      f"--junitxml=system_{session.python}_async_sponge_log.xml",
-                  ]
-                  if not session.posargs:
-                      async_args.append(os.path.join(system_test_folder_path, "_async"))
-                  else:
-                      # If posargs are provided, only run if they match async tests
-                      # or just skip if they were already run in sync.
-                      # For simplicity, we only run async folder if no posargs.
-                      return
-
-                  session.run(
-                      *async_args,
-                      env={
-                          "PROTOCOL_BUFFERS_PYTHON_IMPLEMENTATION": protobuf_implementation,
-                          "SPANNER_DATABASE_DIALECT": database_dialect,
-                          "SKIP_BACKUP_TESTS": "true",
-                      },
-                  )
+              # Run the tests (deduplicated logic)
+              test_path = (
+                  system_test_path
+                  if os.path.exists(system_test_path)
+                  else system_test_folder_path
+              )
+              session.run(
+                  "py.test",
+                  "--verbose",
+                  f"--junitxml=system_{session.python}_sponge_log.xml",
+                  test_path,
+                  *session.posargs,
+                  env={
+                      "PROTOCOL_BUFFERS_PYTHON_IMPLEMENTATION": protobuf_implementation,
+                      "SPANNER_DATABASE_DIALECT": database_dialect,
+                      "SKIP_BACKUP_TESTS": "true",
+                  },
+              )
 
 
       @nox.session(python=ALL_PYTHON)

.librarian/generator-input/client-post-processing/storage-integration.yaml

@@ -43,9 +43,8 @@ replacements:
                   "Credentials must be set via environment variable GOOGLE_APPLICATION_CREDENTIALS"
               )
 
-          # Install dependencies for the unit test environment
-          unit_deps_all = UNIT_TEST_STANDARD_DEPENDENCIES + UNIT_TEST_EXTERNAL_DEPENDENCIES
-          session.install(*unit_deps_all)
+          # Install all test dependencies
+          session.install("mock", "pytest", "pytest-cov", "brotli")
 
           # Install dependencies needed for system tests
           session.install(
@@ -60,8 +59,7 @@ replacements:
 
           prerel_deps = [
               "google-api-core",
-              # Exclude google-auth 3.0.0.dev0 which was yanked
-              "google-auth!=3.0.0.dev0",
+              "google-auth",
               "google-cloud-core",
               "google-crc32c",
               "google-resumable-media",
@@ -90,7 +88,9 @@ replacements:
                       f"import {version_namespace}; print({version_namespace}.__version__)",
                   )
           # Remaining dependencies
-          other_deps = ["requests", "pyopenssl"]
+          other_deps = [
+              "requests",
+          ]
           session.install(*other_deps)
 
           session.run(
@@ -287,11 +287,11 @@ replacements:
       packages/google-cloud-storage/README.rst,
     ]
     before: |
-      Python Client for Cloud Storage
+      Python Client for Google Cloud Storage
       [\s\S]*?\(This is the reason for 2.i. above.\)
     after: |
-      Python Client for Cloud Storage
-      ===============================
+      Python Client for Google Cloud Storage
+      ======================================
 
       |stable| |pypi| |versions|
 
@@ -377,7 +377,7 @@ replacements:
       Our client libraries are compatible with all current `active`_ and `maintenance`_ versions of
       Python.
 
-      Python >= 3.8
+      Python >= 3.7
 
       .. _active: https://devguide.python.org/devcycle/#in-development-main-branch
       .. _maintenance: https://devguide.python.org/devcycle/#maintenance-branches