Skip to content

Commit d183b20

Browse files
committed
Use p310_ml_test
1 parent 1c5227a commit d183b20

3 files changed

Lines changed: 7 additions & 6 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": 4
3+
"revision": 5
44
}

.github/workflows/beam_PostCommit_Yaml_Xlang_Direct.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ jobs:
8080
- name: run PostCommit Yaml Xlang Direct script
8181
uses: ./.github/actions/gradle-command-self-hosted-action
8282
with:
83-
gradle-command: :sdks:python:postCommitYamlIntegrationTests -PyamlTestSet=${{ matrix.test_set }} -PbeamPythonExtra=ml_test,yaml
83+
gradle-command: :sdks:python:postCommitYamlIntegrationTests -PyamlTestSet=${{ matrix.test_set }} -PbeamPythonExtra=p310_ml_test,yaml
8484
- name: Archive Python Test Results
8585
uses: actions/upload-artifact@v7
8686
if: failure()

sdks/python/setup.py

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -601,10 +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>=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).
604+
# ml_test + gcp is unresolvable on Python 3.10: tft pulls in
605+
# tensorflow-metadata 1.14.x (protobuf<4.21) while
606+
# google-cloud-dataflow-client needs protobuf>=4.25.8. Yaml
607+
# Xlang CI uses p310_ml_test instead (no tft). tf2onnx 1.17+
608+
# avoids an additional protobuf<4 cap from tf2onnx 1.16.x.
608609
'tf2onnx>=1.17.0,<1.18',
609610
] + ml_base_core,
610611
'p310_ml_test': [

0 commit comments

Comments
 (0)