Skip to content

Commit 483318f

Browse files
committed
omit ADK from ml_test for TFT protobuf cap
1 parent 876f599 commit 483318f

1 file changed

Lines changed: 14 additions & 6 deletions

File tree

sdks/python/setup.py

Lines changed: 14 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -162,12 +162,11 @@ def cythonize(*args, **kwargs):
162162

163163
milvus_dependency = ['pymilvus>=2.5.10,<3.0.0']
164164

165-
ml_base = [
165+
# google-adk / OpenTelemetry require protobuf>=5; tensorflow-transform in
166+
# ml_test is pinned to versions that require protobuf<5 on Python 3.10. Those
167+
# cannot be installed together, so ADK deps stay out of ml_test (use ml_base).
168+
ml_base_core = [
166169
'embeddings>=0.0.4', # 0.0.3 crashes setuptools
167-
'google-adk==1.17.0',
168-
'opentelemetry-api==1.37.0',
169-
'opentelemetry-sdk==1.37.0',
170-
'opentelemetry-exporter-otlp-proto-http==1.37.0',
171170
'onnxruntime',
172171
'langchain',
173172
'sentence-transformers>=2.2.2',
@@ -182,6 +181,15 @@ def cythonize(*args, **kwargs):
182181
'transformers',
183182
]
184183

184+
ml_adk_dependency = [
185+
'google-adk==1.17.0',
186+
'opentelemetry-api==1.37.0',
187+
'opentelemetry-sdk==1.37.0',
188+
'opentelemetry-exporter-otlp-proto-http==1.37.0',
189+
]
190+
191+
ml_base = ml_base_core + ml_adk_dependency
192+
185193

186194
def find_by_ext(root_dir, ext):
187195
for root, _, files in os.walk(root_dir):
@@ -556,7 +564,7 @@ def get_portability_package_data():
556564
# tests due to tag check introduced since pip 24.2
557565
# https://github.com/apache/beam/issues/31285
558566
# 'xgboost<2.0', # https://github.com/apache/beam/issues/31252
559-
] + ml_base,
567+
] + ml_base_core,
560568
'p310_ml_test': [
561569
'datatable',
562570
] + ml_base,

0 commit comments

Comments
 (0)