revert changes for pubsub and spanner

Author: ohmayr

packages/google-cloud-pubsub/mypy.ini

@@ -0,0 +1,15 @@
+[mypy]
+python_version = 3.14
+namespace_packages = True
+ignore_missing_imports = False
+
+# TODO(https://github.com/googleapis/gapic-generator-python/issues/2563):
+# Dependencies that historically lacks py.typed markers
+[mypy-google.iam.*]
+ignore_missing_imports = True
+
+# Helps mypy navigate the 'google' namespace more reliably in 3.10+
+explicit_package_bases = True
+
+# Performance: reuse results from previous runs to speed up 'nox'
+incremental = True

packages/google-cloud-pubsub/noxfile.py

@@ -36,24 +36,16 @@
     "3.12",
     "3.13",
     "3.14",
-    "3.15",
 ]
 
 DEFAULT_PYTHON_VERSION = "3.14"
 
-PREVIEW_PYTHON_VERSION = "3.15"
+# 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"
 
 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 = (
@@ -623,7 +615,7 @@ def prerelease_deps(session, protobuf_implementation):
     )
 
 
-@nox.session(python=PREVIEW_PYTHON_VERSION)
+@nox.session(python=DEFAULT_PYTHON_VERSION)
 @nox.parametrize(
     "protobuf_implementation",
     ["python", "upb"],

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

@@ -3000,9 +3000,6 @@ 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)
@@ -3091,8 +3088,6 @@ 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)
@@ -3550,9 +3545,6 @@ 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)
@@ -3645,8 +3637,6 @@ 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)
@@ -4103,9 +4093,6 @@ 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)
@@ -4198,8 +4185,6 @@ 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)
@@ -5773,9 +5758,6 @@ 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)
@@ -6036,9 +6018,6 @@ 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)
@@ -6296,9 +6275,6 @@ 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,9 +2390,6 @@ 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)
@@ -2481,8 +2478,6 @@ 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)
@@ -2934,9 +2929,6 @@ 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)
@@ -3029,8 +3021,6 @@ 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)
@@ -5625,9 +5615,6 @@ 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)
@@ -5890,9 +5877,6 @@ 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)

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

@@ -2824,9 +2824,6 @@ def test_list_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, pubsub.Subscription) for i in results)
@@ -2919,8 +2916,6 @@ async def test_list_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)
@@ -5495,9 +5490,6 @@ def test_list_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, pubsub.Snapshot) for i in results)
@@ -5586,8 +5578,6 @@ async def test_list_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)
@@ -7663,9 +7653,6 @@ def test_list_subscriptions_rest_pager(transport: str = "rest"):
 
         pager = client.list_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, pubsub.Subscription) for i in results)
@@ -9043,9 +9030,6 @@ def test_list_snapshots_rest_pager(transport: str = "rest"):
 
         pager = client.list_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, pubsub.Snapshot) for i in results)

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

@@ -0,0 +1,15 @@
+[mypy]
+python_version = 3.14
+namespace_packages = True
+ignore_missing_imports = False
+
+# TODO(https://github.com/googleapis/gapic-generator-python/issues/2563):
+# Dependencies that historically lacks py.typed markers
+[mypy-google.iam.*]
+ignore_missing_imports = True
+
+# Helps mypy navigate the 'google' namespace more reliably in 3.10+
+explicit_package_bases = True
+
+# Performance: reuse results from previous runs to speed up 'nox'
+incremental = True

packages/google-cloud-spanner/mypy.ini

@@ -18,9 +18,9 @@
 import uuid
 
 from google.api_core import datetime_helpers, exceptions
+from google.cloud.spanner_v1 import instance as instance_mod
 from test_utils import retry
 
-from google.cloud.spanner_v1 import instance as instance_mod
 from tests import _fixtures
 
 CREATE_INSTANCE_ENVVAR = "GOOGLE_CLOUD_TESTS_CREATE_SPANNER_INSTANCE"

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

@@ -17,7 +17,6 @@
 import time
 
 import pytest
-
 from google.cloud import spanner_v1
 from google.cloud.spanner_admin_database_v1 import DatabaseDialect
 from google.cloud.spanner_admin_database_v1.types.backup import (