This is an automated email from the ASF dual-hosted git repository. shunping pushed a commit to branch resollution-too-deep-2 in repository https://gitbox.apache.org/repos/asf/beam.git
commit ebb1a92a323130e7e9168cf702b13812863b76ba Author: Shunping Huang <[email protected]> AuthorDate: Mon Jun 29 23:10:16 2026 -0400 Revert "Fix pip ResolutionTooDeep (#39017)" This reverts commit c1898ff68b8fb9845a249bae1852aed0a62b24bd. --- .../beam_CloudML_Benchmarks_Dataflow.json | 2 +- .../testing/benchmarks/cloudml/constraints.txt | 42 ---------------------- .../testing/benchmarks/cloudml/requirements.txt | 17 ++++----- sdks/python/test-suites/dataflow/common.gradle | 10 ++++-- 4 files changed, 15 insertions(+), 56 deletions(-) diff --git a/.github/trigger_files/beam_CloudML_Benchmarks_Dataflow.json b/.github/trigger_files/beam_CloudML_Benchmarks_Dataflow.json index 5d04b2c0a8c..37dd25bf902 100644 --- a/.github/trigger_files/beam_CloudML_Benchmarks_Dataflow.json +++ b/.github/trigger_files/beam_CloudML_Benchmarks_Dataflow.json @@ -1,4 +1,4 @@ { "comment": "Modify this file in a trivial way to cause this test suite to run.", - "modification": 5 + "modification": 3 } diff --git a/sdks/python/apache_beam/testing/benchmarks/cloudml/constraints.txt b/sdks/python/apache_beam/testing/benchmarks/cloudml/constraints.txt deleted file mode 100644 index b2f76d20085..00000000000 --- a/sdks/python/apache_beam/testing/benchmarks/cloudml/constraints.txt +++ /dev/null @@ -1,42 +0,0 @@ -# -# Licensed to the Apache Software Foundation (ASF) under one or more -# contributor license agreements. See the NOTICE file distributed with -# this work for additional information regarding copyright ownership. -# The ASF licenses this file to You under the Apache License, Version 2.0 -# (the "License"); you may not use this file except in compliance with -# the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# - -# Constraints file to pin versions and avoid pip ResolutionTooDeep. -# This file is used with: pip install -c constraints.txt -r requirements.txt - -# Core dependencies -tfx_bsl==1.15.1 -tensorflow-transform==1.15.0 - -# TensorFlow ecosystem -tensorflow==2.15.1 -tensorflow-metadata==1.15.0 -tf-keras==2.15.1 - -# NumPy and data handling -numpy==1.26.4 -pyarrow==10.0.1 - -# Google Cloud (pin to avoid transitive resolution) -google-cloud-aiplatform==1.60.0 -google-api-core==2.19.1 - -# Note: google-auth is NOT constrained - let pip resolve it to satisfy -# apache-beam's google-genai requirement (>=2.48.1) - -# Note: tensorflow-serving-api is NOT constrained - let pip resolve it within -# the range specified in requirements.txt (>=2.15,<2.16) diff --git a/sdks/python/apache_beam/testing/benchmarks/cloudml/requirements.txt b/sdks/python/apache_beam/testing/benchmarks/cloudml/requirements.txt index 5f754e27148..ab94ec5e9ac 100644 --- a/sdks/python/apache_beam/testing/benchmarks/cloudml/requirements.txt +++ b/sdks/python/apache_beam/testing/benchmarks/cloudml/requirements.txt @@ -15,15 +15,12 @@ # limitations under the License. # -# Core TFT dependencies with version bounds. -# Note: To avoid pip ResolutionTooDeep errors, always install using the constraints file: -# pip install -c constraints.txt -r requirements.txt -dill>=0.3,<0.5 -tfx_bsl>=1.15,<1.17 -tensorflow-transform>=1.15,<1.17 -tensorflow>=2.15,<2.16 +dill==0.4.1 +tfx_bsl==1.16.1 +tensorflow-transform==1.16.0 +tensorflow>=2.16,<2.17 numpy>=1.22.0,<2.0 -tensorflow-metadata>=1.15,<1.16 +tensorflow-metadata>=1.16.1,<1.17.0 pyarrow>=10,<11 -tensorflow-serving-api>=2.15,<2.16 -tf-keras>=2.15,<2.16 +tensorflow-serving-api>=2.16.1,<2.20 +tf-keras>=2.16.0,<2.17 diff --git a/sdks/python/test-suites/dataflow/common.gradle b/sdks/python/test-suites/dataflow/common.gradle index 480e2a62a2e..7c84700e29f 100644 --- a/sdks/python/test-suites/dataflow/common.gradle +++ b/sdks/python/test-suites/dataflow/common.gradle @@ -573,9 +573,13 @@ task installTFTRequirements { exec { workingDir "$rootProject.projectDir/sdks/python/apache_beam/testing/benchmarks/cloudml/" executable 'sh' - // Use constraints file to pin versions while allowing pip to - // resolve compatible versions within the specified ranges in requirements.txt - args '-c', ". ${envdir}/bin/activate && pip install -c constraints.txt -r requirements.txt" + // installGcpTest already installed apache-beam[gcp]. tensorflow-transform also + // lists that dependency, so a plain pip install -r can re-resolve the GCP extra + // and hit ResolutionTooDeep. Install TFT with --no-deps instead. + args '-c', ". ${envdir}/bin/activate && " + + "grep -v '^tensorflow-transform' requirements.txt > /tmp/cloudml_tft_base_requirements.txt && " + + "pip install -r /tmp/cloudml_tft_base_requirements.txt && " + + "pip install --no-deps tensorflow-transform==1.16.0" } } }
