This is an automated email from the ASF dual-hosted git repository.
yhu pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/beam.git
The following commit(s) were added to refs/heads/master by this push:
new af81a0c1635 Fix ml_base dependency (#37721)
af81a0c1635 is described below
commit af81a0c16358dcd5d992a11822ba52874b109393
Author: Yi Hu <[email protected]>
AuthorDate: Fri Feb 27 10:41:53 2026 -0500
Fix ml_base dependency (#37721)
* Fix ml_base dependency
* install twice
---
.../org/apache/beam/gradle/BeamModulePlugin.groovy | 10 +++++----
sdks/python/setup.py | 24 ++++++++++++++++------
2 files changed, 24 insertions(+), 10 deletions(-)
diff --git
a/buildSrc/src/main/groovy/org/apache/beam/gradle/BeamModulePlugin.groovy
b/buildSrc/src/main/groovy/org/apache/beam/gradle/BeamModulePlugin.groovy
index 8eec6de2b19..0b37117d447 100644
--- a/buildSrc/src/main/groovy/org/apache/beam/gradle/BeamModulePlugin.groovy
+++ b/buildSrc/src/main/groovy/org/apache/beam/gradle/BeamModulePlugin.groovy
@@ -3166,14 +3166,16 @@ class BeamModulePlugin implements Plugin<Project> {
def distTarBall = "${pythonRootDir}/build/apache-beam.tar.gz"
def packages = "gcp,test,aws,azure,dataframe"
def extra = project.findProperty('beamPythonExtra')
- if (extra) {
- packages += ",${extra}"
- }
-
project.exec {
executable 'sh'
args '-c', ". ${project.ext.envdir}/bin/activate && pip install
--pre --retries 10 ${distTarBall}[${packages}]"
}
+ if (extra) {
+ project.exec {
+ executable 'sh'
+ args '-c', ". ${project.ext.envdir}/bin/activate && pip install
--pre --retries 10 ${distTarBall}[${extra}]"
+ }
+ }
}
}
diff --git a/sdks/python/setup.py b/sdks/python/setup.py
index dbb1dd68f17..e45bb55ec3e 100644
--- a/sdks/python/setup.py
+++ b/sdks/python/setup.py
@@ -163,13 +163,15 @@ dataframe_dependency = [
milvus_dependency = ['pymilvus>=2.5.10,<3.0.0']
ml_base = [
- 'embeddings',
+ 'embeddings>=0.0.4', # 0.0.3 crashes setuptools
'onnxruntime',
'langchain',
'sentence-transformers>=2.2.2',
'skl2onnx',
- 'pyod',
+ 'pyod>=0.7.6', # 0.7.5 crashes setuptools
'tensorflow',
+ # tensorflow transient dep, lower versions not compatible with Python3.10+
+ 'absl-py>=0.12.0',
'tensorflow-hub',
'tf2onnx',
'torch',
@@ -547,10 +549,12 @@ if __name__ == '__main__':
# tests due to tag check introduced since pip 24.2
# https://github.com/apache/beam/issues/31285
# 'xgboost<2.0', # https://github.com/apache/beam/issues/31252
- ] + ml_base + milvus_dependency,
+ ] + ml_base,
'p312_ml_test': [
'datatable',
] + ml_base,
+ # maintainer: milvus tests only run with this extension. Make sure it
+ # is covered by docker-in-docker test when changing py version
'p313_ml_test': ml_base + milvus_dependency,
'aws': ['boto3>=1.9,<2'],
'azure': [
@@ -584,7 +588,11 @@ if __name__ == '__main__':
# For more info, see
#
https://docs.google.com/document/d/1c84Gc-cZRCfrU8f7kWGsNR2o8oSRjCM-dGHO9KvPWPw/edit?usp=sharing
'torch': ['torch>=1.9.0,<2.8.0'],
- 'tensorflow': ['tensorflow>=2.12rc1,<2.21'],
+ 'tensorflow': [
+ 'tensorflow>=2.12rc1,<2.21',
+ # tensorflow transitive dep
+ 'absl-py>=0.12.0'
+ ],
'transformers': [
'transformers>=4.28.0,<4.56.0',
'tensorflow>=2.12.0',
@@ -593,7 +601,9 @@ if __name__ == '__main__':
'ml_cpu': [
'tensorflow>=2.12.0',
'torch==2.8.0+cpu',
- 'transformers>=4.28.0,<4.56.0'
+ 'transformers>=4.28.0,<4.56.0',
+ # tensorflow transient dep
+ 'absl-py>=0.12.0'
],
'redis': ['redis>=5.0.0,<6'],
'tft': [
@@ -610,7 +620,9 @@ if __name__ == '__main__':
'tensorflow==2.11.0',
'tf2onnx==1.13.0',
'skl2onnx==1.13',
- 'transformers==4.25.1'
+ 'transformers==4.25.1',
+ # tensorflow transient dep
+ 'absl-py>=0.12.0'
],
'xgboost': ['xgboost>=1.6.0,<2.1.3', 'datatable==1.0.0'],
'tensorflow-hub': ['tensorflow-hub>=0.14.0,<0.16.0'],
