Skip to content

Commit 41d5df0

Browse files
committed
Sync with main (squashed)
1 parent 6b84dfc commit 41d5df0

119 files changed

Lines changed: 43584 additions & 5848 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.librarian/state.yaml

Lines changed: 285 additions & 285 deletions
Large diffs are not rendered by default.

ci/run_single_test.sh

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -71,8 +71,13 @@ case ${TEST_TYPE} in
7171
unit)
7272
case ${PY_VERSION} in
7373
"3.9")
74-
nox -s unit-3.9
75-
retval=$?
74+
if nox --list-sessions | grep -q "unit-3.9"; then
75+
nox -s unit-3.9
76+
retval=$?
77+
else
78+
echo "Skipping unit-3.9 as it is not supported by this package."
79+
retval=0
80+
fi
7681
;;
7782
"3.10")
7883
nox -s unit-3.10

packages/bigframes/tests/system/small/bigquery/test_ai.py

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -329,7 +329,7 @@ def test_ai_if(session):
329329
max_error_ratio=0.5,
330330
)
331331

332-
assert _contains_no_nulls(result)
332+
assert len(result) == len(s1)
333333
assert result.dtype == dtypes.BOOL_DTYPE
334334

335335

@@ -342,7 +342,7 @@ def test_ai_if_multi_model(session, bq_connection):
342342

343343
result = bbq.ai.if_((df["image"], " contains an animal"))
344344

345-
assert _contains_no_nulls(result)
345+
assert len(result) == len(df)
346346
assert result.dtype == dtypes.BOOL_DTYPE
347347

348348

@@ -351,7 +351,7 @@ def test_ai_classify(session):
351351

352352
result = bbq.ai.classify(s, ["animal", "plant"])
353353

354-
assert _contains_no_nulls(result)
354+
assert len(result) == len(s)
355355
assert result.dtype == dtypes.STRING_DTYPE
356356

357357

@@ -364,7 +364,7 @@ def test_ai_classify_multi_model(session, bq_connection):
364364

365365
result = bbq.ai.classify(df["image"], ["photo", "cartoon"])
366366

367-
assert _contains_no_nulls(result)
367+
assert len(result) == len(df)
368368
assert result.dtype == dtypes.STRING_DTYPE
369369

370370

@@ -374,7 +374,7 @@ def test_ai_score(session):
374374

375375
result = bbq.ai.score(prompt)
376376

377-
assert _contains_no_nulls(result)
377+
assert len(result) == len(s)
378378
assert result.dtype == dtypes.FLOAT_DTYPE
379379

380380

@@ -386,7 +386,7 @@ def test_ai_score_multi_model(session):
386386

387387
result = bbq.ai.score(prompt)
388388

389-
assert _contains_no_nulls(result)
389+
assert len(result) == len(df)
390390
assert result.dtype == dtypes.FLOAT_DTYPE
391391

392392

packages/django-google-spanner/noxfile.py

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@
2828
DEFAULT_PYTHON_VERSION = "3.14"
2929

