Merge branch 'main' into fix-bigtable-tests

Author: parthea

.github/workflows/import-profiler.yml

@@ -26,9 +26,6 @@ jobs:
       with:
         python-version: "3.15"
         allow-prereleases: true
-    - name: Upgrade pip, setuptools, and wheel
-      run: |
-        python -m pip install --upgrade setuptools pip wheel
     - name: Run import profiler
       env:
         BUILD_TYPE: presubmit

librarian.yaml

@@ -1685,7 +1685,6 @@ libraries:
     version: 2.39.0
     apis:
       - path: google/pubsub/v1
-    skip_generate: true
     python:
       library_type: GAPIC_COMBO
       opt_args_by_api:
@@ -1932,7 +1931,6 @@ libraries:
       - docs/spanner_v1/table.rst
       - docs/spanner_v1/transaction.rst
       - tests/unit/gapic/conftest.py
-    skip_generate: true
     python:
       library_type: GAPIC_COMBO
       opt_args_by_api:

packages/google-api-core/google/api_core/gapic_v1/__init__.py

@@ -12,18 +12,44 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from google.api_core.gapic_v1 import client_info
-from google.api_core.gapic_v1 import config
-from google.api_core.gapic_v1 import config_async
-from google.api_core.gapic_v1 import method
-from google.api_core.gapic_v1 import method_async
-from google.api_core.gapic_v1 import routing_header
+import importlib.util
+from typing import Set
 
-__all__ = [
-    "client_info",
-    "config",
-    "config_async",
-    "method",
-    "method_async",
-    "routing_header",
-]
+_has_grpc = importlib.util.find_spec("grpc") is not None
+
+# PEP 0810: Explicit Lazy Imports
+# Python 3.15+ natively intercepts and defers these imports.
+# Developers can disable this behavior and force eager imports.
+# For more information, see:
+# https://docs.python.org/3.15/library/sys.html#sys.set_lazy_imports_filter
+# Older Python versions safely ignore this variable.
+__lazy_modules__: Set[str] = {
+    "google.api_core.gapic_v1.client_info",
+    "google.api_core.gapic_v1.routing_header",
+}
+__all__ = ["client_info", "routing_header"]
+
+if _has_grpc:
+    __lazy_modules__.update(
+        {
+            "google.api_core.gapic_v1.config",
+            "google.api_core.gapic_v1.config_async",
+            "google.api_core.gapic_v1.method",
+            "google.api_core.gapic_v1.method_async",
+        }
+    )
+
+from google.api_core.gapic_v1 import (  # noqa: E402
+    client_info,
+    routing_header,
+)
+
+if _has_grpc:
+    from google.api_core.gapic_v1 import (  # noqa: F401
+        config,
+        config_async,
+        method,
+        method_async,
+    )
+
+    __all__.extend(["config", "config_async", "method", "method_async"])

packages/google-api-core/tests/asyncio/retry/test_retry_streaming_async.py

@@ -293,7 +293,7 @@ async def test___call___generator_send_retry(self, sleep):
         generator = await retry_(self._generator_mock)(error_on=3)
         with pytest.raises(TypeError) as exc_info:
             await generator.asend("cannot send to fresh generator")
-            assert exc_info.match("can't send non-None value")
+        assert exc_info.match("can't send non-None value")
         await generator.aclose()
 
         # error thrown on 3

packages/google-api-core/tests/unit/retry/test_retry_streaming.py

@@ -263,7 +263,7 @@ def test___call___with_generator_send_retry(self, sleep):
         with pytest.raises(TypeError) as exc_info:
             # calling first send with non-None input should raise a TypeError
             result.send("can not send to fresh generator")
-            assert exc_info.match("can't send non-None value")
+        assert exc_info.match("can't send non-None value")
         # initiate iteration with None
         result = retry_(self._generator_mock)(error_on=3)
         assert result.send(None) == 0

