Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Apply mitigation #27330 for 2.53.0 #29703

Closed
wants to merge 3 commits into from
Closed

Apply mitigation #27330 for 2.53.0 #29703

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
678a4bc
Restrict protobuf to v3.
tvalentyn Dec 11, 2023
84c1f8f
Regenerate dependencies
tvalentyn Dec 11, 2023
e173b4d
Change proto implementation assertion and clarify the error.
tvalentyn Dec 11, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion sdks/python/container/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ RUN \
rm /root/nltk_data/corpora/stopwords.zip && \

# Check that the protobuf upb(also called micro protobuf) is used.
python -c "from google.protobuf.internal import api_implementation; assert api_implementation._implementation_type == 'upb'; print ('Verified fast protobuf used.')" && \
python -c "from google.protobuf.internal import api_implementation; t = api_implementation._implementation_type; assert t == 'cpp', f'Installation has unexpected protobuf implementation type: {t}.'; print ('Verified fast protobuf used.')" && \

# Install Google Cloud SDK.
mkdir -p /usr/local/gcloud && \
Expand Down
4 changes: 4 additions & 0 deletions sdks/python/container/base_image_requirements_manual.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,10 @@ guppy3
mmh3 # Optimizes execution of some Beam codepaths. TODO: Make it Beam's dependency.
nltk # Commonly used for natural language processing.
nose==1.3.7 # For Dataflow internal testing. TODO: remove this.
# Install lower version of protobuf by default while https://github.com/apache/beam/issues/27330 is worked on.
protobuf==3.20.3
# Newer versions of grpcio-status require protobuf 4
grpcio-status==1.48.2
# TODO: Uncomment python version once python-snappy supports it.
# https://github.com/apache/beam/issues/25985
python-snappy;python_version<"3.11" # Optimizes execution of some Beam codepaths.
Expand Down
44 changes: 22 additions & 22 deletions sdks/python/container/py310/base_image_requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,47 +37,48 @@ Cython==0.29.36
deprecation==2.1.0
dill==0.3.1.1
dnspython==2.4.2
docker==6.1.3
docker==7.0.0
docopt==0.6.2
docstring-parser==0.15
exceptiongroup==1.2.0
execnet==2.0.2
fastavro==1.9.1
fasteners==0.19
freezegun==1.3.1
future==0.18.3
google-api-core==2.14.0
google-api-python-client==2.109.0
google-api-core==2.15.0
google-api-python-client==2.110.0
google-apitools==0.5.31
google-auth==2.25.1
google-auth==2.25.2
google-auth-httplib2==0.1.1
google-cloud-aiplatform==1.37.0
google-cloud-bigquery==3.13.0
google-cloud-bigquery-storage==2.23.0
google-cloud-bigtable==2.21.0
google-cloud-core==2.3.3
google-cloud-core==2.4.1
google-cloud-datastore==2.18.0
google-cloud-dlp==3.13.0
google-cloud-language==2.11.1
google-cloud-dlp==3.14.0
google-cloud-language==2.12.0
google-cloud-profiler==4.1.0
google-cloud-pubsub==2.18.4
google-cloud-pubsublite==1.8.3
google-cloud-recommendations-ai==0.10.5
google-cloud-resource-manager==1.10.4
google-cloud-recommendations-ai==0.10.6
google-cloud-resource-manager==1.11.0
google-cloud-spanner==3.40.1
google-cloud-storage==2.13.0
google-cloud-videointelligence==2.11.4
google-cloud-vision==3.4.5
google-cloud-videointelligence==2.12.0
google-cloud-vision==3.5.0
google-crc32c==1.5.0
google-resumable-media==2.6.0
googleapis-common-protos==1.61.0
greenlet==3.0.1
grpc-google-iam-v1==0.12.7
grpcio==1.59.3
grpcio-status==1.59.3
googleapis-common-protos==1.62.0
greenlet==3.0.2
grpc-google-iam-v1==0.13.0
grpcio==1.60.0
grpcio-status==1.48.2
guppy3==3.1.4.post1
hdfs==2.7.3
httplib2==0.22.0
hypothesis==6.91.0
hypothesis==6.92.0
idna==3.6
iniconfig==2.0.0
joblib==1.3.2
Expand All @@ -97,8 +98,8 @@ packaging==23.2
pandas==1.5.3
parameterized==0.9.0
pluggy==1.3.0
proto-plus==1.22.3
protobuf==4.25.1
proto-plus==1.23.0
protobuf==3.20.3
psycopg2-binary==2.9.9
pyarrow==14.0.1
pyarrow-hotfix==0.6
Expand All @@ -119,7 +120,7 @@ python-dateutil==2.8.2
python-snappy==0.6.1
pytz==2023.3.post1
PyYAML==6.0.1
referencing==0.31.1
referencing==0.32.0
regex==2023.10.3
requests==2.31.0
requests-mock==1.11.0
Expand All @@ -138,10 +139,9 @@ testcontainers==3.7.1
threadpoolctl==3.2.0
tomli==2.0.1
tqdm==4.66.1
typing_extensions==4.8.0
typing_extensions==4.9.0
tzlocal==5.2
uritemplate==4.1.1
urllib3==2.1.0
websocket-client==1.7.0
wrapt==1.16.0
zstandard==0.22.0
44 changes: 22 additions & 22 deletions sdks/python/container/py311/base_image_requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,46 +37,47 @@ Cython==0.29.36
deprecation==2.1.0
dill==0.3.1.1
dnspython==2.4.2
docker==6.1.3
docker==7.0.0
docopt==0.6.2
docstring-parser==0.15
execnet==2.0.2
fastavro==1.9.1
fasteners==0.19
freezegun==1.3.1
future==0.18.3
google-api-core==2.14.0
google-api-python-client==2.109.0
google-api-core==2.15.0
google-api-python-client==2.110.0
google-apitools==0.5.31
google-auth==2.25.1
google-auth==2.25.2
google-auth-httplib2==0.1.1
google-cloud-aiplatform==1.37.0
google-cloud-bigquery==3.13.0
google-cloud-bigquery-storage==2.23.0
google-cloud-bigtable==2.21.0
google-cloud-core==2.3.3
google-cloud-core==2.4.1
google-cloud-datastore==2.18.0
google-cloud-dlp==3.13.0
google-cloud-language==2.11.1
google-cloud-dlp==3.14.0
google-cloud-language==2.12.0
google-cloud-profiler==4.1.0
google-cloud-pubsub==2.18.4
google-cloud-pubsublite==1.8.3
google-cloud-recommendations-ai==0.10.5
google-cloud-resource-manager==1.10.4
google-cloud-recommendations-ai==0.10.6
google-cloud-resource-manager==1.11.0
google-cloud-spanner==3.40.1
google-cloud-storage==2.13.0
google-cloud-videointelligence==2.11.4
google-cloud-vision==3.4.5
google-cloud-videointelligence==2.12.0
google-cloud-vision==3.5.0
google-crc32c==1.5.0
google-resumable-media==2.6.0
googleapis-common-protos==1.61.0
greenlet==3.0.1
grpc-google-iam-v1==0.12.7
grpcio==1.59.3
grpcio-status==1.59.3
googleapis-common-protos==1.62.0
greenlet==3.0.2
grpc-google-iam-v1==0.13.0
grpcio==1.60.0
grpcio-status==1.48.2
guppy3==3.1.4.post1
hdfs==2.7.3
httplib2==0.22.0
hypothesis==6.91.0
hypothesis==6.92.0
idna==3.6
iniconfig==2.0.0
joblib==1.3.2
Expand All @@ -96,8 +97,8 @@ packaging==23.2
pandas==1.5.3
parameterized==0.9.0
pluggy==1.3.0
proto-plus==1.22.3
protobuf==4.25.1
proto-plus==1.23.0
protobuf==3.20.3
psycopg2-binary==2.9.9
pyarrow==14.0.1
pyarrow-hotfix==0.6
Expand All @@ -117,7 +118,7 @@ pytest-xdist==3.5.0
python-dateutil==2.8.2
pytz==2023.3.post1
PyYAML==6.0.1
referencing==0.31.1
referencing==0.32.0
regex==2023.10.3
requests==2.31.0
requests-mock==1.11.0
Expand All @@ -135,10 +136,9 @@ tenacity==8.2.3
testcontainers==3.7.1
threadpoolctl==3.2.0
tqdm==4.66.1
typing_extensions==4.8.0
typing_extensions==4.9.0
tzlocal==5.2
uritemplate==4.1.1
urllib3==2.1.0
websocket-client==1.7.0
wrapt==1.16.0
zstandard==0.22.0
44 changes: 22 additions & 22 deletions sdks/python/container/py38/base_image_requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,47 +38,48 @@ Cython==0.29.36
deprecation==2.1.0
dill==0.3.1.1
dnspython==2.4.2
docker==6.1.3
docker==7.0.0
docopt==0.6.2
docstring-parser==0.15
exceptiongroup==1.2.0
execnet==2.0.2
fastavro==1.9.1
fasteners==0.19
freezegun==1.3.1
future==0.18.3
google-api-core==2.14.0
google-api-python-client==2.109.0
google-api-core==2.15.0
google-api-python-client==2.110.0
google-apitools==0.5.31
google-auth==2.25.1
google-auth==2.25.2
google-auth-httplib2==0.1.1
google-cloud-aiplatform==1.37.0
google-cloud-bigquery==3.13.0
google-cloud-bigquery-storage==2.23.0
google-cloud-bigtable==2.21.0
google-cloud-core==2.3.3
google-cloud-core==2.4.1
google-cloud-datastore==2.18.0
google-cloud-dlp==3.13.0
google-cloud-language==2.11.1
google-cloud-dlp==3.14.0
google-cloud-language==2.12.0
google-cloud-profiler==4.1.0
google-cloud-pubsub==2.18.4
google-cloud-pubsublite==1.8.3
google-cloud-recommendations-ai==0.10.5
google-cloud-resource-manager==1.10.4
google-cloud-recommendations-ai==0.10.6
google-cloud-resource-manager==1.11.0
google-cloud-spanner==3.40.1
google-cloud-storage==2.13.0
google-cloud-videointelligence==2.11.4
google-cloud-vision==3.4.5
google-cloud-videointelligence==2.12.0
google-cloud-vision==3.5.0
google-crc32c==1.5.0
google-resumable-media==2.6.0
googleapis-common-protos==1.61.0
greenlet==3.0.1
grpc-google-iam-v1==0.12.7
grpcio==1.59.3
grpcio-status==1.59.3
googleapis-common-protos==1.62.0
greenlet==3.0.2
grpc-google-iam-v1==0.13.0
grpcio==1.60.0
grpcio-status==1.48.2
guppy3==3.1.4.post1
hdfs==2.7.3
httplib2==0.22.0
hypothesis==6.91.0
hypothesis==6.92.0
idna==3.6
importlib-metadata==7.0.0
importlib-resources==6.1.1
Expand All @@ -101,8 +102,8 @@ pandas==1.5.3
parameterized==0.9.0
pkgutil_resolve_name==1.3.10
pluggy==1.3.0
proto-plus==1.22.3
protobuf==4.25.1
proto-plus==1.23.0
protobuf==3.20.3
psycopg2-binary==2.9.9
pyarrow==14.0.1
pyarrow-hotfix==0.6
Expand All @@ -123,7 +124,7 @@ python-dateutil==2.8.2
python-snappy==0.6.1
pytz==2023.3.post1
PyYAML==6.0.1
referencing==0.31.1
referencing==0.32.0
regex==2023.10.3
requests==2.31.0
requests-mock==1.11.0
Expand All @@ -142,11 +143,10 @@ testcontainers==3.7.1
threadpoolctl==3.2.0
tomli==2.0.1
tqdm==4.66.1
typing_extensions==4.8.0
typing_extensions==4.9.0
tzlocal==5.2
uritemplate==4.1.1
urllib3==2.1.0
websocket-client==1.7.0
wrapt==1.16.0
zipp==3.17.0
zstandard==0.22.0
Loading
Loading