From ed028e3523bcbd93cdf8c555379bebde0bd358da Mon Sep 17 00:00:00 2001 From: Valentyn Tymofieiev Date: Tue, 12 Sep 2023 12:15:03 -0700 Subject: [PATCH 1/2] Remove Tensorflow from default Beam images. --- .../base_image_requirements_manual.txt | 1 - .../py310/base_image_requirements.txt | 38 ++++-------------- .../py311/base_image_requirements.txt | 36 ++++------------- .../py38/base_image_requirements.txt | 40 ++++--------------- .../py39/base_image_requirements.txt | 40 ++++--------------- 5 files changed, 31 insertions(+), 124 deletions(-) diff --git a/sdks/python/container/base_image_requirements_manual.txt b/sdks/python/container/base_image_requirements_manual.txt index a1d80320d42d..e952b2126604 100644 --- a/sdks/python/container/base_image_requirements_manual.txt +++ b/sdks/python/container/base_image_requirements_manual.txt @@ -43,4 +43,3 @@ nose==1.3.7 # For Dataflow internal testing. TODO: remove this. python-snappy;python_version<"3.11" # Optimizes execution of some Beam codepaths. scipy scikit-learn -tensorflow>=2.12.0 diff --git a/sdks/python/container/py310/base_image_requirements.txt b/sdks/python/container/py310/base_image_requirements.txt index 23139478394e..58aca4a4aea7 100644 --- a/sdks/python/container/py310/base_image_requirements.txt +++ b/sdks/python/container/py310/base_image_requirements.txt @@ -21,8 +21,6 @@ # https://s.apache.org/beam-python-dev-wiki # Reach out to a committer if you need help. -absl-py==1.4.0 -astunparse==1.6.3 attrs==23.1.0 beautifulsoup4==4.12.2 bs4==0.0.1 @@ -44,16 +42,13 @@ exceptiongroup==1.1.3 execnet==2.0.2 fastavro==1.8.3 fasteners==0.18 -flatbuffers==23.5.26 freezegun==1.2.2 future==0.18.3 -gast==0.4.0 google-api-core==2.11.1 -google-api-python-client==2.98.0 +google-api-python-client==2.99.0 google-apitools==0.5.31 -google-auth==2.22.0 -google-auth-httplib2==0.1.0 -google-auth-oauthlib==1.0.0 +google-auth==2.23.0 +google-auth-httplib2==0.1.1 google-cloud-aiplatform==1.32.0 google-cloud-bigquery==3.11.4 google-cloud-bigquery-storage==2.22.0 @@ -63,7 +58,7 @@ google-cloud-datastore==2.18.0 google-cloud-dlp==3.12.2 google-cloud-language==2.11.0 google-cloud-profiler==4.1.0 -google-cloud-pubsub==2.18.3 +google-cloud-pubsub==2.18.4 google-cloud-pubsublite==1.8.3 google-cloud-recommendations-ai==0.10.4 google-cloud-resource-manager==1.10.3 @@ -72,7 +67,6 @@ google-cloud-storage==2.10.0 google-cloud-videointelligence==2.11.3 google-cloud-vision==3.4.4 google-crc32c==1.5.0 -google-pasta==0.2.0 google-resumable-media==2.6.0 googleapis-common-protos==1.60.0 greenlet==2.0.2 @@ -80,26 +74,19 @@ grpc-google-iam-v1==0.12.6 grpcio==1.58.0 grpcio-status==1.58.0 guppy3==3.1.3 -h5py==3.9.0 hdfs==2.7.2 httplib2==0.22.0 -hypothesis==6.84.2 +hypothesis==6.84.3 idna==3.4 iniconfig==2.0.0 joblib==1.3.2 -keras==2.13.1 -libclang==16.0.6 -Markdown==3.4.4 -MarkupSafe==2.1.3 mmh3==4.0.1 mock==5.1.0 nltk==3.8.1 nose==1.3.7 -numpy==1.24.3 +numpy==1.24.4 oauth2client==4.1.3 -oauthlib==3.2.2 objsize==0.6.1 -opt-einsum==3.3.0 orjson==3.9.7 overrides==6.5.0 packaging==23.1 @@ -128,7 +115,6 @@ PyYAML==6.0.1 regex==2023.8.8 requests==2.31.0 requests-mock==1.11.0 -requests-oauthlib==1.3.1 rsa==4.9 scikit-learn==1.3.0 scipy==1.11.2 @@ -139,21 +125,13 @@ soupsieve==2.5 SQLAlchemy==1.4.49 sqlparse==0.4.4 tenacity==8.2.3 -tensorboard==2.13.0 -tensorboard-data-server==0.7.1 -tensorflow==2.13.0 -tensorflow-cpu-aws==2.13.0;platform_machine=="aarch64" -tensorflow-estimator==2.13.0 -tensorflow-io-gcs-filesystem==0.33.0 -termcolor==2.3.0 testcontainers==3.7.1 threadpoolctl==3.2.0 tomli==2.0.1 tqdm==4.66.1 -typing_extensions==4.5.0 +typing_extensions==4.7.1 uritemplate==4.1.1 urllib3==1.26.16 -websocket-client==1.6.2 -Werkzeug==2.3.7 +websocket-client==1.6.3 wrapt==1.15.0 zstandard==0.21.0 diff --git a/sdks/python/container/py311/base_image_requirements.txt b/sdks/python/container/py311/base_image_requirements.txt index b723d5a1c877..5aaeba15c69e 100644 --- a/sdks/python/container/py311/base_image_requirements.txt +++ b/sdks/python/container/py311/base_image_requirements.txt @@ -21,8 +21,6 @@ # https://s.apache.org/beam-python-dev-wiki # Reach out to a committer if you need help. -absl-py==1.4.0 -astunparse==1.6.3 attrs==23.1.0 beautifulsoup4==4.12.2 bs4==0.0.1 @@ -43,15 +41,12 @@ docopt==0.6.2 execnet==2.0.2 fastavro==1.8.3 fasteners==0.18 -flatbuffers==23.5.26 freezegun==1.2.2 future==0.18.3 -gast==0.4.0 google-api-core==2.11.1 google-apitools==0.5.31 -google-auth==2.22.0 -google-auth-httplib2==0.1.0 -google-auth-oauthlib==1.0.0 +google-auth==2.23.0 +google-auth-httplib2==0.1.1 google-cloud-aiplatform==1.32.0 google-cloud-bigquery==3.11.4 google-cloud-bigquery-storage==2.22.0 @@ -60,7 +55,7 @@ google-cloud-core==2.3.3 google-cloud-datastore==2.18.0 google-cloud-dlp==3.12.2 google-cloud-language==2.11.0 -google-cloud-pubsub==2.18.3 +google-cloud-pubsub==2.18.4 google-cloud-pubsublite==1.8.3 google-cloud-recommendations-ai==0.10.4 google-cloud-resource-manager==1.10.3 @@ -69,7 +64,6 @@ google-cloud-storage==2.10.0 google-cloud-videointelligence==2.11.3 google-cloud-vision==3.4.4 google-crc32c==1.5.0 -google-pasta==0.2.0 google-resumable-media==2.6.0 googleapis-common-protos==1.60.0 greenlet==2.0.2 @@ -77,26 +71,19 @@ grpc-google-iam-v1==0.12.6 grpcio==1.58.0 grpcio-status==1.58.0 guppy3==3.1.3 -h5py==3.9.0 hdfs==2.7.2 httplib2==0.22.0 -hypothesis==6.84.2 +hypothesis==6.84.3 idna==3.4 iniconfig==2.0.0 joblib==1.3.2 -keras==2.13.1 -libclang==16.0.6 -Markdown==3.4.4 -MarkupSafe==2.1.3 mmh3==4.0.1 mock==5.1.0 nltk==3.8.1 nose==1.3.7 -numpy==1.24.3 +numpy==1.24.4 oauth2client==4.1.3 -oauthlib==3.2.2 objsize==0.6.1 -opt-einsum==3.3.0 orjson==3.9.7 overrides==6.5.0 packaging==23.1 @@ -124,7 +111,6 @@ PyYAML==6.0.1 regex==2023.8.8 requests==2.31.0 requests-mock==1.11.0 -requests-oauthlib==1.3.1 rsa==4.9 scikit-learn==1.3.0 scipy==1.11.2 @@ -135,19 +121,11 @@ soupsieve==2.5 SQLAlchemy==1.4.49 sqlparse==0.4.4 tenacity==8.2.3 -tensorboard==2.13.0 -tensorboard-data-server==0.7.1 -tensorflow==2.13.0 -tensorflow-cpu-aws==2.13.0;platform_machine=="aarch64" -tensorflow-estimator==2.13.0 -tensorflow-io-gcs-filesystem==0.33.0 -termcolor==2.3.0 testcontainers==3.7.1 threadpoolctl==3.2.0 tqdm==4.66.1 -typing_extensions==4.5.0 +typing_extensions==4.7.1 urllib3==1.26.16 -websocket-client==1.6.2 -Werkzeug==2.3.7 +websocket-client==1.6.3 wrapt==1.15.0 zstandard==0.21.0 diff --git a/sdks/python/container/py38/base_image_requirements.txt b/sdks/python/container/py38/base_image_requirements.txt index ce915cf50b0c..472ee0c0bf8d 100644 --- a/sdks/python/container/py38/base_image_requirements.txt +++ b/sdks/python/container/py38/base_image_requirements.txt @@ -21,8 +21,6 @@ # https://s.apache.org/beam-python-dev-wiki # Reach out to a committer if you need help. -absl-py==1.4.0 -astunparse==1.6.3 attrs==23.1.0 beautifulsoup4==4.12.2 bs4==0.0.1 @@ -44,16 +42,13 @@ exceptiongroup==1.1.3 execnet==2.0.2 fastavro==1.8.3 fasteners==0.18 -flatbuffers==23.5.26 freezegun==1.2.2 future==0.18.3 -gast==0.4.0 google-api-core==2.11.1 -google-api-python-client==2.98.0 +google-api-python-client==2.99.0 google-apitools==0.5.31 -google-auth==2.22.0 -google-auth-httplib2==0.1.0 -google-auth-oauthlib==1.0.0 +google-auth==2.23.0 +google-auth-httplib2==0.1.1 google-cloud-aiplatform==1.32.0 google-cloud-bigquery==3.11.4 google-cloud-bigquery-storage==2.22.0 @@ -63,7 +58,7 @@ google-cloud-datastore==2.18.0 google-cloud-dlp==3.12.2 google-cloud-language==2.11.0 google-cloud-profiler==4.1.0 -google-cloud-pubsub==2.18.3 +google-cloud-pubsub==2.18.4 google-cloud-pubsublite==1.8.3 google-cloud-recommendations-ai==0.10.4 google-cloud-resource-manager==1.10.3 @@ -72,7 +67,6 @@ google-cloud-storage==2.10.0 google-cloud-videointelligence==2.11.3 google-cloud-vision==3.4.4 google-crc32c==1.5.0 -google-pasta==0.2.0 google-resumable-media==2.6.0 googleapis-common-protos==1.60.0 greenlet==2.0.2 @@ -80,27 +74,19 @@ grpc-google-iam-v1==0.12.6 grpcio==1.58.0 grpcio-status==1.58.0 guppy3==3.1.3 -h5py==3.9.0 hdfs==2.7.2 httplib2==0.22.0 -hypothesis==6.84.2 +hypothesis==6.84.3 idna==3.4 -importlib-metadata==6.8.0 iniconfig==2.0.0 joblib==1.3.2 -keras==2.13.1 -libclang==16.0.6 -Markdown==3.4.4 -MarkupSafe==2.1.3 mmh3==4.0.1 mock==5.1.0 nltk==3.8.1 nose==1.3.7 -numpy==1.24.3 +numpy==1.24.4 oauth2client==4.1.3 -oauthlib==3.2.2 objsize==0.6.1 -opt-einsum==3.3.0 orjson==3.9.7 overrides==6.5.0 packaging==23.1 @@ -129,7 +115,6 @@ PyYAML==6.0.1 regex==2023.8.8 requests==2.31.0 requests-mock==1.11.0 -requests-oauthlib==1.3.1 rsa==4.9 scikit-learn==1.3.0 scipy==1.10.1 @@ -140,22 +125,13 @@ soupsieve==2.5 SQLAlchemy==1.4.49 sqlparse==0.4.4 tenacity==8.2.3 -tensorboard==2.13.0 -tensorboard-data-server==0.7.1 -tensorflow==2.13.0 -tensorflow-cpu-aws==2.13.0;platform_machine=="aarch64" -tensorflow-estimator==2.13.0 -tensorflow-io-gcs-filesystem==0.33.0 -termcolor==2.3.0 testcontainers==3.7.1 threadpoolctl==3.2.0 tomli==2.0.1 tqdm==4.66.1 -typing_extensions==4.5.0 +typing_extensions==4.7.1 uritemplate==4.1.1 urllib3==1.26.16 -websocket-client==1.6.2 -Werkzeug==2.3.7 +websocket-client==1.6.3 wrapt==1.15.0 -zipp==3.16.2 zstandard==0.21.0 diff --git a/sdks/python/container/py39/base_image_requirements.txt b/sdks/python/container/py39/base_image_requirements.txt index aaf76e1aaa16..257bcf9869e2 100644 --- a/sdks/python/container/py39/base_image_requirements.txt +++ b/sdks/python/container/py39/base_image_requirements.txt @@ -21,8 +21,6 @@ # https://s.apache.org/beam-python-dev-wiki # Reach out to a committer if you need help. -absl-py==1.4.0 -astunparse==1.6.3 attrs==23.1.0 beautifulsoup4==4.12.2 bs4==0.0.1 @@ -44,16 +42,13 @@ exceptiongroup==1.1.3 execnet==2.0.2 fastavro==1.8.3 fasteners==0.18 -flatbuffers==23.5.26 freezegun==1.2.2 future==0.18.3 -gast==0.4.0 google-api-core==2.11.1 -google-api-python-client==2.98.0 +google-api-python-client==2.99.0 google-apitools==0.5.31 -google-auth==2.22.0 -google-auth-httplib2==0.1.0 -google-auth-oauthlib==1.0.0 +google-auth==2.23.0 +google-auth-httplib2==0.1.1 google-cloud-aiplatform==1.32.0 google-cloud-bigquery==3.11.4 google-cloud-bigquery-storage==2.22.0 @@ -63,7 +58,7 @@ google-cloud-datastore==2.18.0 google-cloud-dlp==3.12.2 google-cloud-language==2.11.0 google-cloud-profiler==4.1.0 -google-cloud-pubsub==2.18.3 +google-cloud-pubsub==2.18.4 google-cloud-pubsublite==1.8.3 google-cloud-recommendations-ai==0.10.4 google-cloud-resource-manager==1.10.3 @@ -72,7 +67,6 @@ google-cloud-storage==2.10.0 google-cloud-videointelligence==2.11.3 google-cloud-vision==3.4.4 google-crc32c==1.5.0 -google-pasta==0.2.0 google-resumable-media==2.6.0 googleapis-common-protos==1.60.0 greenlet==2.0.2 @@ -80,27 +74,19 @@ grpc-google-iam-v1==0.12.6 grpcio==1.58.0 grpcio-status==1.58.0 guppy3==3.1.3 -h5py==3.9.0 hdfs==2.7.2 httplib2==0.22.0 -hypothesis==6.84.2 +hypothesis==6.84.3 idna==3.4 -importlib-metadata==6.8.0 iniconfig==2.0.0 joblib==1.3.2 -keras==2.13.1 -libclang==16.0.6 -Markdown==3.4.4 -MarkupSafe==2.1.3 mmh3==4.0.1 mock==5.1.0 nltk==3.8.1 nose==1.3.7 -numpy==1.24.3 +numpy==1.24.4 oauth2client==4.1.3 -oauthlib==3.2.2 objsize==0.6.1 -opt-einsum==3.3.0 orjson==3.9.7 overrides==6.5.0 packaging==23.1 @@ -129,7 +115,6 @@ PyYAML==6.0.1 regex==2023.8.8 requests==2.31.0 requests-mock==1.11.0 -requests-oauthlib==1.3.1 rsa==4.9 scikit-learn==1.3.0 scipy==1.11.2 @@ -140,22 +125,13 @@ soupsieve==2.5 SQLAlchemy==1.4.49 sqlparse==0.4.4 tenacity==8.2.3 -tensorboard==2.13.0 -tensorboard-data-server==0.7.1 -tensorflow==2.13.0 -tensorflow-cpu-aws==2.13.0;platform_machine=="aarch64" -tensorflow-estimator==2.13.0 -tensorflow-io-gcs-filesystem==0.33.0 -termcolor==2.3.0 testcontainers==3.7.1 threadpoolctl==3.2.0 tomli==2.0.1 tqdm==4.66.1 -typing_extensions==4.5.0 +typing_extensions==4.7.1 uritemplate==4.1.1 urllib3==1.26.16 -websocket-client==1.6.2 -Werkzeug==2.3.7 +websocket-client==1.6.3 wrapt==1.15.0 -zipp==3.16.2 zstandard==0.21.0 From f679ff8acaa9d9175fbc60b4cc6dfc38f4371a2b Mon Sep 17 00:00:00 2001 From: Valentyn Tymofieiev Date: Tue, 12 Sep 2023 12:27:16 -0700 Subject: [PATCH 2/2] Update notes. --- CHANGES.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGES.md b/CHANGES.md index b9ad47186452..fb1a14fb1287 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -71,8 +71,8 @@ ## Breaking Changes -* X behavior was changed ([#X](https://github.com/apache/beam/issues/X)). * Removed fastjson library dependency for Beam SQL. Table property is changed to be based on jackson ObjectNode (Java) ([#24154](https://github.com/apache/beam/issues/24154)). +* Removed TensorFlow from Beam Python container images [PR](https://github.com/apache/beam/pull/28424). If you have been negatively affected by this change, please comment on [#20605](https://github.com/apache/beam/issues/20605). ## Deprecations