From 2e8cecbc00f0459ac67754c9c6e44c82fb292507 Mon Sep 17 00:00:00 2001 From: Valentyn Tymofieiev Date: Thu, 3 Mar 2022 19:47:48 -0800 Subject: [PATCH] Bump numpy bound to include 1.22 and regenerate container deps. --- .../py36/base_image_requirements.txt | 37 +++++++-------- .../py37/base_image_requirements.txt | 42 ++++++++--------- .../py38/base_image_requirements.txt | 46 +++++++++---------- .../py39/base_image_requirements.txt | 46 +++++++++---------- sdks/python/setup.py | 2 +- 5 files changed, 87 insertions(+), 86 deletions(-) diff --git a/sdks/python/container/py36/base_image_requirements.txt b/sdks/python/container/py36/base_image_requirements.txt index ecfa3f30d198..592bdb01113e 100644 --- a/sdks/python/container/py36/base_image_requirements.txt +++ b/sdks/python/container/py36/base_image_requirements.txt @@ -31,13 +31,13 @@ cached-property==1.5.2 cachetools==4.2.4 certifi==2021.10.8 cffi==1.15.0 -charset-normalizer==2.0.11 +charset-normalizer==2.0.12 clang==5.0 -click==8.0.3 +click==8.0.4 cloudpickle==2.0.0 crcmod==1.7 cryptography==36.0.1 -Cython==0.29.27 +Cython==0.29.28 dataclasses==0.8 deprecation==2.1.0 dill==0.3.1.1 @@ -47,25 +47,25 @@ execnet==1.9.0 fastavro==1.4.7 fasteners==0.17.3 flatbuffers==1.12 -freezegun==1.1.0 +freezegun==1.2.0 future==0.18.2 gast==0.4.0 google-api-core==1.31.5 -google-api-python-client==2.37.0 +google-api-python-client==2.39.0 google-apitools==0.5.31 google-auth==1.35.0 google-auth-httplib2==0.1.0 google-auth-oauthlib==0.4.6 -google-cloud-bigquery==2.32.0 -google-cloud-bigquery-storage==2.11.0 +google-cloud-bigquery==2.34.1 +google-cloud-bigquery-storage==2.12.0 google-cloud-bigtable==1.7.0 google-cloud-core==1.7.2 google-cloud-datastore==1.15.3 -google-cloud-dlp==3.6.0 +google-cloud-dlp==3.6.1 google-cloud-language==1.3.0 google-cloud-profiler==3.0.7 google-cloud-pubsub==2.9.0 -google-cloud-pubsublite==1.3.0 +google-cloud-pubsublite==1.4.0 google-cloud-recommendations-ai==0.2.0 google-cloud-spanner==1.19.1 google-cloud-videointelligence==1.16.1 @@ -73,19 +73,20 @@ google-cloud-vision==1.0.0 google-crc32c==1.3.0 google-pasta==0.2.0 google-python-cloud-debugger==2.18 -google-resumable-media==2.2.1 -googleapis-common-protos==1.54.0 +google-resumable-media==2.3.1 +googleapis-common-protos==1.55.0 greenlet==1.1.2 grpc-google-iam-v1==0.12.3 -grpcio==1.43.0 +grpcio==1.44.0 grpcio-gcp==0.2.2 -grpcio-status==1.43.0 +grpcio-status==1.44.0 guppy3==3.1.2 h5py==3.1.0 hdfs==2.6.0 httplib2==0.19.1 idna==3.3 importlib-metadata==4.8.3 +importlib-resources==5.4.0 joblib==1.1.0 keras==2.6.0 Keras-Preprocessing==1.1.2 @@ -108,7 +109,7 @@ pandas==1.1.5 parameterized==0.7.5 pbr==5.8.1 pluggy==0.13.1 -proto-plus==1.20.0 +proto-plus==1.20.3 protobuf==3.19.4 psycopg2-binary==2.9.3 py==1.11.0 @@ -126,10 +127,10 @@ pytest-forked==1.4.0 pytest-timeout==1.4.2 pytest-xdist==1.34.0 python-dateutil==2.8.2 -python-snappy==0.6.0 +python-snappy==0.6.1 pytz==2021.3 PyYAML==6.0 -regex==2022.1.18 +regex==2022.3.2 requests==2.27.1 requests-mock==1.9.3 requests-oauthlib==1.3.1 @@ -148,14 +149,14 @@ tensorflow-estimator==2.6.0 termcolor==1.1.0 testcontainers==3.4.2 threadpoolctl==3.1.0 -tqdm==4.62.3 +tqdm==4.63.0 typing-extensions==3.7.4.3 typing-inspect==0.7.1 typing-utils==0.1.0 uritemplate==4.1.1 urllib3==1.26.8 wcwidth==0.2.5 -websocket-client==1.2.3 +websocket-client==1.3.1 Werkzeug==2.0.3 wrapt==1.12.1 zipp==3.6.0 diff --git a/sdks/python/container/py37/base_image_requirements.txt b/sdks/python/container/py37/base_image_requirements.txt index c62ec03c2ed6..41ab489ea60d 100644 --- a/sdks/python/container/py37/base_image_requirements.txt +++ b/sdks/python/container/py37/base_image_requirements.txt @@ -31,12 +31,12 @@ cached-property==1.5.2 cachetools==4.2.4 certifi==2021.10.8 cffi==1.15.0 -charset-normalizer==2.0.11 -click==8.0.3 +charset-normalizer==2.0.12 +click==8.0.4 cloudpickle==2.0.0 crcmod==1.7 cryptography==36.0.1 -Cython==0.29.27 +Cython==0.29.28 deprecation==2.1.0 dill==0.3.1.1 docker==5.0.3 @@ -45,25 +45,25 @@ execnet==1.9.0 fastavro==1.4.9 fasteners==0.17.3 flatbuffers==2.0 -freezegun==1.1.0 +freezegun==1.2.0 future==0.18.2 gast==0.5.3 google-api-core==1.31.5 -google-api-python-client==2.37.0 +google-api-python-client==2.39.0 google-apitools==0.5.31 google-auth==1.35.0 google-auth-httplib2==0.1.0 google-auth-oauthlib==0.4.6 -google-cloud-bigquery==2.32.0 -google-cloud-bigquery-storage==2.11.0 +google-cloud-bigquery==2.34.1 +google-cloud-bigquery-storage==2.12.0 google-cloud-bigtable==1.7.0 google-cloud-core==1.7.2 google-cloud-datastore==1.15.3 -google-cloud-dlp==3.6.0 +google-cloud-dlp==3.6.1 google-cloud-language==1.3.0 google-cloud-profiler==3.0.7 google-cloud-pubsub==2.9.0 -google-cloud-pubsublite==1.3.0 +google-cloud-pubsublite==1.4.0 google-cloud-recommendations-ai==0.2.0 google-cloud-spanner==1.19.1 google-cloud-videointelligence==1.16.1 @@ -71,19 +71,19 @@ google-cloud-vision==1.0.0 google-crc32c==1.3.0 google-pasta==0.2.0 google-python-cloud-debugger==2.18 -google-resumable-media==2.2.1 -googleapis-common-protos==1.54.0 +google-resumable-media==2.3.1 +googleapis-common-protos==1.55.0 greenlet==1.1.2 grpc-google-iam-v1==0.12.3 -grpcio==1.43.0 +grpcio==1.44.0 grpcio-gcp==0.2.2 -grpcio-status==1.43.0 +grpcio-status==1.44.0 guppy3==3.1.2 h5py==3.6.0 hdfs==2.6.0 httplib2==0.19.1 idna==3.3 -importlib-metadata==4.11.0 +importlib-metadata==4.11.2 joblib==1.1.0 keras==2.8.0 Keras-Preprocessing==1.1.2 @@ -100,14 +100,14 @@ numpy==1.21.5 oauth2client==4.1.3 oauthlib==3.2.0 opt-einsum==3.3.0 -orjson==3.6.6 +orjson==3.6.7 overrides==6.1.0 packaging==21.3 pandas==1.3.5 parameterized==0.7.5 pbr==5.8.1 pluggy==0.13.1 -proto-plus==1.20.0 +proto-plus==1.20.3 protobuf==3.19.4 psycopg2-binary==2.9.3 py==1.11.0 @@ -125,10 +125,10 @@ pytest-forked==1.4.0 pytest-timeout==1.4.2 pytest-xdist==1.34.0 python-dateutil==2.8.2 -python-snappy==0.6.0 +python-snappy==0.6.1 pytz==2021.3 PyYAML==6.0 -regex==2022.1.18 +regex==2022.3.2 requests==2.27.1 requests-mock==1.9.3 requests-oauthlib==1.3.1 @@ -148,14 +148,14 @@ termcolor==1.1.0 testcontainers==3.4.2 tf-estimator-nightly==2.8.0.dev2021122109 threadpoolctl==3.1.0 -tqdm==4.62.3 +tqdm==4.63.0 typing-inspect==0.7.1 typing-utils==0.1.0 -typing_extensions==4.0.1 +typing_extensions==4.1.1 uritemplate==4.1.1 urllib3==1.26.8 wcwidth==0.2.5 -websocket-client==1.2.3 +websocket-client==1.3.1 Werkzeug==2.0.3 wrapt==1.13.3 zipp==3.7.0 diff --git a/sdks/python/container/py38/base_image_requirements.txt b/sdks/python/container/py38/base_image_requirements.txt index 42044fdd69f7..ea2430810845 100644 --- a/sdks/python/container/py38/base_image_requirements.txt +++ b/sdks/python/container/py38/base_image_requirements.txt @@ -30,12 +30,12 @@ bs4==0.0.1 cachetools==4.2.4 certifi==2021.10.8 cffi==1.15.0 -charset-normalizer==2.0.11 -click==8.0.3 +charset-normalizer==2.0.12 +click==8.0.4 cloudpickle==2.0.0 crcmod==1.7 cryptography==36.0.1 -Cython==0.29.27 +Cython==0.29.28 deprecation==2.1.0 dill==0.3.1.1 docker==5.0.3 @@ -44,25 +44,25 @@ execnet==1.9.0 fastavro==1.4.9 fasteners==0.17.3 flatbuffers==2.0 -freezegun==1.1.0 +freezegun==1.2.0 future==0.18.2 gast==0.5.3 google-api-core==1.31.5 -google-api-python-client==2.37.0 +google-api-python-client==2.39.0 google-apitools==0.5.31 google-auth==1.35.0 google-auth-httplib2==0.1.0 google-auth-oauthlib==0.4.6 -google-cloud-bigquery==2.32.0 -google-cloud-bigquery-storage==2.11.0 +google-cloud-bigquery==2.34.1 +google-cloud-bigquery-storage==2.12.0 google-cloud-bigtable==1.7.0 google-cloud-core==1.7.2 google-cloud-datastore==1.15.3 -google-cloud-dlp==3.6.0 +google-cloud-dlp==3.6.1 google-cloud-language==1.3.0 google-cloud-profiler==3.0.7 google-cloud-pubsub==2.9.0 -google-cloud-pubsublite==1.3.0 +google-cloud-pubsublite==1.4.0 google-cloud-recommendations-ai==0.2.0 google-cloud-spanner==1.19.1 google-cloud-videointelligence==1.16.1 @@ -70,19 +70,19 @@ google-cloud-vision==1.0.0 google-crc32c==1.3.0 google-pasta==0.2.0 google-python-cloud-debugger==2.18 -google-resumable-media==2.2.1 -googleapis-common-protos==1.54.0 +google-resumable-media==2.3.1 +googleapis-common-protos==1.55.0 greenlet==1.1.2 grpc-google-iam-v1==0.12.3 -grpcio==1.43.0 +grpcio==1.44.0 grpcio-gcp==0.2.2 -grpcio-status==1.43.0 +grpcio-status==1.44.0 guppy3==3.1.2 h5py==3.6.0 hdfs==2.6.0 httplib2==0.19.1 idna==3.3 -importlib-metadata==4.11.0 +importlib-metadata==4.11.2 joblib==1.1.0 keras==2.8.0 Keras-Preprocessing==1.1.2 @@ -95,18 +95,18 @@ more-itertools==8.12.0 mypy-extensions==0.4.3 nltk==3.7 nose==1.3.7 -numpy==1.21.5 +numpy==1.22.2 oauth2client==4.1.3 oauthlib==3.2.0 opt-einsum==3.3.0 -orjson==3.6.6 +orjson==3.6.7 overrides==6.1.0 packaging==21.3 -pandas==1.4.0 +pandas==1.4.1 parameterized==0.7.5 pbr==5.8.1 pluggy==0.13.1 -proto-plus==1.20.0 +proto-plus==1.20.3 protobuf==3.19.4 psycopg2-binary==2.9.3 py==1.11.0 @@ -124,10 +124,10 @@ pytest-forked==1.4.0 pytest-timeout==1.4.2 pytest-xdist==1.34.0 python-dateutil==2.8.2 -python-snappy==0.6.0 +python-snappy==0.6.1 pytz==2021.3 PyYAML==6.0 -regex==2022.1.18 +regex==2022.3.2 requests==2.27.1 requests-mock==1.9.3 requests-oauthlib==1.3.1 @@ -147,14 +147,14 @@ termcolor==1.1.0 testcontainers==3.4.2 tf-estimator-nightly==2.8.0.dev2021122109 threadpoolctl==3.1.0 -tqdm==4.62.3 +tqdm==4.63.0 typing-inspect==0.7.1 typing-utils==0.1.0 -typing_extensions==4.0.1 +typing_extensions==4.1.1 uritemplate==4.1.1 urllib3==1.26.8 wcwidth==0.2.5 -websocket-client==1.2.3 +websocket-client==1.3.1 Werkzeug==2.0.3 wrapt==1.13.3 zipp==3.7.0 diff --git a/sdks/python/container/py39/base_image_requirements.txt b/sdks/python/container/py39/base_image_requirements.txt index e5226aa4f9ab..157045b51c08 100644 --- a/sdks/python/container/py39/base_image_requirements.txt +++ b/sdks/python/container/py39/base_image_requirements.txt @@ -30,12 +30,12 @@ bs4==0.0.1 cachetools==4.2.4 certifi==2021.10.8 cffi==1.15.0 -charset-normalizer==2.0.11 -click==8.0.3 +charset-normalizer==2.0.12 +click==8.0.4 cloudpickle==2.0.0 crcmod==1.7 cryptography==36.0.1 -Cython==0.29.27 +Cython==0.29.28 deprecation==2.1.0 dill==0.3.1.1 docker==5.0.3 @@ -44,25 +44,25 @@ execnet==1.9.0 fastavro==1.4.9 fasteners==0.17.3 flatbuffers==2.0 -freezegun==1.1.0 +freezegun==1.2.0 future==0.18.2 gast==0.5.3 google-api-core==1.31.5 -google-api-python-client==2.37.0 +google-api-python-client==2.39.0 google-apitools==0.5.31 google-auth==1.35.0 google-auth-httplib2==0.1.0 google-auth-oauthlib==0.4.6 -google-cloud-bigquery==2.32.0 -google-cloud-bigquery-storage==2.11.0 +google-cloud-bigquery==2.34.1 +google-cloud-bigquery-storage==2.12.0 google-cloud-bigtable==1.7.0 google-cloud-core==1.7.2 google-cloud-datastore==1.15.3 -google-cloud-dlp==3.6.0 +google-cloud-dlp==3.6.1 google-cloud-language==1.3.0 google-cloud-profiler==3.0.7 google-cloud-pubsub==2.9.0 -google-cloud-pubsublite==1.3.0 +google-cloud-pubsublite==1.4.0 google-cloud-recommendations-ai==0.2.0 google-cloud-spanner==1.19.1 google-cloud-videointelligence==1.16.1 @@ -70,19 +70,19 @@ google-cloud-vision==1.0.0 google-crc32c==1.3.0 google-pasta==0.2.0 google-python-cloud-debugger==2.18 -google-resumable-media==2.2.1 -googleapis-common-protos==1.54.0 +google-resumable-media==2.3.1 +googleapis-common-protos==1.55.0 greenlet==1.1.2 grpc-google-iam-v1==0.12.3 -grpcio==1.43.0 +grpcio==1.44.0 grpcio-gcp==0.2.2 -grpcio-status==1.43.0 +grpcio-status==1.44.0 guppy3==3.1.2 h5py==3.6.0 hdfs==2.6.0 httplib2==0.19.1 idna==3.3 -importlib-metadata==4.11.0 +importlib-metadata==4.11.2 joblib==1.1.0 keras==2.8.0 Keras-Preprocessing==1.1.2 @@ -95,18 +95,18 @@ more-itertools==8.12.0 mypy-extensions==0.4.3 nltk==3.7 nose==1.3.7 -numpy==1.21.5 +numpy==1.22.2 oauth2client==4.1.3 oauthlib==3.2.0 opt-einsum==3.3.0 -orjson==3.6.6 +orjson==3.6.7 overrides==6.1.0 packaging==21.3 -pandas==1.4.0 +pandas==1.4.1 parameterized==0.7.5 pbr==5.8.1 pluggy==0.13.1 -proto-plus==1.20.0 +proto-plus==1.20.3 protobuf==3.19.4 psycopg2-binary==2.9.3 py==1.11.0 @@ -124,10 +124,10 @@ pytest-forked==1.4.0 pytest-timeout==1.4.2 pytest-xdist==1.34.0 python-dateutil==2.8.2 -python-snappy==0.6.0 +python-snappy==0.6.1 pytz==2021.3 PyYAML==6.0 -regex==2022.1.18 +regex==2022.3.2 requests==2.27.1 requests-mock==1.9.3 requests-oauthlib==1.3.1 @@ -147,14 +147,14 @@ termcolor==1.1.0 testcontainers==3.4.2 tf-estimator-nightly==2.8.0.dev2021122109 threadpoolctl==3.1.0 -tqdm==4.62.3 +tqdm==4.63.0 typing-inspect==0.7.1 typing-utils==0.1.0 -typing_extensions==4.0.1 +typing_extensions==4.1.1 uritemplate==4.1.1 urllib3==1.26.8 wcwidth==0.2.5 -websocket-client==1.2.3 +websocket-client==1.3.1 Werkzeug==2.0.3 wrapt==1.13.3 zipp==3.7.0 diff --git a/sdks/python/setup.py b/sdks/python/setup.py index ad99e1d590cd..a0239fa22441 100644 --- a/sdks/python/setup.py +++ b/sdks/python/setup.py @@ -142,7 +142,7 @@ def get_version(): 'grpcio>=1.29.0,<2', 'hdfs>=2.1.0,<3.0.0', 'httplib2>=0.8,<0.20.0', - 'numpy>=1.14.3,<1.22.0', + 'numpy>=1.14.3,<1.23.0', 'pymongo>=3.8.0,<4.0.0', 'oauth2client>=2.0.1,<5', 'protobuf>=3.12.2,<4',