Skip to content

Commit 1c5227a

Browse files
committed
Fix ml_test protobuf conflict for Yaml Xlang Direct
1 parent a3cb642 commit 1c5227a

2 files changed

Lines changed: 6 additions & 4 deletions

File tree

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
{
22
"comment": "Modify this file in a trivial way to cause this test suite to run",
3-
"revision": 3
3+
"revision": 4
44
}

sdks/python/setup.py

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -601,9 +601,11 @@ def get_portability_package_data():
601601
# tests due to tag check introduced since pip 24.2
602602
# https://github.com/apache/beam/issues/31285
603603
# 'xgboost<2.0', # https://github.com/apache/beam/issues/31252
604-
# tft needs protobuf<5; tf2onnx 1.17+ allows protobuf 5 on the
605-
# ADK-only path.
606-
'tf2onnx>=1.16.1,<1.17',
604+
# tft needs protobuf>=3.20.3,<5 and google-cloud-dataflow-client
605+
# (gcp extra) needs protobuf>=4.25.8, so protobuf must be in
606+
# [4.25.8, 5). tf2onnx 1.16.x caps protobuf<4 and is therefore
607+
# unresolvable here; 1.17+ drops that cap (protobuf>=3.20).
608+
'tf2onnx>=1.17.0,<1.18',
607609
] + ml_base_core,
608610
'p310_ml_test': [
609611
'datatable',

0 commit comments

Comments
 (0)