packages/google-cloud-pubsub/mypy.ini

@@ -36,16 +36,24 @@
     "3.12",
     "3.13",
     "3.14",
+    "3.15",
 ]
 
 DEFAULT_PYTHON_VERSION = "3.14"
 
-# TODO(https://github.com/googleapis/gapic-generator-python/issues/2450):
-# Switch this to Python 3.15 alpha1
-# https://peps.python.org/pep-0790/
-PREVIEW_PYTHON_VERSION = "3.14"
+PREVIEW_PYTHON_VERSION = "3.15"
 
 CURRENT_DIRECTORY = pathlib.Path(__file__).parent.absolute()
+# Path to the centralized mypy configuration file at the repository root.
+# Search upwards to support running nox from both monorepo packages and integration test goldens.
+MYPY_CONFIG_FILE = next(
+    (
+        str(p / "mypy.ini")
+        for p in CURRENT_DIRECTORY.parents
+        if (p / "mypy.ini").exists()
+    ),
+    str(CURRENT_DIRECTORY.parent.parent / "mypy.ini"),
+)
 
 if (CURRENT_DIRECTORY / "testing").exists():
     LOWER_BOUND_CONSTRAINTS_FILE = (
@@ -615,7 +623,7 @@ def prerelease_deps(session, protobuf_implementation):
     )
 
 
-@nox.session(python=DEFAULT_PYTHON_VERSION)
+@nox.session(python=PREVIEW_PYTHON_VERSION)
 @nox.parametrize(
     "protobuf_implementation",
     ["python", "upb"],

packages/google-cloud-pubsub/noxfile.py

@@ -0,0 +1,13 @@
+# We use the constraints file for the latest Python version
+# (currently this file) 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
+grpc-google-iam-v1>=0

packages/google-cloud-pubsub/testing/constraints-3.15.txt

@@ -3000,6 +3000,9 @@ def test_list_topics_pager(transport_name: str = "grpc"):
         assert pager._retry == retry
         assert pager._timeout == timeout
 
+        assert pager.next_page_token == "abc"
+        assert str(pager).startswith(f"{pager.__class__.__name__}<")
+
         results = list(pager)
         assert len(results) == 6
         assert all(isinstance(i, pubsub.Topic) for i in results)
@@ -3088,6 +3091,8 @@ async def test_list_topics_async_pager():
             request={},
         )
         assert async_pager.next_page_token == "abc"
+        assert str(async_pager).startswith(f"{async_pager.__class__.__name__}<")
+
         responses = []
         async for response in async_pager:  # pragma: no branch
             responses.append(response)
@@ -3545,6 +3550,9 @@ def test_list_topic_subscriptions_pager(transport_name: str = "grpc"):
         assert pager._retry == retry
         assert pager._timeout == timeout
 
+        assert pager.next_page_token == "abc"
+        assert str(pager).startswith(f"{pager.__class__.__name__}<")
+
         results = list(pager)
         assert len(results) == 6
         assert all(isinstance(i, str) for i in results)
@@ -3637,6 +3645,8 @@ async def test_list_topic_subscriptions_async_pager():
             request={},
         )
         assert async_pager.next_page_token == "abc"
+        assert str(async_pager).startswith(f"{async_pager.__class__.__name__}<")
+
         responses = []
         async for response in async_pager:  # pragma: no branch
             responses.append(response)
@@ -4093,6 +4103,9 @@ def test_list_topic_snapshots_pager(transport_name: str = "grpc"):
         assert pager._retry == retry
         assert pager._timeout == timeout
 
+        assert pager.next_page_token == "abc"
+        assert str(pager).startswith(f"{pager.__class__.__name__}<")
+
         results = list(pager)
         assert len(results) == 6
         assert all(isinstance(i, str) for i in results)
@@ -4185,6 +4198,8 @@ async def test_list_topic_snapshots_async_pager():
             request={},
         )
         assert async_pager.next_page_token == "abc"