3030
UNIT_TEST_PYTHON_VERSIONS = [
31-
"3.9",
3231
"3.10",
3332
"3.11",
3433
"3.12",
@@ -123,8 +122,7 @@ def default(session, django_version="5.2"):
123122
@nox.session(python=ALL_PYTHON)
124123
def unit(session):
125124
"""Run the unit test suite."""
126-
if session.python == "3.9":
127-
session.skip("Python 3.9 is not supported for Django 5.2 tests")
125+
# TODO: Remove this check once support for Python 3.14 is added to Protobuf
128126
if session.python == "3.14":
129127
session.skip("Protobuf upb implementation is not supported in Python 3.14 yet")
130128
print("Unit tests with django 5.2")

packages/gapic-generator/repositories.bzl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ def gapic_generator_python():
7373
strip_prefix = "rules_gapic-%s" % _rules_gapic_version,
7474
urls = ["https://github.com/googleapis/rules_gapic/archive/v%s.tar.gz" % _rules_gapic_version],
7575
)
76-
_commit_sha = "fae3e6e091418d6343902debaf545cfc8f32c3ff"
76+
_commit_sha = "2638026851b9110c280d75338581a752a4271340"
7777
_maybe(
7878
http_archive,
7979
name = "com_google_googleapis",

packages/gapic-generator/tests/integration/goldens/asset/google/cloud/asset/__init__.py

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
from google.cloud.asset_v1.services.asset_service.client import AssetServiceClient
2222
from google.cloud.asset_v1.services.asset_service.async_client import AssetServiceAsyncClient
2323

24+
from google.cloud.asset_v1.types.asset_enrichment_resourceowners import ResourceOwners
2425
from google.cloud.asset_v1.types.asset_service import AnalyzeIamPolicyLongrunningMetadata
2526
from google.cloud.asset_v1.types.asset_service import AnalyzeIamPolicyLongrunningRequest
2627
from google.cloud.asset_v1.types.asset_service import AnalyzeIamPolicyLongrunningResponse
@@ -83,8 +84,10 @@
8384
from google.cloud.asset_v1.types.asset_service import UpdateSavedQueryRequest
8485
from google.cloud.asset_v1.types.asset_service import ContentType
8586
from google.cloud.asset_v1.types.assets import Asset
87+
from google.cloud.asset_v1.types.assets import AssetEnrichment
8688
from google.cloud.asset_v1.types.assets import AttachedResource
8789
from google.cloud.asset_v1.types.assets import ConditionEvaluation
90+
from google.cloud.asset_v1.types.assets import EffectiveTagDetails
8891
from google.cloud.asset_v1.types.assets import IamPolicyAnalysisResult
8992
from google.cloud.asset_v1.types.assets import IamPolicyAnalysisState
9093
from google.cloud.asset_v1.types.assets import IamPolicySearchResult
@@ -95,12 +98,14 @@
9598
from google.cloud.asset_v1.types.assets import RelationshipAttributes
9699
from google.cloud.asset_v1.types.assets import Resource
97100
from google.cloud.asset_v1.types.assets import ResourceSearchResult
101+
from google.cloud.asset_v1.types.assets import Tag
98102
from google.cloud.asset_v1.types.assets import TemporalAsset
99103
from google.cloud.asset_v1.types.assets import TimeWindow
100104
from google.cloud.asset_v1.types.assets import VersionedResource
101105

102106
__all__ = ('AssetServiceClient',
103107
'AssetServiceAsyncClient',
108+
'ResourceOwners',
104109
'AnalyzeIamPolicyLongrunningMetadata',
105110
'AnalyzeIamPolicyLongrunningRequest',
106111
'AnalyzeIamPolicyLongrunningResponse',
@@ -163,8 +168,10 @@
163168
'UpdateSavedQueryRequest',
164169
'ContentType',
165170
'Asset',
171+
'AssetEnrichment',
166172
'AttachedResource',
167173
'ConditionEvaluation',
174+
'EffectiveTagDetails',
168175
'IamPolicyAnalysisResult',
169176
'IamPolicyAnalysisState',
170177
'IamPolicySearchResult',
@@ -175,6 +182,7 @@
175182
'RelationshipAttributes',
176183
'Resource',
177184
'ResourceSearchResult',
185+
'Tag',
178186
'TemporalAsset',
179187
'TimeWindow',
180188
'VersionedResource',

packages/gapic-generator/tests/integration/goldens/asset/google/cloud/asset_v1/__init__.py

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@
2626
from .services.asset_service import AssetServiceClient
2727
from .services.asset_service import AssetServiceAsyncClient
2828

29+
from .types.asset_enrichment_resourceowners import ResourceOwners
2930
from .types.asset_service import AnalyzeIamPolicyLongrunningMetadata
3031
from .types.asset_service import AnalyzeIamPolicyLongrunningRequest
3132
from .types.asset_service import AnalyzeIamPolicyLongrunningResponse
@@ -88,8 +89,10 @@
8889
from .types.asset_service import UpdateSavedQueryRequest
8990
from .types.asset_service import ContentType
9091
from .types.assets import Asset
92+
from .types.assets import AssetEnrichment
9193
from .types.assets import AttachedResource
9294
from .types.assets import ConditionEvaluation
95+
from .types.assets import EffectiveTagDetails
9396
from .types.assets import IamPolicyAnalysisResult
9497
from .types.assets import IamPolicyAnalysisState
9598
from .types.assets import IamPolicySearchResult
@@ -100,6 +103,7 @@
100103
from .types.assets import RelationshipAttributes
101104
from .types.assets import Resource
102105
from .types.assets import ResourceSearchResult
106+
from .types.assets import Tag
103107
from .types.assets import TemporalAsset
104108
from .types.assets import TimeWindow
105109
from .types.assets import VersionedResource
@@ -197,6 +201,7 @@ def _get_version(dependency_name):
197201
'AnalyzerOrgPolicy',
198202
'AnalyzerOrgPolicyConstraint',
199203
'Asset',
204+
'AssetEnrichment',
200205
'AssetServiceClient',
201206
'AttachedResource',
202207
'BatchGetAssetsHistoryRequest',
@@ -210,6 +215,7 @@ def _get_version(dependency_name):
210215
'CreateSavedQueryRequest',
211216
'DeleteFeedRequest',
212217
'DeleteSavedQueryRequest',
218+
'EffectiveTagDetails',
213219
'ExportAssetsRequest',
214220
'ExportAssetsResponse',
215221
'Feed',
@@ -246,6 +252,7 @@ def _get_version(dependency_name):
246252
'RelatedResources',
247253
'RelationshipAttributes',
248254
'Resource',
255+
'ResourceOwners',
249256
'ResourceSearchResult',
250257
'SavedQuery',
251258
'SearchAllIamPoliciesRequest',
@@ -254,6 +261,7 @@ def _get_version(dependency_name):
254261
'SearchAllResourcesResponse',
255262
'TableFieldSchema',
256263
'TableSchema',
264+
'Tag',
257265
'TemporalAsset',
258266
'TimeWindow',
259267
'UpdateFeedRequest',

0 commit comments

Comments
 (0)