This is an automated email from the ASF dual-hosted git repository. yhu pushed a commit to branch revert-33658-beam-update-python in repository https://gitbox.apache.org/repos/asf/beam.git
commit 23d72e862ecc2d35a24b126fc4ce1deafcbec3d0 Author: Yi Hu <[email protected]> AuthorDate: Mon Jan 27 11:30:40 2025 -0500 Revert "Updated the python dependencies (targeted for Beam 2.63.0) (#33658)" This reverts commit 9afc92ed18408dc8eb52d789a3d4e4e46bd1681b. --- .../container/py310/base_image_requirements.txt | 38 ++++++++++---------- .../container/py311/base_image_requirements.txt | 38 ++++++++++---------- .../container/py312/base_image_requirements.txt | 40 +++++++++++----------- .../container/py39/base_image_requirements.txt | 36 +++++++++---------- sdks/python/setup.py | 5 ++- 5 files changed, 78 insertions(+), 79 deletions(-) diff --git a/sdks/python/container/py310/base_image_requirements.txt b/sdks/python/container/py310/base_image_requirements.txt index 5a733026a1b..d3c4c3a7623 100644 --- a/sdks/python/container/py310/base_image_requirements.txt +++ b/sdks/python/container/py310/base_image_requirements.txt @@ -52,20 +52,20 @@ fasteners==0.19 freezegun==1.5.1 future==1.0.0 google-api-core==2.24.0 -google-api-python-client==2.159.0 +google-api-python-client==2.156.0 google-apitools==0.5.31 google-auth==2.37.0 google-auth-httplib2==0.2.0 -google-cloud-aiplatform==1.77.0 +google-cloud-aiplatform==1.75.0 google-cloud-bigquery==3.27.0 google-cloud-bigquery-storage==2.27.0 -google-cloud-bigtable==2.28.1 +google-cloud-bigtable==2.27.0 google-cloud-core==2.4.1 google-cloud-datastore==2.20.2 google-cloud-dlp==3.26.0 google-cloud-language==2.16.0 google-cloud-profiler==4.1.0 -google-cloud-pubsub==2.27.2 +google-cloud-pubsub==2.27.1 google-cloud-pubsublite==1.11.1 google-cloud-recommendations-ai==0.10.15 google-cloud-resource-manager==1.14.0 @@ -77,14 +77,14 @@ google-crc32c==1.6.0 google-resumable-media==2.7.2 googleapis-common-protos==1.66.0 greenlet==3.1.1 -grpc-google-iam-v1==0.14.0 +grpc-google-iam-v1==0.13.1 grpc-interceptor==0.15.4 grpcio==1.65.5 grpcio-status==1.65.5 -guppy3==3.1.5 +guppy3==3.1.4.post1 hdfs==2.7.3 httplib2==0.22.0 -hypothesis==6.124.1 +hypothesis==6.123.2 idna==3.10 importlib_metadata==8.5.0 iniconfig==2.0.0 @@ -102,36 +102,36 @@ keyrings.google-artifactregistry-auth==1.1.2 MarkupSafe==3.0.2 mmh3==5.0.1 mock==5.1.0 -more-itertools==10.6.0 +more-itertools==10.5.0 nltk==3.9.1 nose==1.3.7 -numpy==2.2.1 +numpy==1.26.4 oauth2client==4.1.3 objsize==0.7.0 opentelemetry-api==1.29.0 opentelemetry-sdk==1.29.0 opentelemetry-semantic-conventions==0.50b0 -orjson==3.10.14 +orjson==3.10.12 overrides==7.7.0 packaging==24.2 -pandas==2.2.3 +pandas==2.1.4 parameterized==0.9.0 pluggy==1.5.0 proto-plus==1.25.0 -protobuf==5.29.3 +protobuf==5.29.2 psycopg2-binary==2.9.9 pyarrow==16.1.0 pyarrow-hotfix==0.6 pyasn1==0.6.1 pyasn1_modules==0.4.1 pycparser==2.22 -pydantic==2.10.5 +pydantic==2.10.4 pydantic_core==2.27.2 pydot==1.4.2 PyHamcrest==2.1.0 pymongo==4.10.1 PyMySQL==1.1.1 -pyparsing==3.2.1 +pyparsing==3.2.0 pyproject_hooks==1.2.0 pytest==7.4.4 pytest-timeout==2.3.1 @@ -141,20 +141,20 @@ python-snappy==0.7.3 pytz==2024.2 PyYAML==6.0.2 redis==5.2.1 -referencing==0.36.1 +referencing==0.35.1 regex==2024.11.6 requests==2.32.3 requests-mock==1.12.1 rpds-py==0.22.3 rsa==4.9 -scikit-learn==1.6.1 -scipy==1.15.1 +scikit-learn==1.6.0 +scipy==1.14.1 SecretStorage==3.3.3 shapely==2.0.6 six==1.17.0 sortedcontainers==2.4.0 soupsieve==2.6 -SQLAlchemy==2.0.37 +SQLAlchemy==2.0.36 sqlparse==0.5.3 tenacity==8.5.0 testcontainers==3.7.1 @@ -165,6 +165,6 @@ typing_extensions==4.12.2 tzdata==2024.2 uritemplate==4.1.1 urllib3==2.3.0 -wrapt==1.17.2 +wrapt==1.17.0 zipp==3.21.0 zstandard==0.23.0 diff --git a/sdks/python/container/py311/base_image_requirements.txt b/sdks/python/container/py311/base_image_requirements.txt index cf05a548929..3420d044446 100644 --- a/sdks/python/container/py311/base_image_requirements.txt +++ b/sdks/python/container/py311/base_image_requirements.txt @@ -50,20 +50,20 @@ fasteners==0.19 freezegun==1.5.1 future==1.0.0 google-api-core==2.24.0 -google-api-python-client==2.159.0 +google-api-python-client==2.156.0 google-apitools==0.5.31 google-auth==2.37.0 google-auth-httplib2==0.2.0 -google-cloud-aiplatform==1.77.0 +google-cloud-aiplatform==1.75.0 google-cloud-bigquery==3.27.0 google-cloud-bigquery-storage==2.27.0 -google-cloud-bigtable==2.28.1 +google-cloud-bigtable==2.27.0 google-cloud-core==2.4.1 google-cloud-datastore==2.20.2 google-cloud-dlp==3.26.0 google-cloud-language==2.16.0 google-cloud-profiler==4.1.0 -google-cloud-pubsub==2.27.2 +google-cloud-pubsub==2.27.1 google-cloud-pubsublite==1.11.1 google-cloud-recommendations-ai==0.10.15 google-cloud-resource-manager==1.14.0 @@ -75,14 +75,14 @@ google-crc32c==1.6.0 google-resumable-media==2.7.2 googleapis-common-protos==1.66.0 greenlet==3.1.1 -grpc-google-iam-v1==0.14.0 +grpc-google-iam-v1==0.13.1 grpc-interceptor==0.15.4 grpcio==1.65.5 grpcio-status==1.65.5 -guppy3==3.1.5 +guppy3==3.1.4.post1 hdfs==2.7.3 httplib2==0.22.0 -hypothesis==6.124.1 +hypothesis==6.123.2 idna==3.10 importlib_metadata==8.5.0 iniconfig==2.0.0 @@ -100,36 +100,36 @@ keyrings.google-artifactregistry-auth==1.1.2 MarkupSafe==3.0.2 mmh3==5.0.1 mock==5.1.0 -more-itertools==10.6.0 +more-itertools==10.5.0 nltk==3.9.1 nose==1.3.7 -numpy==2.2.1 +numpy==1.26.4 oauth2client==4.1.3 objsize==0.7.0 opentelemetry-api==1.29.0 opentelemetry-sdk==1.29.0 opentelemetry-semantic-conventions==0.50b0 -orjson==3.10.14 +orjson==3.10.12 overrides==7.7.0 packaging==24.2 -pandas==2.2.3 +pandas==2.1.4 parameterized==0.9.0 pluggy==1.5.0 proto-plus==1.25.0 -protobuf==5.29.3 +protobuf==5.29.2 psycopg2-binary==2.9.9 pyarrow==16.1.0 pyarrow-hotfix==0.6 pyasn1==0.6.1 pyasn1_modules==0.4.1 pycparser==2.22 -pydantic==2.10.5 +pydantic==2.10.4 pydantic_core==2.27.2 pydot==1.4.2 PyHamcrest==2.1.0 pymongo==4.10.1 PyMySQL==1.1.1 -pyparsing==3.2.1 +pyparsing==3.2.0 pyproject_hooks==1.2.0 pytest==7.4.4 pytest-timeout==2.3.1 @@ -139,20 +139,20 @@ python-snappy==0.7.3 pytz==2024.2 PyYAML==6.0.2 redis==5.2.1 -referencing==0.36.1 +referencing==0.35.1 regex==2024.11.6 requests==2.32.3 requests-mock==1.12.1 rpds-py==0.22.3 rsa==4.9 -scikit-learn==1.6.1 -scipy==1.15.1 +scikit-learn==1.6.0 +scipy==1.14.1 SecretStorage==3.3.3 shapely==2.0.6 six==1.17.0 sortedcontainers==2.4.0 soupsieve==2.6 -SQLAlchemy==2.0.37 +SQLAlchemy==2.0.36 sqlparse==0.5.3 tenacity==8.5.0 testcontainers==3.7.1 @@ -162,6 +162,6 @@ typing_extensions==4.12.2 tzdata==2024.2 uritemplate==4.1.1 urllib3==2.3.0 -wrapt==1.17.2 +wrapt==1.17.0 zipp==3.21.0 zstandard==0.23.0 diff --git a/sdks/python/container/py312/base_image_requirements.txt b/sdks/python/container/py312/base_image_requirements.txt index f7099e0db7c..cfc9e96087d 100644 --- a/sdks/python/container/py312/base_image_requirements.txt +++ b/sdks/python/container/py312/base_image_requirements.txt @@ -49,20 +49,20 @@ fasteners==0.19 freezegun==1.5.1 future==1.0.0 google-api-core==2.24.0 -google-api-python-client==2.159.0 +google-api-python-client==2.156.0 google-apitools==0.5.31 google-auth==2.37.0 google-auth-httplib2==0.2.0 -google-cloud-aiplatform==1.77.0 +google-cloud-aiplatform==1.75.0 google-cloud-bigquery==3.27.0 google-cloud-bigquery-storage==2.27.0 -google-cloud-bigtable==2.28.1 +google-cloud-bigtable==2.27.0 google-cloud-core==2.4.1 google-cloud-datastore==2.20.2 google-cloud-dlp==3.26.0 google-cloud-language==2.16.0 google-cloud-profiler==4.1.0 -google-cloud-pubsub==2.27.2 +google-cloud-pubsub==2.27.1 google-cloud-pubsublite==1.11.1 google-cloud-recommendations-ai==0.10.15 google-cloud-resource-manager==1.14.0 @@ -74,14 +74,14 @@ google-crc32c==1.6.0 google-resumable-media==2.7.2 googleapis-common-protos==1.66.0 greenlet==3.1.1 -grpc-google-iam-v1==0.14.0 +grpc-google-iam-v1==0.13.1 grpc-interceptor==0.15.4 grpcio==1.65.5 grpcio-status==1.65.5 -guppy3==3.1.5 +guppy3==3.1.4.post1 hdfs==2.7.3 httplib2==0.22.0 -hypothesis==6.124.1 +hypothesis==6.123.2 idna==3.10 importlib_metadata==8.5.0 iniconfig==2.0.0 @@ -99,36 +99,36 @@ keyrings.google-artifactregistry-auth==1.1.2 MarkupSafe==3.0.2 mmh3==5.0.1 mock==5.1.0 -more-itertools==10.6.0 +more-itertools==10.5.0 nltk==3.9.1 nose==1.3.7 -numpy==2.2.1 +numpy==1.26.4 oauth2client==4.1.3 objsize==0.7.0 opentelemetry-api==1.29.0 opentelemetry-sdk==1.29.0 opentelemetry-semantic-conventions==0.50b0 -orjson==3.10.14 +orjson==3.10.12 overrides==7.7.0 packaging==24.2 -pandas==2.2.3 +pandas==2.1.4 parameterized==0.9.0 pluggy==1.5.0 proto-plus==1.25.0 -protobuf==5.29.3 +protobuf==5.29.2 psycopg2-binary==2.9.9 pyarrow==16.1.0 pyarrow-hotfix==0.6 pyasn1==0.6.1 pyasn1_modules==0.4.1 pycparser==2.22 -pydantic==2.10.5 +pydantic==2.10.4 pydantic_core==2.27.2 pydot==1.4.2 PyHamcrest==2.1.0 pymongo==4.10.1 PyMySQL==1.1.1 -pyparsing==3.2.1 +pyparsing==3.2.0 pyproject_hooks==1.2.0 pytest==7.4.4 pytest-timeout==2.3.1 @@ -138,21 +138,21 @@ python-snappy==0.7.3 pytz==2024.2 PyYAML==6.0.2 redis==5.2.1 -referencing==0.36.1 +referencing==0.35.1 regex==2024.11.6 requests==2.32.3 requests-mock==1.12.1 rpds-py==0.22.3 rsa==4.9 -scikit-learn==1.6.1 -scipy==1.15.1 +scikit-learn==1.6.0 +scipy==1.14.1 SecretStorage==3.3.3 -setuptools==75.8.0 +setuptools==75.6.0 shapely==2.0.6 six==1.17.0 sortedcontainers==2.4.0 soupsieve==2.6 -SQLAlchemy==2.0.37 +SQLAlchemy==2.0.36 sqlparse==0.5.3 tenacity==8.5.0 testcontainers==3.7.1 @@ -163,6 +163,6 @@ tzdata==2024.2 uritemplate==4.1.1 urllib3==2.3.0 wheel==0.45.1 -wrapt==1.17.2 +wrapt==1.17.0 zipp==3.21.0 zstandard==0.23.0 diff --git a/sdks/python/container/py39/base_image_requirements.txt b/sdks/python/container/py39/base_image_requirements.txt index b1f77255352..3fb495e30f1 100644 --- a/sdks/python/container/py39/base_image_requirements.txt +++ b/sdks/python/container/py39/base_image_requirements.txt @@ -52,20 +52,20 @@ fasteners==0.19 freezegun==1.5.1 future==1.0.0 google-api-core==2.24.0 -google-api-python-client==2.159.0 +google-api-python-client==2.156.0 google-apitools==0.5.31 google-auth==2.37.0 google-auth-httplib2==0.2.0 -google-cloud-aiplatform==1.77.0 +google-cloud-aiplatform==1.75.0 google-cloud-bigquery==3.27.0 google-cloud-bigquery-storage==2.27.0 -google-cloud-bigtable==2.28.1 +google-cloud-bigtable==2.27.0 google-cloud-core==2.4.1 google-cloud-datastore==2.20.2 google-cloud-dlp==3.26.0 google-cloud-language==2.16.0 google-cloud-profiler==4.1.0 -google-cloud-pubsub==2.27.2 +google-cloud-pubsub==2.27.1 google-cloud-pubsublite==1.11.1 google-cloud-recommendations-ai==0.10.15 google-cloud-resource-manager==1.14.0 @@ -77,14 +77,14 @@ google-crc32c==1.6.0 google-resumable-media==2.7.2 googleapis-common-protos==1.66.0 greenlet==3.1.1 -grpc-google-iam-v1==0.14.0 +grpc-google-iam-v1==0.13.1 grpc-interceptor==0.15.4 grpcio==1.65.5 grpcio-status==1.65.5 -guppy3==3.1.5 +guppy3==3.1.4.post1 hdfs==2.7.3 httplib2==0.22.0 -hypothesis==6.124.1 +hypothesis==6.123.2 idna==3.10 importlib_metadata==8.5.0 iniconfig==2.0.0 @@ -102,36 +102,36 @@ keyrings.google-artifactregistry-auth==1.1.2 MarkupSafe==3.0.2 mmh3==5.0.1 mock==5.1.0 -more-itertools==10.6.0 +more-itertools==10.5.0 nltk==3.9.1 nose==1.3.7 -numpy==2.0.2 +numpy==1.26.4 oauth2client==4.1.3 objsize==0.7.0 opentelemetry-api==1.29.0 opentelemetry-sdk==1.29.0 opentelemetry-semantic-conventions==0.50b0 -orjson==3.10.14 +orjson==3.10.12 overrides==7.7.0 packaging==24.2 -pandas==2.2.3 +pandas==2.1.4 parameterized==0.9.0 pluggy==1.5.0 proto-plus==1.25.0 -protobuf==5.29.3 +protobuf==5.29.2 psycopg2-binary==2.9.9 pyarrow==16.1.0 pyarrow-hotfix==0.6 pyasn1==0.6.1 pyasn1_modules==0.4.1 pycparser==2.22 -pydantic==2.10.5 +pydantic==2.10.4 pydantic_core==2.27.2 pydot==1.4.2 PyHamcrest==2.1.0 pymongo==4.10.1 PyMySQL==1.1.1 -pyparsing==3.2.1 +pyparsing==3.2.0 pyproject_hooks==1.2.0 pytest==7.4.4 pytest-timeout==2.3.1 @@ -141,20 +141,20 @@ python-snappy==0.7.3 pytz==2024.2 PyYAML==6.0.2 redis==5.2.1 -referencing==0.36.1 +referencing==0.35.1 regex==2024.11.6 requests==2.32.3 requests-mock==1.12.1 rpds-py==0.22.3 rsa==4.9 -scikit-learn==1.6.1 +scikit-learn==1.6.0 scipy==1.13.1 SecretStorage==3.3.3 shapely==2.0.6 six==1.17.0 sortedcontainers==2.4.0 soupsieve==2.6 -SQLAlchemy==2.0.37 +SQLAlchemy==2.0.36 sqlparse==0.5.3 tenacity==8.5.0 testcontainers==3.7.1 @@ -165,6 +165,6 @@ typing_extensions==4.12.2 tzdata==2024.2 uritemplate==4.1.1 urllib3==2.3.0 -wrapt==1.17.2 +wrapt==1.17.0 zipp==3.21.0 zstandard==0.23.0 diff --git a/sdks/python/setup.py b/sdks/python/setup.py index 558b886912f..5b3e3cab6db 100644 --- a/sdks/python/setup.py +++ b/sdks/python/setup.py @@ -154,7 +154,6 @@ else: # Exclude pandas<=1.4.2 since it doesn't work with numpy 1.24.x. # Exclude 1.5.0 and 1.5.1 because of # https://github.com/pandas-dev/pandas/issues/45725 -# must update the below "docs" and "test" for extras_require dataframe_dependency = [ 'pandas>=1.4.3,!=1.5.0,!=1.5.1,<2.3', ] @@ -400,7 +399,7 @@ if __name__ == '__main__': 'Sphinx>=7.0.0,<8.0', 'docstring-parser>=0.15,<1.0', 'docutils>=0.18.1', - 'pandas<2.3.0', + 'pandas<2.2.0', 'openai' ], 'test': [ @@ -409,7 +408,7 @@ if __name__ == '__main__': 'jinja2>=3.0,<3.2', 'joblib>=1.0.1', 'mock>=1.0.1,<6.0.0', - 'pandas<2.3.0', + 'pandas<2.2.0', 'parameterized>=0.7.1,<0.10.0', 'pyhamcrest>=1.9,!=1.10.0,<3.0.0', 'requests_mock>=1.7,<2.0',