+        assert str(async_pager).startswith(f"{async_pager.__class__.__name__}<")
+
         responses = []
         async for response in async_pager:  # pragma: no branch
             responses.append(response)
@@ -5758,6 +5773,9 @@ def test_list_topics_rest_pager(transport: str = "rest"):
 
         pager = client.list_topics(request=sample_request)
 
+        assert pager.next_page_token == "abc"
+        assert str(pager).startswith(f"{pager.__class__.__name__}<")
+
         results = list(pager)
         assert len(results) == 6
         assert all(isinstance(i, pubsub.Topic) for i in results)
@@ -6018,6 +6036,9 @@ def test_list_topic_subscriptions_rest_pager(transport: str = "rest"):
 
         pager = client.list_topic_subscriptions(request=sample_request)
 
+        assert pager.next_page_token == "abc"
+        assert str(pager).startswith(f"{pager.__class__.__name__}<")
+
         results = list(pager)
         assert len(results) == 6
         assert all(isinstance(i, str) for i in results)
@@ -6275,6 +6296,9 @@ def test_list_topic_snapshots_rest_pager(transport: str = "rest"):
 
         pager = client.list_topic_snapshots(request=sample_request)
 
+        assert pager.next_page_token == "abc"
+        assert str(pager).startswith(f"{pager.__class__.__name__}<")
+
         results = list(pager)
         assert len(results) == 6
         assert all(isinstance(i, str) for i in results)

packages/google-cloud-pubsub/tests/unit/gapic/pubsub_v1/test_publisher.py

@@ -2390,6 +2390,9 @@ def test_list_schemas_pager(transport_name: str = "grpc"):
         assert pager._retry == retry
         assert pager._timeout == timeout
 
+        assert pager.next_page_token == "abc"
+        assert str(pager).startswith(f"{pager.__class__.__name__}<")
+
         results = list(pager)
         assert len(results) == 6
         assert all(isinstance(i, schema.Schema) for i in results)
@@ -2478,6 +2481,8 @@ async def test_list_schemas_async_pager():
             request={},
         )
         assert async_pager.next_page_token == "abc"
+        assert str(async_pager).startswith(f"{async_pager.__class__.__name__}<")
+
         responses = []
         async for response in async_pager:  # pragma: no branch
             responses.append(response)
@@ -2929,6 +2934,9 @@ def test_list_schema_revisions_pager(transport_name: str = "grpc"):
         assert pager._retry == retry
         assert pager._timeout == timeout
 
+        assert pager.next_page_token == "abc"
+        assert str(pager).startswith(f"{pager.__class__.__name__}<")
+
         results = list(pager)
         assert len(results) == 6
         assert all(isinstance(i, schema.Schema) for i in results)
@@ -3021,6 +3029,8 @@ async def test_list_schema_revisions_async_pager():
             request={},
         )
         assert async_pager.next_page_token == "abc"
+        assert str(async_pager).startswith(f"{async_pager.__class__.__name__}<")
+
         responses = []
         async for response in async_pager:  # pragma: no branch
             responses.append(response)
@@ -5615,6 +5625,9 @@ def test_list_schemas_rest_pager(transport: str = "rest"):
 
         pager = client.list_schemas(request=sample_request)
 
+        assert pager.next_page_token == "abc"
+        assert str(pager).startswith(f"{pager.__class__.__name__}<")
+
         results = list(pager)
         assert len(results) == 6
         assert all(isinstance(i, schema.Schema) for i in results)
@@ -5877,6 +5890,9 @@ def test_list_schema_revisions_rest_pager(transport: str = "rest"):
 
         pager = client.list_schema_revisions(request=sample_request)
 
+        assert pager.next_page_token == "abc"
+        assert str(pager).startswith(f"{pager.__class__.__name__}<")
+
         results = list(pager)
         assert len(results) == 6
         assert all(isinstance(i, schema.Schema) for i in results)