From ee665b93eada2bbdb562432634cb0e4378bcca54 Mon Sep 17 00:00:00 2001 From: Kevin Zhang Date: Fri, 15 Apr 2022 00:47:26 -0700 Subject: [PATCH 1/9] switch to using redis cluster in redis-py Signed-off-by: Kevin Zhang --- sdk/python/feast/infra/online_stores/redis.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/sdk/python/feast/infra/online_stores/redis.py b/sdk/python/feast/infra/online_stores/redis.py index a2e8e27d80..9ceceff0ac 100644 --- a/sdk/python/feast/infra/online_stores/redis.py +++ b/sdk/python/feast/infra/online_stores/redis.py @@ -42,7 +42,7 @@ try: from redis import Redis - from rediscluster import RedisCluster + from redis.cluster import ClusterNode, RedisCluster except ImportError as e: from feast.errors import FeastExtrasDependencyImportError @@ -164,7 +164,9 @@ def _get_client(self, online_store_config: RedisOnlineStoreConfig): online_store_config.connection_string ) if online_store_config.redis_type == RedisType.redis_cluster: - kwargs["startup_nodes"] = startup_nodes + kwargs["startup_nodes"] = [ + ClusterNode(**node) for node in startup_nodes + ] self._client = RedisCluster(**kwargs) else: kwargs["host"] = startup_nodes[0]["host"] From e30026386ac6bb0f5ad083348c6213cedaea8b75 Mon Sep 17 00:00:00 2001 From: Kevin Zhang Date: Fri, 15 Apr 2022 09:51:32 -0700 Subject: [PATCH 2/9] fix Signed-off-by: Kevin Zhang --- .../requirements/py3.8-ci-requirements.txt | 293 ++++++------------ .../requirements/py3.9-ci-requirements.txt | 284 ++++++----------- .../requirements/py3.9-requirements.txt | 63 ++-- sdk/python/setup.py | 5 +- 4 files changed, 226 insertions(+), 419 deletions(-) diff --git a/sdk/python/requirements/py3.8-ci-requirements.txt b/sdk/python/requirements/py3.8-ci-requirements.txt index 5e2da9baa7..bf5c53aabd 100644 --- a/sdk/python/requirements/py3.8-ci-requirements.txt +++ b/sdk/python/requirements/py3.8-ci-requirements.txt @@ -1,5 +1,5 @@ # -# This file is autogenerated by pip-compile with python 3.8 +# This file is autogenerated by pip-compile with python 3.9 # To update, run: # # pip-compile --extra=ci --output-file=requirements/py3.8-ci-requirements.txt @@ -23,20 +23,16 @@ alabaster==0.7.12 altair==4.2.0 # via great-expectations anyio==3.5.0 - # via starlette + # via + # starlette + # watchgod appdirs==1.4.4 # via black -appnope==0.1.2 - # via - # ipykernel - # ipython -argon2-cffi==21.3.0 - # via notebook -argon2-cffi-bindings==21.2.0 - # via argon2-cffi +appnope==0.1.3 + # via ipython asgiref==3.5.0 # via uvicorn -asn1crypto==1.4.0 +asn1crypto==1.5.1 # via # oscrypto # snowflake-connector-python @@ -54,34 +50,28 @@ attrs==21.4.0 # pytest avro==1.10.0 # via feast (setup.py) -azure-core==1.23.0 +azure-core==1.23.1 # via # adlfs # azure-identity # azure-storage-blob azure-datalake-store==0.0.52 # via adlfs -azure-identity==1.8.0 +azure-identity==1.9.0 # via adlfs -azure-storage-blob==12.9.0 +azure-storage-blob==12.11.0 # via adlfs babel==2.9.1 # via sphinx backcall==0.2.0 # via ipython -backports-zoneinfo==0.2.1 - # via - # pytz-deprecation-shim - # tzlocal black==19.10b0 # via feast (setup.py) -bleach==4.1.0 - # via nbconvert -boto3==1.21.11 +boto3==1.21.41 # via # feast (setup.py) # moto -botocore==1.24.11 +botocore==1.24.41 # via # boto3 # moto @@ -98,7 +88,6 @@ certifi==2021.10.8 # snowflake-connector-python cffi==1.15.0 # via - # argon2-cffi-bindings # azure-datalake-store # cryptography # snowflake-connector-python @@ -109,7 +98,7 @@ charset-normalizer==2.0.12 # aiohttp # requests # snowflake-connector-python -click==8.0.4 +click==8.1.2 # via # black # feast (setup.py) @@ -119,7 +108,9 @@ click==8.0.4 cloudpickle==2.0.0 # via dask colorama==0.4.4 - # via feast (setup.py) + # via + # feast (setup.py) + # great-expectations coverage[toml]==6.3.2 # via pytest-cov cryptography==3.3.2 @@ -128,21 +119,19 @@ cryptography==3.3.2 # azure-identity # azure-storage-blob # feast (setup.py) + # great-expectations # moto # msal - # pyjwt # pyopenssl # snowflake-connector-python dask==2022.1.1 # via feast (setup.py) -debugpy==1.5.1 - # via ipykernel +dataclasses==0.6 + # via great-expectations decorator==5.1.1 # via # gcsfs # ipython -defusedxml==0.7.1 - # via nbconvert deprecation==2.1.0 # via testcontainers dill==0.3.4 @@ -158,20 +147,19 @@ docutils==0.17.1 # sphinx # sphinx-rtd-theme entrypoints==0.4 - # via - # altair - # jupyter-client - # nbconvert + # via altair execnet==1.9.0 # via pytest-xdist executing==0.8.3 # via stack-data -fastapi==0.74.1 +fastapi==0.75.1 # via feast (setup.py) -fastavro==1.4.9 +fastavro==1.4.10 # via # feast (setup.py) # pandavro +fastjsonschema==2.15.3 + # via nbformat filelock==3.6.0 # via virtualenv firebase-admin==4.5.2 @@ -182,12 +170,12 @@ frozenlist==1.3.0 # via # aiohttp # aiosignal -fsspec==2022.2.0 +fsspec==2022.3.0 # via # adlfs # dask # gcsfs -gcsfs==2022.2.0 +gcsfs==2022.3.0 # via feast (setup.py) google-api-core[grpc]==1.31.5 # via @@ -199,7 +187,7 @@ google-api-core[grpc]==1.31.5 # google-cloud-core # google-cloud-datastore # google-cloud-firestore -google-api-python-client==2.39.0 +google-api-python-client==2.44.0 # via firebase-admin google-auth==1.35.0 # via @@ -212,12 +200,14 @@ google-auth==1.35.0 # google-cloud-storage google-auth-httplib2==0.1.0 # via google-api-python-client -google-auth-oauthlib==0.5.0 +google-auth-oauthlib==0.5.1 # via gcsfs -google-cloud-bigquery==2.34.1 - # via feast (setup.py) -google-cloud-bigquery-storage==2.12.0 +google-cloud-bigquery==3.0.1 # via feast (setup.py) +google-cloud-bigquery-storage==2.13.1 + # via + # feast (setup.py) + # google-cloud-bigquery google-cloud-core==1.7.2 # via # feast (setup.py) @@ -225,9 +215,9 @@ google-cloud-core==1.7.2 # google-cloud-datastore # google-cloud-firestore # google-cloud-storage -google-cloud-datastore==2.5.0 +google-cloud-datastore==2.5.1 # via feast (setup.py) -google-cloud-firestore==2.3.4 +google-cloud-firestore==2.4.0 # via firebase-admin google-cloud-storage==1.40.0 # via @@ -245,7 +235,7 @@ googleapis-common-protos==1.52.0 # feast (setup.py) # google-api-core # tensorflow-metadata -great-expectations==0.14.8 +great-expectations==0.14.13 # via feast (setup.py) grpcio==1.44.0 # via @@ -269,9 +259,9 @@ httplib2==0.20.4 # via # google-api-python-client # google-auth-httplib2 -httptools==0.3.0 +httptools==0.4.0 # via uvicorn -identify==2.4.11 +identify==2.4.12 # via pre-commit idna==3.3 # via @@ -281,26 +271,11 @@ idna==3.3 # yarl imagesize==1.3.0 # via sphinx -importlib-metadata==4.11.2 +importlib-metadata==4.11.3 # via great-expectations -importlib-resources==5.4.0 - # via jsonschema iniconfig==1.1.1 # via pytest -ipykernel==6.9.1 - # via - # ipywidgets - # notebook -ipython==8.1.1 - # via - # ipykernel - # ipywidgets -ipython-genutils==0.2.0 - # via - # ipywidgets - # nbformat - # notebook -ipywidgets==7.6.5 +ipython==8.2.0 # via great-expectations isodate==0.6.1 # via msrest @@ -314,16 +289,14 @@ jinja2==3.0.3 # feast (setup.py) # great-expectations # moto - # nbconvert - # notebook # sphinx -jmespath==0.10.0 +jmespath==1.0.0 # via # boto3 # botocore jsonpatch==1.32 # via great-expectations -jsonpointer==2.2 +jsonpointer==2.3 # via jsonpatch jsonschema==4.4.0 # via @@ -331,44 +304,27 @@ jsonschema==4.4.0 # feast (setup.py) # great-expectations # nbformat -jupyter-client==7.1.2 - # via - # ipykernel - # nbclient - # notebook jupyter-core==4.9.2 - # via - # jupyter-client - # nbconvert - # nbformat - # notebook -jupyterlab-pygments==0.1.2 - # via nbconvert -jupyterlab-widgets==1.0.2 - # via ipywidgets + # via nbformat locket==0.2.1 # via partd -markupsafe==2.1.0 +markupsafe==2.1.1 # via # jinja2 # moto matplotlib-inline==0.1.3 - # via - # ipykernel - # ipython + # via ipython mccabe==0.6.1 # via flake8 minio==7.1.0 # via feast (setup.py) -mistune==0.8.4 - # via - # great-expectations - # nbconvert +mistune==2.0.2 + # via great-expectations mmh3==3.0.0 # via feast (setup.py) mock==2.0.0 # via feast (setup.py) -moto==3.0.5 +moto==3.1.4 # via feast (setup.py) msal==1.17.0 # via @@ -392,29 +348,13 @@ mypy==0.931 # via feast (setup.py) mypy-extensions==0.4.3 # via mypy -mypy-protobuf==3.1.0 - # via feast (setup.py) -nbclient==0.5.11 - # via nbconvert -nbconvert==6.4.2 - # via notebook -nbformat==5.1.3 - # via - # ipywidgets - # nbclient - # nbconvert - # notebook -nest-asyncio==1.5.4 - # via - # ipykernel - # jupyter-client - # nbclient - # notebook +mypy-protobuf==3.1 + # via feast (setup.py) +nbformat==5.3.0 + # via great-expectations nodeenv==1.6.0 # via pre-commit -notebook==6.4.10 - # via widgetsnbextension -numpy==1.22.2 +numpy==1.22.3 # via # altair # great-expectations @@ -424,16 +364,15 @@ numpy==1.22.2 # scipy oauthlib==3.2.0 # via requests-oauthlib -oscrypto==1.2.1 +oscrypto==1.3.0 # via snowflake-connector-python packaging==21.3 # via - # bleach # dask # deprecation # google-api-core # google-cloud-bigquery - # google-cloud-firestore + # great-expectations # pytest # sphinx pandas==1.3.5 @@ -445,8 +384,6 @@ pandas==1.3.5 # snowflake-connector-python pandavro==1.5.2 # via feast (setup.py) -pandocfilters==1.5.0 - # via nbconvert parso==0.8.3 # via jedi partd==1.2.0 @@ -461,7 +398,7 @@ pexpect==4.8.0 # via ipython pickleshare==0.7.5 # via ipython -pip-tools==6.5.1 +pip-tools==6.6.0 # via feast (setup.py) platformdirs==2.5.1 # via virtualenv @@ -469,11 +406,9 @@ pluggy==1.0.0 # via pytest portalocker==2.4.0 # via msal-extensions -pre-commit==2.17.0 +pre-commit==2.18.1 # via feast (setup.py) -prometheus-client==0.13.1 - # via notebook -prompt-toolkit==3.0.28 +prompt-toolkit==3.0.29 # via ipython proto-plus==1.19.6 # via @@ -497,9 +432,7 @@ protobuf==3.19.4 psutil==5.9.0 # via feast (setup.py) ptyprocess==0.7.0 - # via - # pexpect - # terminado + # via pexpect pure-eval==0.2.2 # via stack-data py==1.11.0 @@ -513,6 +446,7 @@ py4j==0.10.9.3 pyarrow==6.0.1 # via # feast (setup.py) + # google-cloud-bigquery # snowflake-connector-python pyasn1==0.4.8 # via @@ -520,7 +454,7 @@ pyasn1==0.4.8 # rsa pyasn1-modules==0.2.8 # via google-auth -pybindgen==0.22.0 +pybindgen==0.22.1 # via feast (setup.py) pycodestyle==2.8.0 # via flake8 @@ -537,8 +471,6 @@ pyflakes==2.4.0 pygments==2.11.2 # via # ipython - # jupyterlab-pygments - # nbconvert # sphinx pyjwt[crypto]==2.3.0 # via @@ -556,7 +488,7 @@ pyrsistent==0.18.1 # via jsonschema pyspark==3.2.1 # via feast (setup.py) -pytest==7.0.1 +pytest==7.1.1 # via # feast (setup.py) # pytest-benchmark @@ -589,12 +521,11 @@ python-dateutil==2.8.2 # botocore # google-cloud-bigquery # great-expectations - # jupyter-client # moto # pandas -python-dotenv==0.19.2 +python-dotenv==0.20.0 # via uvicorn -pytz==2021.3 +pytz==2022.1 # via # babel # google-api-core @@ -602,6 +533,7 @@ pytz==2021.3 # moto # pandas # snowflake-connector-python + # trino pytz-deprecation-shim==0.1.0.post0 # via tzlocal pyyaml==6.0 @@ -610,17 +542,9 @@ pyyaml==6.0 # feast (setup.py) # pre-commit # uvicorn -pyzmq==22.3.0 - # via - # jupyter-client - # notebook redis==3.5.3 - # via - # feast (setup.py) - # redis-py-cluster -redis-py-cluster==2.1.3 # via feast (setup.py) -regex==2022.3.2 +regex==2022.3.15 # via black requests==2.27.1 # via @@ -642,31 +566,28 @@ requests==2.27.1 # responses # snowflake-connector-python # sphinx + # trino requests-oauthlib==1.3.1 # via # google-auth-oauthlib # msrest -responses==0.18.0 +responses==0.20.0 # via moto rsa==4.8 # via google-auth ruamel-yaml==0.17.17 # via great-expectations -ruamel.yaml.clib==0.2.6 - # via ruamel.yaml +ruamel-yaml-clib==0.2.6 + # via ruamel-yaml s3transfer==0.5.2 # via boto3 scipy==1.8.0 # via great-expectations -send2trash==1.8.0 - # via notebook six==1.16.0 # via # absl-py - # asttokens # azure-core # azure-identity - # bleach # cryptography # google-api-core # google-auth @@ -674,7 +595,6 @@ six==1.16.0 # google-cloud-core # google-resumable-media # grpcio - # isodate # mock # msrestazure # pandavro @@ -685,7 +605,7 @@ sniffio==1.2.0 # via anyio snowballstemmer==2.2.0 # via sphinx -snowflake-connector-python[pandas]==2.7.4 +snowflake-connector-python[pandas]==2.7.6 # via feast (setup.py) sphinx==4.3.2 # via @@ -717,12 +637,8 @@ tensorflow-metadata==1.7.0 # via feast (setup.py) termcolor==1.1.0 # via great-expectations -terminado==0.13.2 - # via notebook -testcontainers==3.4.2 +testcontainers==3.5.3 # via feast (setup.py) -testpath==0.6.0 - # via nbconvert toml==0.10.2 # via # black @@ -739,49 +655,39 @@ toolz==0.11.2 # altair # dask # partd -tornado==6.1 - # via - # ipykernel - # jupyter-client - # notebook - # terminado -tqdm==4.63.0 +tqdm==4.64.0 # via # feast (setup.py) # great-expectations traitlets==5.1.1 # via - # ipykernel # ipython - # ipywidgets - # jupyter-client # jupyter-core # matplotlib-inline - # nbclient - # nbconvert # nbformat - # notebook +trino==0.312.0 + # via feast (setup.py) typed-ast==1.5.2 # via black -types-protobuf==3.19.12 +types-protobuf==3.19.15 # via # feast (setup.py) # mypy-protobuf -types-python-dateutil==2.8.9 +types-python-dateutil==2.8.10 # via feast (setup.py) -types-pytz==2021.3.5 +types-pytz==2021.3.6 # via feast (setup.py) -types-pyyaml==6.0.4 +types-pyyaml==6.0.5 # via feast (setup.py) -types-redis==4.1.17 +types-redis==4.1.19 # via feast (setup.py) -types-requests==2.27.11 +types-requests==2.27.16 # via feast (setup.py) -types-setuptools==57.4.9 +types-setuptools==57.4.12 # via feast (setup.py) -types-tabulate==0.8.5 +types-tabulate==0.8.6 # via feast (setup.py) -types-urllib3==1.26.10 +types-urllib3==1.26.11 # via types-requests typing-extensions==4.1.1 # via @@ -789,52 +695,47 @@ typing-extensions==4.1.1 # great-expectations # mypy # pydantic -tzdata==2021.5 +tzdata==2022.1 # via pytz-deprecation-shim -tzlocal==4.1 +tzlocal==4.2 # via great-expectations uritemplate==4.1.1 # via google-api-python-client -urllib3==1.26.8 +urllib3==1.26.9 # via # botocore # feast (setup.py) + # great-expectations # minio # requests # responses -uvicorn[standard]==0.17.5 +uvicorn[standard]==0.17.6 # via feast (setup.py) uvloop==0.16.0 # via uvicorn -virtualenv==20.13.2 +virtualenv==20.14.1 # via pre-commit -watchgod==0.7 +watchgod==0.8.2 # via uvicorn wcwidth==0.2.5 # via prompt-toolkit -webencodings==0.5.1 - # via bleach -websocket-client==1.3.1 +websocket-client==1.3.2 # via docker websockets==10.2 # via uvicorn -werkzeug==2.0.3 +werkzeug==2.1.1 # via moto wheel==0.37.1 # via pip-tools -widgetsnbextension==3.5.2 - # via ipywidgets -wrapt==1.13.3 +wrapt==1.14.0 # via testcontainers xmltodict==0.12.0 # via moto yarl==1.7.2 # via aiohttp -zipp==3.7.0 - # via - # importlib-metadata - # importlib-resources +zipp==3.8.0 + # via importlib-metadata # The following packages are considered to be unsafe in a requirements file: # pip -# setuptools \ No newline at end of file +# setuptools diff --git a/sdk/python/requirements/py3.9-ci-requirements.txt b/sdk/python/requirements/py3.9-ci-requirements.txt index cf228b9412..02cf886f74 100644 --- a/sdk/python/requirements/py3.9-ci-requirements.txt +++ b/sdk/python/requirements/py3.9-ci-requirements.txt @@ -23,20 +23,16 @@ alabaster==0.7.12 altair==4.2.0 # via great-expectations anyio==3.5.0 - # via starlette + # via + # starlette + # watchgod appdirs==1.4.4 # via black -appnope==0.1.2 - # via - # ipykernel - # ipython -argon2-cffi==21.3.0 - # via notebook -argon2-cffi-bindings==21.2.0 - # via argon2-cffi +appnope==0.1.3 + # via ipython asgiref==3.5.0 # via uvicorn -asn1crypto==1.4.0 +asn1crypto==1.5.1 # via # oscrypto # snowflake-connector-python @@ -54,16 +50,16 @@ attrs==21.4.0 # pytest avro==1.10.0 # via feast (setup.py) -azure-core==1.23.0 +azure-core==1.23.1 # via # adlfs # azure-identity # azure-storage-blob azure-datalake-store==0.0.52 # via adlfs -azure-identity==1.8.0 +azure-identity==1.9.0 # via adlfs -azure-storage-blob==12.9.0 +azure-storage-blob==12.11.0 # via adlfs babel==2.9.1 # via sphinx @@ -71,13 +67,11 @@ backcall==0.2.0 # via ipython black==19.10b0 # via feast (setup.py) -bleach==4.1.0 - # via nbconvert -boto3==1.21.11 +boto3==1.21.41 # via # feast (setup.py) # moto -botocore==1.24.11 +botocore==1.24.41 # via # boto3 # moto @@ -94,7 +88,6 @@ certifi==2021.10.8 # snowflake-connector-python cffi==1.15.0 # via - # argon2-cffi-bindings # azure-datalake-store # cryptography # snowflake-connector-python @@ -105,7 +98,7 @@ charset-normalizer==2.0.12 # aiohttp # requests # snowflake-connector-python -click==8.0.4 +click==8.1.2 # via # black # feast (setup.py) @@ -115,30 +108,30 @@ click==8.0.4 cloudpickle==2.0.0 # via dask colorama==0.4.4 - # via feast (setup.py) + # via + # feast (setup.py) + # great-expectations coverage[toml]==6.3.2 # via pytest-cov -cryptography==3.3.2 +cryptography==3.4.8 # via # adal # azure-identity # azure-storage-blob # feast (setup.py) + # great-expectations # moto # msal - # pyjwt # pyopenssl # snowflake-connector-python dask==2022.1.1 # via feast (setup.py) -debugpy==1.5.1 - # via ipykernel +dataclasses==0.6 + # via great-expectations decorator==5.1.1 # via # gcsfs # ipython -defusedxml==0.7.1 - # via nbconvert deprecation==2.1.0 # via testcontainers dill==0.3.4 @@ -154,20 +147,19 @@ docutils==0.17.1 # sphinx # sphinx-rtd-theme entrypoints==0.4 - # via - # altair - # jupyter-client - # nbconvert + # via altair execnet==1.9.0 # via pytest-xdist executing==0.8.3 # via stack-data -fastapi==0.74.1 +fastapi==0.75.1 # via feast (setup.py) -fastavro==1.4.9 +fastavro==1.4.10 # via # feast (setup.py) # pandavro +fastjsonschema==2.15.3 + # via nbformat filelock==3.6.0 # via virtualenv firebase-admin==4.5.2 @@ -178,12 +170,12 @@ frozenlist==1.3.0 # via # aiohttp # aiosignal -fsspec==2022.2.0 +fsspec==2022.3.0 # via # adlfs # dask # gcsfs -gcsfs==2022.2.0 +gcsfs==2022.3.0 # via feast (setup.py) google-api-core[grpc]==1.31.5 # via @@ -195,7 +187,7 @@ google-api-core[grpc]==1.31.5 # google-cloud-core # google-cloud-datastore # google-cloud-firestore -google-api-python-client==2.39.0 +google-api-python-client==2.44.0 # via firebase-admin google-auth==1.35.0 # via @@ -208,12 +200,14 @@ google-auth==1.35.0 # google-cloud-storage google-auth-httplib2==0.1.0 # via google-api-python-client -google-auth-oauthlib==0.5.0 +google-auth-oauthlib==0.5.1 # via gcsfs -google-cloud-bigquery==2.34.1 - # via feast (setup.py) -google-cloud-bigquery-storage==2.12.0 +google-cloud-bigquery==3.0.1 # via feast (setup.py) +google-cloud-bigquery-storage==2.13.1 + # via + # feast (setup.py) + # google-cloud-bigquery google-cloud-core==1.7.2 # via # feast (setup.py) @@ -221,9 +215,9 @@ google-cloud-core==1.7.2 # google-cloud-datastore # google-cloud-firestore # google-cloud-storage -google-cloud-datastore==2.5.0 +google-cloud-datastore==2.5.1 # via feast (setup.py) -google-cloud-firestore==2.3.4 +google-cloud-firestore==2.4.0 # via firebase-admin google-cloud-storage==1.40.0 # via @@ -241,7 +235,7 @@ googleapis-common-protos==1.52.0 # feast (setup.py) # google-api-core # tensorflow-metadata -great-expectations==0.14.8 +great-expectations==0.14.13 # via feast (setup.py) grpcio==1.44.0 # via @@ -265,9 +259,9 @@ httplib2==0.20.4 # via # google-api-python-client # google-auth-httplib2 -httptools==0.3.0 +httptools==0.4.0 # via uvicorn -identify==2.4.11 +identify==2.4.12 # via pre-commit idna==3.3 # via @@ -277,24 +271,11 @@ idna==3.3 # yarl imagesize==1.3.0 # via sphinx -importlib-metadata==4.11.2 +importlib-metadata==4.11.3 # via great-expectations iniconfig==1.1.1 # via pytest -ipykernel==6.9.1 - # via - # ipywidgets - # notebook -ipython==8.1.1 - # via - # ipykernel - # ipywidgets -ipython-genutils==0.2.0 - # via - # ipywidgets - # nbformat - # notebook -ipywidgets==7.6.5 +ipython==8.2.0 # via great-expectations isodate==0.6.1 # via msrest @@ -308,16 +289,14 @@ jinja2==3.0.3 # feast (setup.py) # great-expectations # moto - # nbconvert - # notebook # sphinx -jmespath==0.10.0 +jmespath==1.0.0 # via # boto3 # botocore jsonpatch==1.32 # via great-expectations -jsonpointer==2.2 +jsonpointer==2.3 # via jsonpatch jsonschema==4.4.0 # via @@ -325,44 +304,27 @@ jsonschema==4.4.0 # feast (setup.py) # great-expectations # nbformat -jupyter-client==7.1.2 - # via - # ipykernel - # nbclient - # notebook jupyter-core==4.9.2 - # via - # jupyter-client - # nbconvert - # nbformat - # notebook -jupyterlab-pygments==0.1.2 - # via nbconvert -jupyterlab-widgets==1.0.2 - # via ipywidgets + # via nbformat locket==0.2.1 # via partd -markupsafe==2.1.0 +markupsafe==2.1.1 # via # jinja2 # moto matplotlib-inline==0.1.3 - # via - # ipykernel - # ipython + # via ipython mccabe==0.6.1 # via flake8 minio==7.1.0 # via feast (setup.py) -mistune==0.8.4 - # via - # great-expectations - # nbconvert +mistune==2.0.2 + # via great-expectations mmh3==3.0.0 # via feast (setup.py) mock==2.0.0 # via feast (setup.py) -moto==3.0.5 +moto==3.1.4 # via feast (setup.py) msal==1.17.0 # via @@ -386,29 +348,13 @@ mypy==0.931 # via feast (setup.py) mypy-extensions==0.4.3 # via mypy -mypy-protobuf==3.1.0 - # via feast (setup.py) -nbclient==0.5.11 - # via nbconvert -nbconvert==6.4.2 - # via notebook -nbformat==5.1.3 - # via - # ipywidgets - # nbclient - # nbconvert - # notebook -nest-asyncio==1.5.4 - # via - # ipykernel - # jupyter-client - # nbclient - # notebook +mypy-protobuf==3.1 + # via feast (setup.py) +nbformat==5.3.0 + # via great-expectations nodeenv==1.6.0 # via pre-commit -notebook==6.4.10 - # via widgetsnbextension -numpy==1.22.2 +numpy==1.22.3 # via # altair # great-expectations @@ -418,16 +364,15 @@ numpy==1.22.2 # scipy oauthlib==3.2.0 # via requests-oauthlib -oscrypto==1.2.1 +oscrypto==1.3.0 # via snowflake-connector-python packaging==21.3 # via - # bleach # dask # deprecation # google-api-core # google-cloud-bigquery - # google-cloud-firestore + # great-expectations # pytest # sphinx pandas==1.3.5 @@ -439,8 +384,6 @@ pandas==1.3.5 # snowflake-connector-python pandavro==1.5.2 # via feast (setup.py) -pandocfilters==1.5.0 - # via nbconvert parso==0.8.3 # via jedi partd==1.2.0 @@ -455,7 +398,7 @@ pexpect==4.8.0 # via ipython pickleshare==0.7.5 # via ipython -pip-tools==6.5.1 +pip-tools==6.6.0 # via feast (setup.py) platformdirs==2.5.1 # via virtualenv @@ -463,11 +406,9 @@ pluggy==1.0.0 # via pytest portalocker==2.4.0 # via msal-extensions -pre-commit==2.17.0 +pre-commit==2.18.1 # via feast (setup.py) -prometheus-client==0.13.1 - # via notebook -prompt-toolkit==3.0.28 +prompt-toolkit==3.0.29 # via ipython proto-plus==1.19.6 # via @@ -491,9 +432,7 @@ protobuf==3.19.4 psutil==5.9.0 # via feast (setup.py) ptyprocess==0.7.0 - # via - # pexpect - # terminado + # via pexpect pure-eval==0.2.2 # via stack-data py==1.11.0 @@ -507,6 +446,7 @@ py4j==0.10.9.3 pyarrow==6.0.1 # via # feast (setup.py) + # google-cloud-bigquery # snowflake-connector-python pyasn1==0.4.8 # via @@ -514,7 +454,7 @@ pyasn1==0.4.8 # rsa pyasn1-modules==0.2.8 # via google-auth -pybindgen==0.22.0 +pybindgen==0.22.1 # via feast (setup.py) pycodestyle==2.8.0 # via flake8 @@ -531,8 +471,6 @@ pyflakes==2.4.0 pygments==2.11.2 # via # ipython - # jupyterlab-pygments - # nbconvert # sphinx pyjwt[crypto]==2.3.0 # via @@ -550,7 +488,7 @@ pyrsistent==0.18.1 # via jsonschema pyspark==3.2.1 # via feast (setup.py) -pytest==7.0.1 +pytest==7.1.1 # via # feast (setup.py) # pytest-benchmark @@ -583,12 +521,11 @@ python-dateutil==2.8.2 # botocore # google-cloud-bigquery # great-expectations - # jupyter-client # moto # pandas -python-dotenv==0.19.2 +python-dotenv==0.20.0 # via uvicorn -pytz==2021.3 +pytz==2022.1 # via # babel # google-api-core @@ -596,6 +533,7 @@ pytz==2021.3 # moto # pandas # snowflake-connector-python + # trino pytz-deprecation-shim==0.1.0.post0 # via tzlocal pyyaml==6.0 @@ -604,17 +542,9 @@ pyyaml==6.0 # feast (setup.py) # pre-commit # uvicorn -pyzmq==22.3.0 - # via - # jupyter-client - # notebook redis==3.5.3 - # via - # feast (setup.py) - # redis-py-cluster -redis-py-cluster==2.1.3 # via feast (setup.py) -regex==2022.3.2 +regex==2022.3.15 # via black requests==2.27.1 # via @@ -636,39 +566,34 @@ requests==2.27.1 # responses # snowflake-connector-python # sphinx + # trino requests-oauthlib==1.3.1 # via # google-auth-oauthlib # msrest -responses==0.18.0 +responses==0.20.0 # via moto rsa==4.8 # via google-auth -ruamel.yaml==0.17.17 +ruamel-yaml==0.17.17 # via great-expectations -ruamel.yaml.clib==0.2.6 - # via ruamel.yaml +ruamel-yaml-clib==0.2.6 + # via ruamel-yaml s3transfer==0.5.2 # via boto3 scipy==1.8.0 # via great-expectations -send2trash==1.8.0 - # via notebook six==1.16.0 # via # absl-py - # asttokens # azure-core # azure-identity - # bleach - # cryptography # google-api-core # google-auth # google-auth-httplib2 # google-cloud-core # google-resumable-media # grpcio - # isodate # mock # msrestazure # pandavro @@ -679,7 +604,7 @@ sniffio==1.2.0 # via anyio snowballstemmer==2.2.0 # via sphinx -snowflake-connector-python[pandas]==2.7.4 +snowflake-connector-python[pandas]==2.7.6 # via feast (setup.py) sphinx==4.3.2 # via @@ -711,12 +636,8 @@ tensorflow-metadata==1.7.0 # via feast (setup.py) termcolor==1.1.0 # via great-expectations -terminado==0.13.2 - # via notebook -testcontainers==3.4.2 +testcontainers==3.5.3 # via feast (setup.py) -testpath==0.6.0 - # via nbconvert toml==0.10.2 # via # black @@ -733,49 +654,39 @@ toolz==0.11.2 # altair # dask # partd -tornado==6.1 - # via - # ipykernel - # jupyter-client - # notebook - # terminado -tqdm==4.63.0 +tqdm==4.64.0 # via # feast (setup.py) # great-expectations traitlets==5.1.1 # via - # ipykernel # ipython - # ipywidgets - # jupyter-client # jupyter-core # matplotlib-inline - # nbclient - # nbconvert # nbformat - # notebook +trino==0.312.0 + # via feast (setup.py) typed-ast==1.5.2 # via black -types-protobuf==3.19.12 +types-protobuf==3.19.15 # via # feast (setup.py) # mypy-protobuf -types-python-dateutil==2.8.9 +types-python-dateutil==2.8.10 # via feast (setup.py) -types-pytz==2021.3.5 +types-pytz==2021.3.6 # via feast (setup.py) -types-pyyaml==6.0.4 +types-pyyaml==6.0.5 # via feast (setup.py) -types-redis==4.1.17 +types-redis==4.1.19 # via feast (setup.py) -types-requests==2.27.11 +types-requests==2.27.16 # via feast (setup.py) -types-setuptools==57.4.9 +types-setuptools==57.4.12 # via feast (setup.py) -types-tabulate==0.8.5 +types-tabulate==0.8.6 # via feast (setup.py) -types-urllib3==1.26.10 +types-urllib3==1.26.11 # via types-requests typing-extensions==4.1.1 # via @@ -783,48 +694,45 @@ typing-extensions==4.1.1 # great-expectations # mypy # pydantic -tzdata==2021.5 +tzdata==2022.1 # via pytz-deprecation-shim -tzlocal==4.1 +tzlocal==4.2 # via great-expectations uritemplate==4.1.1 # via google-api-python-client -urllib3==1.26.8 +urllib3==1.26.9 # via # botocore # feast (setup.py) + # great-expectations # minio # requests # responses -uvicorn[standard]==0.17.5 +uvicorn[standard]==0.17.6 # via feast (setup.py) uvloop==0.16.0 # via uvicorn -virtualenv==20.13.2 +virtualenv==20.14.1 # via pre-commit -watchgod==0.7 +watchgod==0.8.2 # via uvicorn wcwidth==0.2.5 # via prompt-toolkit -webencodings==0.5.1 - # via bleach -websocket-client==1.3.1 +websocket-client==1.3.2 # via docker websockets==10.2 # via uvicorn -werkzeug==2.0.3 +werkzeug==2.1.1 # via moto wheel==0.37.1 # via pip-tools -widgetsnbextension==3.5.2 - # via ipywidgets -wrapt==1.13.3 +wrapt==1.14.0 # via testcontainers xmltodict==0.12.0 # via moto yarl==1.7.2 # via aiohttp -zipp==3.7.0 +zipp==3.8.0 # via importlib-metadata # The following packages are considered to be unsafe in a requirements file: diff --git a/sdk/python/requirements/py3.9-requirements.txt b/sdk/python/requirements/py3.9-requirements.txt index 67ef8ada9e..6413886c5b 100644 --- a/sdk/python/requirements/py3.9-requirements.txt +++ b/sdk/python/requirements/py3.9-requirements.txt @@ -7,18 +7,20 @@ absl-py==1.0.0 # via tensorflow-metadata anyio==3.5.0 - # via starlette -asgiref==3.4.1 + # via + # starlette + # watchgod +asgiref==3.5.0 # via uvicorn attrs==21.4.0 # via jsonschema -cachetools==4.2.4 +cachetools==5.0.0 # via google-auth certifi==2021.10.8 # via requests -charset-normalizer==2.0.10 +charset-normalizer==2.0.12 # via requests -click==8.0.3 +click==8.1.2 # via # feast (setup.py) # uvicorn @@ -30,55 +32,55 @@ dask==2022.1.1 # via feast (setup.py) dill==0.3.4 # via feast (setup.py) -fastapi==0.72.0 +fastapi==0.75.1 # via feast (setup.py) -fastavro==1.4.9 +fastavro==1.4.10 # via # feast (setup.py) # pandavro -fsspec==2022.2.0 +fsspec==2022.3.0 # via dask -google-api-core==2.4.0 +google-api-core==2.7.2 # via feast (setup.py) -google-auth==2.3.3 +google-auth==2.6.5 # via google-api-core googleapis-common-protos==1.52.0 # via # feast (setup.py) # google-api-core # tensorflow-metadata -grpcio==1.43.0 +grpcio==1.44.0 # via # feast (setup.py) # grpcio-reflection -grpcio-reflection==1.43.0 +grpcio-reflection==1.44.0 # via feast (setup.py) h11==0.13.0 # via uvicorn -httptools==0.3.0 +httptools==0.4.0 # via uvicorn idna==3.3 # via # anyio # requests -jinja2==3.0.3 +jinja2==3.1.1 # via feast (setup.py) jsonschema==4.4.0 # via feast (setup.py) locket==0.2.1 # via partd -markupsafe==2.0.1 +markupsafe==2.1.1 # via jinja2 mmh3==3.0.0 # via feast (setup.py) -numpy==1.21.5 +numpy==1.22.3 # via # pandas # pandavro # pyarrow packaging==21.3 # via dask -pandas==1.3.5 +pandas==1.4.2 # via # feast (setup.py) # pandavro @@ -88,7 +90,7 @@ partd==1.2.0 # via dask proto-plus==1.19.6 # via feast (setup.py) -protobuf==3.19.3 +protobuf==3.19.4 # via # feast (setup.py) # google-api-core @@ -96,7 +98,7 @@ protobuf==3.19.3 # grpcio-reflection # proto-plus # tensorflow-metadata -pyarrow==6.0.1 +pyarrow==7.0.0 # via feast (setup.py) pyasn1==0.4.8 # via @@ -108,15 +110,15 @@ pydantic==1.9.0 # via # fastapi # feast (setup.py) -pyparsing==3.0.7 +pyparsing==3.0.8 # via packaging pyrsistent==0.18.1 # via jsonschema python-dateutil==2.8.2 # via pandas -python-dotenv==0.19.2 +python-dotenv==0.20.0 # via uvicorn -pytz==2021.3 +pytz==2022.1 # via pandas pyyaml==6.0 # via @@ -142,7 +144,7 @@ tabulate==0.8.9 # via feast (setup.py) tenacity==8.0.1 # via feast (setup.py) -tensorflow-metadata==1.6.0 +tensorflow-metadata==1.7.0 # via feast (setup.py) toml==0.10.2 # via feast (setup.py) @@ -150,20 +152,17 @@ toolz==0.11.2 # via # dask # partd -tqdm==4.62.3 +tqdm==4.64.0 # via feast (setup.py) -typing-extensions==4.0.1 +typing-extensions==4.1.1 # via pydantic -urllib3==1.26.8 +urllib3==1.26.9 # via requests -uvicorn[standard]==0.17.0 +uvicorn[standard]==0.17.6 # via feast (setup.py) uvloop==0.16.0 # via uvicorn -watchgod==0.7 +watchgod==0.8.2 # via uvicorn -websockets==10.1 +websockets==10.2 # via uvicorn - -# The following packages are considered to be unsafe in a requirements file: -# setuptools diff --git a/sdk/python/setup.py b/sdk/python/setup.py index dbecd26e2b..e68c218f04 100644 --- a/sdk/python/setup.py +++ b/sdk/python/setup.py @@ -68,7 +68,7 @@ "uvicorn[standard]>=0.14.0", "proto-plus<1.19.7", "tensorflow-metadata>=1.0.0,<2.0.0", - "dask>=2021.*,<2022.02.0", + "dask>=2021.*,<2022.4.0", ] GCP_REQUIRED = [ @@ -81,7 +81,6 @@ REDIS_REQUIRED = [ "redis==3.5.3", - "redis-py-cluster>=2.1.3", "hiredis>=2.0.0", ] @@ -108,7 +107,7 @@ CI_REQUIRED = ( [ - "cryptography==3.3.2", + "cryptography==3.4.8", "flake8", "black==19.10b0", "isort>=5", From 0109b61c357d516d6ed3b91c438a458886042f32 Mon Sep 17 00:00:00 2001 From: Kevin Zhang Date: Fri, 15 Apr 2022 09:59:23 -0700 Subject: [PATCH 3/9] Fix Signed-off-by: Kevin Zhang --- .../requirements/py3.8-requirements.txt | 69 +++++++++---------- 1 file changed, 34 insertions(+), 35 deletions(-) diff --git a/sdk/python/requirements/py3.8-requirements.txt b/sdk/python/requirements/py3.8-requirements.txt index 4b996ef075..41468ac8eb 100644 --- a/sdk/python/requirements/py3.8-requirements.txt +++ b/sdk/python/requirements/py3.8-requirements.txt @@ -7,18 +7,20 @@ absl-py==1.0.0 # via tensorflow-metadata anyio==3.5.0 - # via starlette -asgiref==3.4.1 + # via + # starlette + # watchgod +asgiref==3.5.0 # via uvicorn attrs==21.4.0 # via jsonschema -cachetools==4.2.4 +cachetools==5.0.0 # via google-auth certifi==2021.10.8 # via requests -charset-normalizer==2.0.10 +charset-normalizer==2.0.12 # via requests -click==8.0.3 +click==8.1.2 # via # feast (setup.py) # uvicorn @@ -26,61 +28,61 @@ cloudpickle==2.0.0 # via dask colorama==0.4.4 # via feast (setup.py) -dask==2022.1.1 +dask==2022.3.0 # via feast (setup.py) dill==0.3.4 # via feast (setup.py) -fastapi==0.72.0 +fastapi==0.75.1 # via feast (setup.py) -fastavro==1.4.9 +fastavro==1.4.10 # via # feast (setup.py) # pandavro -fsspec==2022.2.0 +fsspec==2022.3.0 # via dask -google-api-core==2.4.0 +google-api-core==2.7.2 # via feast (setup.py) -google-auth==2.3.3 +google-auth==2.6.5 # via google-api-core googleapis-common-protos==1.52.0 # via # feast (setup.py) # google-api-core # tensorflow-metadata -grpcio==1.43.0 +grpcio==1.44.0 # via # feast (setup.py) # grpcio-reflection -grpcio-reflection==1.43.0 +grpcio-reflection==1.44.0 # via feast (setup.py) h11==0.13.0 # via uvicorn -httptools==0.3.0 +httptools==0.4.0 # via uvicorn idna==3.3 # via # anyio # requests -importlib-resources==5.4.0 +importlib-resources==5.7.0 # via jsonschema -jinja2==3.0.3 +jinja2==3.1.1 # via feast (setup.py) jsonschema==4.4.0 # via feast (setup.py) locket==0.2.1 # via partd -markupsafe==2.0.1 +markupsafe==2.1.1 # via jinja2 mmh3==3.0.0 # via feast (setup.py) -numpy==1.21.5 +numpy==1.22.3 # via # pandas # pandavro # pyarrow packaging==21.3 # via dask -pandas==1.3.5 +pandas==1.4.2 # via # feast (setup.py) # pandavro @@ -90,7 +92,7 @@ partd==1.2.0 # via dask proto-plus==1.19.6 # via feast (setup.py) -protobuf==3.19.3 +protobuf==3.19.4 # via # feast (setup.py) # google-api-core @@ -98,7 +100,7 @@ protobuf==3.19.3 # grpcio-reflection # proto-plus # tensorflow-metadata -pyarrow==6.0.1 +pyarrow==7.0.0 # via feast (setup.py) pyasn1==0.4.8 # via @@ -110,15 +112,15 @@ pydantic==1.9.0 # via # fastapi # feast (setup.py) -pyparsing==3.0.7 +pyparsing==3.0.8 # via packaging pyrsistent==0.18.1 # via jsonschema python-dateutil==2.8.2 # via pandas -python-dotenv==0.19.2 +python-dotenv==0.20.0 # via uvicorn -pytz==2021.3 +pytz==2022.1 # via pandas pyyaml==6.0 # via @@ -144,7 +146,7 @@ tabulate==0.8.9 # via feast (setup.py) tenacity==8.0.1 # via feast (setup.py) -tensorflow-metadata==1.6.0 +tensorflow-metadata==1.7.0 # via feast (setup.py) toml==0.10.2 # via feast (setup.py) @@ -152,22 +154,19 @@ toolz==0.11.2 # via # dask # partd -tqdm==4.62.3 +tqdm==4.64.0 # via feast (setup.py) -typing-extensions==4.0.1 +typing-extensions==4.1.1 # via pydantic -urllib3==1.26.8 +urllib3==1.26.9 # via requests -uvicorn[standard]==0.17.0 +uvicorn[standard]==0.17.6 # via feast (setup.py) uvloop==0.16.0 # via uvicorn -watchgod==0.7 +watchgod==0.8.2 # via uvicorn -websockets==10.1 +websockets==10.2 # via uvicorn -zipp==3.7.0 +zipp==3.8.0 # via importlib-resources - -# The following packages are considered to be unsafe in a requirements file: -# setuptools From aec9c2845cec0fb334cd4283126332ad26aa0268 Mon Sep 17 00:00:00 2001 From: Kevin Zhang Date: Fri, 15 Apr 2022 10:18:17 -0700 Subject: [PATCH 4/9] Fix dependencies Signed-off-by: Kevin Zhang --- .../requirements/py3.8-ci-requirements.txt | 28 ++++++++++++++----- .../requirements/py3.8-requirements.txt | 2 +- .../requirements/py3.9-ci-requirements.txt | 13 +++++++-- sdk/python/setup.py | 4 +-- 4 files changed, 34 insertions(+), 13 deletions(-) diff --git a/sdk/python/requirements/py3.8-ci-requirements.txt b/sdk/python/requirements/py3.8-ci-requirements.txt index bf5c53aabd..92a7f5dabe 100644 --- a/sdk/python/requirements/py3.8-ci-requirements.txt +++ b/sdk/python/requirements/py3.8-ci-requirements.txt @@ -1,5 +1,5 @@ # -# This file is autogenerated by pip-compile with python 3.9 +# This file is autogenerated by pip-compile with python 3.8 # To update, run: # # pip-compile --extra=ci --output-file=requirements/py3.8-ci-requirements.txt @@ -41,7 +41,9 @@ assertpy==1.1 asttokens==2.0.5 # via stack-data async-timeout==4.0.2 - # via aiohttp + # via + # aiohttp + # redis attrs==21.4.0 # via # aiohttp @@ -65,6 +67,10 @@ babel==2.9.1 # via sphinx backcall==0.2.0 # via ipython +backports-zoneinfo==0.2.1 + # via + # pytz-deprecation-shim + # tzlocal black==19.10b0 # via feast (setup.py) boto3==1.21.41 @@ -113,7 +119,7 @@ colorama==0.4.4 # great-expectations coverage[toml]==6.3.2 # via pytest-cov -cryptography==3.3.2 +cryptography==3.4.8 # via # adal # azure-identity @@ -132,6 +138,8 @@ decorator==5.1.1 # via # gcsfs # ipython +deprecated==1.2.13 + # via redis deprecation==2.1.0 # via testcontainers dill==0.3.4 @@ -273,6 +281,8 @@ imagesize==1.3.0 # via sphinx importlib-metadata==4.11.3 # via great-expectations +importlib-resources==5.7.0 + # via jsonschema iniconfig==1.1.1 # via pytest ipython==8.2.0 @@ -374,6 +384,7 @@ packaging==21.3 # google-cloud-bigquery # great-expectations # pytest + # redis # sphinx pandas==1.3.5 # via @@ -542,7 +553,7 @@ pyyaml==6.0 # feast (setup.py) # pre-commit # uvicorn -redis==3.5.3 +redis==4.2.2 # via feast (setup.py) regex==2022.3.15 # via black @@ -588,7 +599,6 @@ six==1.16.0 # absl-py # azure-core # azure-identity - # cryptography # google-api-core # google-auth # google-auth-httplib2 @@ -728,13 +738,17 @@ werkzeug==2.1.1 wheel==0.37.1 # via pip-tools wrapt==1.14.0 - # via testcontainers + # via + # deprecated + # testcontainers xmltodict==0.12.0 # via moto yarl==1.7.2 # via aiohttp zipp==3.8.0 - # via importlib-metadata + # via + # importlib-metadata + # importlib-resources # The following packages are considered to be unsafe in a requirements file: # pip diff --git a/sdk/python/requirements/py3.8-requirements.txt b/sdk/python/requirements/py3.8-requirements.txt index 41468ac8eb..9000c7b1f7 100644 --- a/sdk/python/requirements/py3.8-requirements.txt +++ b/sdk/python/requirements/py3.8-requirements.txt @@ -28,7 +28,7 @@ cloudpickle==2.0.0 # via dask colorama==0.4.4 # via feast (setup.py) -dask==2022.3.0 +dask==2022.1.1 # via feast (setup.py) dill==0.3.4 # via feast (setup.py) diff --git a/sdk/python/requirements/py3.9-ci-requirements.txt b/sdk/python/requirements/py3.9-ci-requirements.txt index 02cf886f74..bdbd1de4df 100644 --- a/sdk/python/requirements/py3.9-ci-requirements.txt +++ b/sdk/python/requirements/py3.9-ci-requirements.txt @@ -41,7 +41,9 @@ assertpy==1.1 asttokens==2.0.5 # via stack-data async-timeout==4.0.2 - # via aiohttp + # via + # aiohttp + # redis attrs==21.4.0 # via # aiohttp @@ -132,6 +134,8 @@ decorator==5.1.1 # via # gcsfs # ipython +deprecated==1.2.13 + # via redis deprecation==2.1.0 # via testcontainers dill==0.3.4 @@ -374,6 +378,7 @@ packaging==21.3 # google-cloud-bigquery # great-expectations # pytest + # redis # sphinx pandas==1.3.5 # via @@ -542,7 +547,7 @@ pyyaml==6.0 # feast (setup.py) # pre-commit # uvicorn -redis==3.5.3 +redis==4.2.2 # via feast (setup.py) regex==2022.3.15 # via black @@ -727,7 +732,9 @@ werkzeug==2.1.1 wheel==0.37.1 # via pip-tools wrapt==1.14.0 - # via testcontainers + # via + # deprecated + # testcontainers xmltodict==0.12.0 # via moto yarl==1.7.2 diff --git a/sdk/python/setup.py b/sdk/python/setup.py index e68c218f04..e24ea6e169 100644 --- a/sdk/python/setup.py +++ b/sdk/python/setup.py @@ -68,7 +68,7 @@ "uvicorn[standard]>=0.14.0", "proto-plus<1.19.7", "tensorflow-metadata>=1.0.0,<2.0.0", - "dask>=2021.*,<2022.4.0", + "dask>=2021.*,<2022.02.0", ] GCP_REQUIRED = [ @@ -80,7 +80,7 @@ ] REDIS_REQUIRED = [ - "redis==3.5.3", + "redis==4.2.2", "hiredis>=2.0.0", ] From 07e2e59f49d2210322d026f62d5717032d4cc5f5 Mon Sep 17 00:00:00 2001 From: Felix Wang Date: Fri, 15 Apr 2022 10:29:44 -0700 Subject: [PATCH 5/9] Update py3.7-ci-requirements.txt Signed-off-by: Felix Wang --- .../requirements/py3.7-ci-requirements.txt | 28 ++++++++++++------- 1 file changed, 18 insertions(+), 10 deletions(-) diff --git a/sdk/python/requirements/py3.7-ci-requirements.txt b/sdk/python/requirements/py3.7-ci-requirements.txt index 4ec4bde7c4..224840a6f7 100644 --- a/sdk/python/requirements/py3.7-ci-requirements.txt +++ b/sdk/python/requirements/py3.7-ci-requirements.txt @@ -43,7 +43,9 @@ asn1crypto==1.4.0 assertpy==1.1 # via feast (setup.py) async-timeout==4.0.2 - # via aiohttp + # via + # aiohttp + # redis asynctest==0.13.0 # via aiohttp attrs==21.4.0 @@ -122,7 +124,7 @@ colorama==0.4.4 # via feast (setup.py) coverage[toml]==6.3.2 # via pytest-cov -cryptography==3.3.2 +cryptography==3.4.8 # via # adal # azure-identity @@ -143,6 +145,8 @@ decorator==5.1.1 # ipython defusedxml==0.7.1 # via nbconvert +deprecated==1.2.13 + # via redis deprecation==2.1.0 # via testcontainers dill==0.3.4 @@ -290,6 +294,7 @@ importlib-metadata==4.2.0 # pluggy # pre-commit # pytest + # redis # virtualenv importlib-resources==5.4.0 # via jsonschema @@ -443,6 +448,7 @@ packaging==21.3 # google-cloud-bigquery # google-cloud-firestore # pytest + # redis # sphinx pandas==1.3.5 # via @@ -608,6 +614,7 @@ pytz==2021.3 # moto # pandas # snowflake-connector-python + # trino pytz-deprecation-shim==0.1.0.post0 # via tzlocal pyyaml==6.0 @@ -620,11 +627,7 @@ pyzmq==22.3.0 # via # jupyter-client # notebook -redis==3.5.3 - # via - # feast (setup.py) - # redis-py-cluster -redis-py-cluster==2.1.3 +redis==4.2.2 # via feast (setup.py) regex==2022.3.2 # via black @@ -648,6 +651,7 @@ requests==2.27.1 # responses # snowflake-connector-python # sphinx + # trino requests-oauthlib==1.3.1 # via # google-auth-oauthlib @@ -672,7 +676,6 @@ six==1.16.0 # azure-core # azure-identity # bleach - # cryptography # google-api-core # google-auth # google-auth-httplib2 @@ -722,7 +725,7 @@ termcolor==1.1.0 # via great-expectations terminado==0.13.2 # via notebook -testcontainers==3.4.2 +testcontainers==3.5.3 # via feast (setup.py) testpath==0.6.0 # via nbconvert @@ -764,6 +767,8 @@ traitlets==5.1.1 # nbconvert # nbformat # notebook +trino==0.312.0 + # via feast (setup.py) typed-ast==1.5.2 # via # black @@ -802,6 +807,7 @@ typing-extensions==4.1.1 # jsonschema # mypy # pydantic + # redis # starlette # uvicorn # yarl @@ -841,7 +847,9 @@ wheel==0.37.1 widgetsnbextension==3.5.2 # via ipywidgets wrapt==1.13.3 - # via testcontainers + # via + # deprecated + # testcontainers xmltodict==0.12.0 # via moto yarl==1.7.2 From 2861c5a61e655c8afa5da28ffeccc4ba4d278da2 Mon Sep 17 00:00:00 2001 From: Kevin Zhang Date: Fri, 15 Apr 2022 10:50:11 -0700 Subject: [PATCH 6/9] update 3.10 requirements Signed-off-by: Kevin Zhang --- .../requirements/py3.10-ci-requirements.txt | 295 ++++++------------ .../requirements/py3.10-requirements.txt | 63 ++-- 2 files changed, 135 insertions(+), 223 deletions(-) diff --git a/sdk/python/requirements/py3.10-ci-requirements.txt b/sdk/python/requirements/py3.10-ci-requirements.txt index e120f8c58e..b0a92f0dec 100644 --- a/sdk/python/requirements/py3.10-ci-requirements.txt +++ b/sdk/python/requirements/py3.10-ci-requirements.txt @@ -23,20 +23,16 @@ alabaster==0.7.12 altair==4.2.0 # via great-expectations anyio==3.5.0 - # via starlette + # via + # starlette + # watchgod appdirs==1.4.4 # via black -appnope==0.1.2 - # via - # ipykernel - # ipython -argon2-cffi==21.3.0 - # via notebook -argon2-cffi-bindings==21.2.0 - # via argon2-cffi +appnope==0.1.3 + # via ipython asgiref==3.5.0 # via uvicorn -asn1crypto==1.4.0 +asn1crypto==1.5.1 # via # oscrypto # snowflake-connector-python @@ -45,7 +41,9 @@ assertpy==1.1 asttokens==2.0.5 # via stack-data async-timeout==4.0.2 - # via aiohttp + # via + # aiohttp + # redis attrs==21.4.0 # via # aiohttp @@ -54,16 +52,16 @@ attrs==21.4.0 # pytest avro==1.10.0 # via feast (setup.py) -azure-core==1.23.0 +azure-core==1.23.1 # via # adlfs # azure-identity # azure-storage-blob azure-datalake-store==0.0.52 # via adlfs -azure-identity==1.8.0 +azure-identity==1.9.0 # via adlfs -azure-storage-blob==12.9.0 +azure-storage-blob==12.11.0 # via adlfs babel==2.9.1 # via sphinx @@ -71,13 +69,11 @@ backcall==0.2.0 # via ipython black==19.10b0 # via feast (setup.py) -bleach==4.1.0 - # via nbconvert -boto3==1.21.11 +boto3==1.21.41 # via # feast (setup.py) # moto -botocore==1.24.11 +botocore==1.24.41 # via # boto3 # moto @@ -94,7 +90,6 @@ certifi==2021.10.8 # snowflake-connector-python cffi==1.15.0 # via - # argon2-cffi-bindings # azure-datalake-store # cryptography # snowflake-connector-python @@ -105,7 +100,7 @@ charset-normalizer==2.0.12 # aiohttp # requests # snowflake-connector-python -click==8.0.4 +click==8.1.2 # via # black # feast (setup.py) @@ -115,30 +110,32 @@ click==8.0.4 cloudpickle==2.0.0 # via dask colorama==0.4.4 - # via feast (setup.py) + # via + # feast (setup.py) + # great-expectations coverage[toml]==6.3.2 # via pytest-cov -cryptography==3.3.2 +cryptography==3.4.8 # via # adal # azure-identity # azure-storage-blob # feast (setup.py) + # great-expectations # moto # msal - # pyjwt # pyopenssl # snowflake-connector-python dask==2022.1.1 # via feast (setup.py) -debugpy==1.5.1 - # via ipykernel +dataclasses==0.6 + # via great-expectations decorator==5.1.1 # via # gcsfs # ipython -defusedxml==0.7.1 - # via nbconvert +deprecated==1.2.13 + # via redis deprecation==2.1.0 # via testcontainers dill==0.3.4 @@ -154,20 +151,19 @@ docutils==0.17.1 # sphinx # sphinx-rtd-theme entrypoints==0.4 - # via - # altair - # jupyter-client - # nbconvert + # via altair execnet==1.9.0 # via pytest-xdist executing==0.8.3 # via stack-data -fastapi==0.74.1 +fastapi==0.75.1 # via feast (setup.py) -fastavro==1.4.9 +fastavro==1.4.10 # via # feast (setup.py) # pandavro +fastjsonschema==2.15.3 + # via nbformat filelock==3.6.0 # via virtualenv firebase-admin==4.5.2 @@ -178,12 +174,12 @@ frozenlist==1.3.0 # via # aiohttp # aiosignal -fsspec==2022.2.0 +fsspec==2022.3.0 # via # adlfs # dask # gcsfs -gcsfs==2022.2.0 +gcsfs==2022.3.0 # via feast (setup.py) google-api-core[grpc]==1.31.5 # via @@ -195,7 +191,7 @@ google-api-core[grpc]==1.31.5 # google-cloud-core # google-cloud-datastore # google-cloud-firestore -google-api-python-client==2.39.0 +google-api-python-client==2.44.0 # via firebase-admin google-auth==1.35.0 # via @@ -208,12 +204,14 @@ google-auth==1.35.0 # google-cloud-storage google-auth-httplib2==0.1.0 # via google-api-python-client -google-auth-oauthlib==0.5.0 +google-auth-oauthlib==0.5.1 # via gcsfs -google-cloud-bigquery==2.34.1 - # via feast (setup.py) -google-cloud-bigquery-storage==2.12.0 +google-cloud-bigquery==3.0.1 # via feast (setup.py) +google-cloud-bigquery-storage==2.13.1 + # via + # feast (setup.py) + # google-cloud-bigquery google-cloud-core==1.7.2 # via # feast (setup.py) @@ -221,9 +219,9 @@ google-cloud-core==1.7.2 # google-cloud-datastore # google-cloud-firestore # google-cloud-storage -google-cloud-datastore==2.5.0 +google-cloud-datastore==2.5.1 # via feast (setup.py) -google-cloud-firestore==2.3.4 +google-cloud-firestore==2.4.0 # via firebase-admin google-cloud-storage==1.40.0 # via @@ -241,7 +239,7 @@ googleapis-common-protos==1.52.0 # feast (setup.py) # google-api-core # tensorflow-metadata -great-expectations==0.14.8 +great-expectations==0.14.13 # via feast (setup.py) grpcio==1.44.0 # via @@ -265,9 +263,9 @@ httplib2==0.20.4 # via # google-api-python-client # google-auth-httplib2 -httptools==0.3.0 +httptools==0.4.0 # via uvicorn -identify==2.4.11 +identify==2.4.12 # via pre-commit idna==3.3 # via @@ -277,24 +275,11 @@ idna==3.3 # yarl imagesize==1.3.0 # via sphinx -importlib-metadata==4.11.2 +importlib-metadata==4.11.3 # via great-expectations iniconfig==1.1.1 # via pytest -ipykernel==6.9.1 - # via - # ipywidgets - # notebook -ipython==8.1.1 - # via - # ipykernel - # ipywidgets -ipython-genutils==0.2.0 - # via - # ipywidgets - # nbformat - # notebook -ipywidgets==7.6.5 +ipython==8.2.0 # via great-expectations isodate==0.6.1 # via msrest @@ -308,16 +293,14 @@ jinja2==3.0.3 # feast (setup.py) # great-expectations # moto - # nbconvert - # notebook # sphinx -jmespath==0.10.0 +jmespath==1.0.0 # via # boto3 # botocore jsonpatch==1.32 # via great-expectations -jsonpointer==2.2 +jsonpointer==2.3 # via jsonpatch jsonschema==4.4.0 # via @@ -325,44 +308,27 @@ jsonschema==4.4.0 # feast (setup.py) # great-expectations # nbformat -jupyter-client==7.1.2 - # via - # ipykernel - # nbclient - # notebook jupyter-core==4.9.2 - # via - # jupyter-client - # nbconvert - # nbformat - # notebook -jupyterlab-pygments==0.1.2 - # via nbconvert -jupyterlab-widgets==1.0.2 - # via ipywidgets + # via nbformat locket==0.2.1 # via partd -markupsafe==2.1.0 +markupsafe==2.1.1 # via # jinja2 # moto matplotlib-inline==0.1.3 - # via - # ipykernel - # ipython + # via ipython mccabe==0.6.1 # via flake8 minio==7.1.0 # via feast (setup.py) -mistune==0.8.4 - # via - # great-expectations - # nbconvert +mistune==2.0.2 + # via great-expectations mmh3==3.0.0 # via feast (setup.py) mock==2.0.0 # via feast (setup.py) -moto==3.0.5 +moto==3.1.4 # via feast (setup.py) msal==1.17.0 # via @@ -386,29 +352,13 @@ mypy==0.931 # via feast (setup.py) mypy-extensions==0.4.3 # via mypy -mypy-protobuf==3.1.0 - # via feast (setup.py) -nbclient==0.5.11 - # via nbconvert -nbconvert==6.4.2 - # via notebook -nbformat==5.1.3 - # via - # ipywidgets - # nbclient - # nbconvert - # notebook -nest-asyncio==1.5.4 - # via - # ipykernel - # jupyter-client - # nbclient - # notebook +mypy-protobuf==3.1 + # via feast (setup.py) +nbformat==5.3.0 + # via great-expectations nodeenv==1.6.0 # via pre-commit -notebook==6.4.10 - # via widgetsnbextension -numpy==1.22.2 +numpy==1.22.3 # via # altair # great-expectations @@ -418,17 +368,17 @@ numpy==1.22.2 # scipy oauthlib==3.2.0 # via requests-oauthlib -oscrypto==1.2.1 +oscrypto==1.3.0 # via snowflake-connector-python packaging==21.3 # via - # bleach # dask # deprecation # google-api-core # google-cloud-bigquery - # google-cloud-firestore + # great-expectations # pytest + # redis # sphinx pandas==1.3.5 # via @@ -439,8 +389,6 @@ pandas==1.3.5 # snowflake-connector-python pandavro==1.5.2 # via feast (setup.py) -pandocfilters==1.5.0 - # via nbconvert parso==0.8.3 # via jedi partd==1.2.0 @@ -455,7 +403,7 @@ pexpect==4.8.0 # via ipython pickleshare==0.7.5 # via ipython -pip-tools==6.5.1 +pip-tools==6.6.0 # via feast (setup.py) platformdirs==2.5.1 # via virtualenv @@ -463,11 +411,9 @@ pluggy==1.0.0 # via pytest portalocker==2.4.0 # via msal-extensions -pre-commit==2.17.0 +pre-commit==2.18.1 # via feast (setup.py) -prometheus-client==0.13.1 - # via notebook -prompt-toolkit==3.0.28 +prompt-toolkit==3.0.29 # via ipython proto-plus==1.19.6 # via @@ -491,9 +437,7 @@ protobuf==3.19.4 psutil==5.9.0 # via feast (setup.py) ptyprocess==0.7.0 - # via - # pexpect - # terminado + # via pexpect pure-eval==0.2.2 # via stack-data py==1.11.0 @@ -507,6 +451,7 @@ py4j==0.10.9.3 pyarrow==6.0.1 # via # feast (setup.py) + # google-cloud-bigquery # snowflake-connector-python pyasn1==0.4.8 # via @@ -514,7 +459,7 @@ pyasn1==0.4.8 # rsa pyasn1-modules==0.2.8 # via google-auth -pybindgen==0.22.0 +pybindgen==0.22.1 # via feast (setup.py) pycodestyle==2.8.0 # via flake8 @@ -531,8 +476,6 @@ pyflakes==2.4.0 pygments==2.11.2 # via # ipython - # jupyterlab-pygments - # nbconvert # sphinx pyjwt[crypto]==2.3.0 # via @@ -550,7 +493,7 @@ pyrsistent==0.18.1 # via jsonschema pyspark==3.2.1 # via feast (setup.py) -pytest==7.0.1 +pytest==7.1.1 # via # feast (setup.py) # pytest-benchmark @@ -583,12 +526,11 @@ python-dateutil==2.8.2 # botocore # google-cloud-bigquery # great-expectations - # jupyter-client # moto # pandas -python-dotenv==0.19.2 +python-dotenv==0.20.0 # via uvicorn -pytz==2021.3 +pytz==2022.1 # via # babel # google-api-core @@ -596,6 +538,7 @@ pytz==2021.3 # moto # pandas # snowflake-connector-python + # trino pytz-deprecation-shim==0.1.0.post0 # via tzlocal pyyaml==6.0 @@ -604,17 +547,9 @@ pyyaml==6.0 # feast (setup.py) # pre-commit # uvicorn -pyzmq==22.3.0 - # via - # jupyter-client - # notebook -redis==3.5.3 - # via - # feast (setup.py) - # redis-py-cluster -redis-py-cluster==2.1.3 +redis==4.2.2 # via feast (setup.py) -regex==2022.3.2 +regex==2022.3.15 # via black requests==2.27.1 # via @@ -636,39 +571,32 @@ requests==2.27.1 # responses # snowflake-connector-python # sphinx + # trino requests-oauthlib==1.3.1 # via # google-auth-oauthlib # msrest -responses==0.18.0 +responses==0.20.0 # via moto rsa==4.8 # via google-auth -ruamel.yaml==0.17.17 +ruamel-yaml==0.17.17 # via great-expectations -ruamel.yaml.clib==0.2.6 - # via ruamel.yaml s3transfer==0.5.2 # via boto3 scipy==1.8.0 # via great-expectations -send2trash==1.8.0 - # via notebook six==1.16.0 # via # absl-py - # asttokens # azure-core # azure-identity - # bleach - # cryptography # google-api-core # google-auth # google-auth-httplib2 # google-cloud-core # google-resumable-media # grpcio - # isodate # mock # msrestazure # pandavro @@ -679,7 +607,7 @@ sniffio==1.2.0 # via anyio snowballstemmer==2.2.0 # via sphinx -snowflake-connector-python[pandas]==2.7.4 +snowflake-connector-python[pandas]==2.7.6 # via feast (setup.py) sphinx==4.3.2 # via @@ -711,12 +639,8 @@ tensorflow-metadata==1.7.0 # via feast (setup.py) termcolor==1.1.0 # via great-expectations -terminado==0.13.2 - # via notebook -testcontainers==3.4.2 +testcontainers==3.5.3 # via feast (setup.py) -testpath==0.6.0 - # via nbconvert toml==0.10.2 # via # black @@ -733,49 +657,39 @@ toolz==0.11.2 # altair # dask # partd -tornado==6.1 - # via - # ipykernel - # jupyter-client - # notebook - # terminado -tqdm==4.63.0 +tqdm==4.64.0 # via # feast (setup.py) # great-expectations traitlets==5.1.1 # via - # ipykernel # ipython - # ipywidgets - # jupyter-client # jupyter-core # matplotlib-inline - # nbclient - # nbconvert # nbformat - # notebook +trino==0.312.0 + # via feast (setup.py) typed-ast==1.5.2 # via black -types-protobuf==3.19.12 +types-protobuf==3.19.15 # via # feast (setup.py) # mypy-protobuf -types-python-dateutil==2.8.9 +types-python-dateutil==2.8.10 # via feast (setup.py) -types-pytz==2021.3.5 +types-pytz==2021.3.6 # via feast (setup.py) -types-pyyaml==6.0.4 +types-pyyaml==6.0.5 # via feast (setup.py) -types-redis==4.1.17 +types-redis==4.1.19 # via feast (setup.py) -types-requests==2.27.11 +types-requests==2.27.16 # via feast (setup.py) -types-setuptools==57.4.9 +types-setuptools==57.4.12 # via feast (setup.py) -types-tabulate==0.8.5 +types-tabulate==0.8.6 # via feast (setup.py) -types-urllib3==1.26.10 +types-urllib3==1.26.11 # via types-requests typing-extensions==4.1.1 # via @@ -783,48 +697,47 @@ typing-extensions==4.1.1 # great-expectations # mypy # pydantic -tzdata==2021.5 +tzdata==2022.1 # via pytz-deprecation-shim -tzlocal==4.1 +tzlocal==4.2 # via great-expectations uritemplate==4.1.1 # via google-api-python-client -urllib3==1.26.8 +urllib3==1.26.9 # via # botocore # feast (setup.py) + # great-expectations # minio # requests # responses -uvicorn[standard]==0.17.5 +uvicorn[standard]==0.17.6 # via feast (setup.py) uvloop==0.16.0 # via uvicorn -virtualenv==20.13.2 +virtualenv==20.14.1 # via pre-commit -watchgod==0.7 +watchgod==0.8.2 # via uvicorn wcwidth==0.2.5 # via prompt-toolkit -webencodings==0.5.1 - # via bleach -websocket-client==1.3.1 +websocket-client==1.3.2 # via docker websockets==10.2 # via uvicorn -werkzeug==2.0.3 +werkzeug==2.1.1 # via moto wheel==0.37.1 # via pip-tools -widgetsnbextension==3.5.2 - # via ipywidgets -wrapt==1.13.3 - # via testcontainers +wrapt==1.14.0 + # via + # deprecated + # testcontainers xmltodict==0.12.0 # via moto yarl==1.7.2 # via aiohttp -zipp==3.7.0 +zipp==3.8.0 # via importlib-metadata # The following packages are considered to be unsafe in a requirements file: diff --git a/sdk/python/requirements/py3.10-requirements.txt b/sdk/python/requirements/py3.10-requirements.txt index e21a4ba412..455d80b790 100644 --- a/sdk/python/requirements/py3.10-requirements.txt +++ b/sdk/python/requirements/py3.10-requirements.txt @@ -7,18 +7,20 @@ absl-py==1.0.0 # via tensorflow-metadata anyio==3.5.0 - # via starlette -asgiref==3.4.1 + # via + # starlette + # watchgod +asgiref==3.5.0 # via uvicorn attrs==21.4.0 # via jsonschema -cachetools==4.2.4 +cachetools==5.0.0 # via google-auth certifi==2021.10.8 # via requests -charset-normalizer==2.0.10 +charset-normalizer==2.0.12 # via requests -click==8.0.3 +click==8.1.2 # via # feast (setup.py) # uvicorn @@ -30,55 +32,55 @@ dask==2022.1.1 # via feast (setup.py) dill==0.3.4 # via feast (setup.py) -fastapi==0.72.0 +fastapi==0.75.1 # via feast (setup.py) -fastavro==1.4.9 +fastavro==1.4.10 # via # feast (setup.py) # pandavro -fsspec==2022.2.0 +fsspec==2022.3.0 # via dask -google-api-core==2.4.0 +google-api-core==2.7.2 # via feast (setup.py) -google-auth==2.3.3 +google-auth==2.6.5 # via google-api-core googleapis-common-protos==1.52.0 # via # feast (setup.py) # google-api-core # tensorflow-metadata -grpcio==1.43.0 +grpcio==1.44.0 # via # feast (setup.py) # grpcio-reflection -grpcio-reflection==1.43.0 +grpcio-reflection==1.44.0 # via feast (setup.py) h11==0.13.0 # via uvicorn -httptools==0.3.0 +httptools==0.4.0 # via uvicorn idna==3.3 # via # anyio # requests -jinja2==3.0.3 +jinja2==3.1.1 # via feast (setup.py) jsonschema==4.4.0 # via feast (setup.py) locket==0.2.1 # via partd -markupsafe==2.0.1 +markupsafe==2.1.1 # via jinja2 mmh3==3.0.0 # via feast (setup.py) -numpy==1.21.5 +numpy==1.22.3 # via # pandas # pandavro # pyarrow packaging==21.3 # via dask -pandas==1.3.5 +pandas==1.4.2 # via # feast (setup.py) # pandavro @@ -88,7 +90,7 @@ partd==1.2.0 # via dask proto-plus==1.19.6 # via feast (setup.py) -protobuf==3.19.3 +protobuf==3.19.4 # via # feast (setup.py) # google-api-core @@ -96,7 +98,7 @@ protobuf==3.19.3 # grpcio-reflection # proto-plus # tensorflow-metadata -pyarrow==6.0.1 +pyarrow==7.0.0 # via feast (setup.py) pyasn1==0.4.8 # via @@ -108,15 +110,15 @@ pydantic==1.9.0 # via # fastapi # feast (setup.py) -pyparsing==3.0.7 +pyparsing==3.0.8 # via packaging pyrsistent==0.18.1 # via jsonschema python-dateutil==2.8.2 # via pandas -python-dotenv==0.19.2 +python-dotenv==0.20.0 # via uvicorn -pytz==2021.3 +pytz==2022.1 # via pandas pyyaml==6.0 # via @@ -142,7 +144,7 @@ tabulate==0.8.9 # via feast (setup.py) tenacity==8.0.1 # via feast (setup.py) -tensorflow-metadata==1.6.0 +tensorflow-metadata==1.7.0 # via feast (setup.py) toml==0.10.2 # via feast (setup.py) @@ -150,20 +152,17 @@ toolz==0.11.2 # via # dask # partd -tqdm==4.62.3 +tqdm==4.64.0 # via feast (setup.py) -typing-extensions==4.0.1 +typing-extensions==4.1.1 # via pydantic -urllib3==1.26.8 +urllib3==1.26.9 # via requests -uvicorn[standard]==0.17.0 +uvicorn[standard]==0.17.6 # via feast (setup.py) uvloop==0.16.0 # via uvicorn -watchgod==0.7 +watchgod==0.8.2 # via uvicorn -websockets==10.1 +websockets==10.2 # via uvicorn - -# The following packages are considered to be unsafe in a requirements file: -# setuptools From 1496fa574bc23fc894cd81d403685901c1f6ed2c Mon Sep 17 00:00:00 2001 From: Kevin Zhang Date: Fri, 15 Apr 2022 11:43:19 -0700 Subject: [PATCH 7/9] Fix dependencies to address issues Signed-off-by: Kevin Zhang --- sdk/python/requirements/py3.10-ci-requirements.txt | 7 ++----- sdk/python/requirements/py3.8-ci-requirements.txt | 7 ++----- sdk/python/requirements/py3.9-ci-requirements.txt | 7 ++----- sdk/python/setup.py | 2 +- 4 files changed, 7 insertions(+), 16 deletions(-) diff --git a/sdk/python/requirements/py3.10-ci-requirements.txt b/sdk/python/requirements/py3.10-ci-requirements.txt index b0a92f0dec..346aa6da47 100644 --- a/sdk/python/requirements/py3.10-ci-requirements.txt +++ b/sdk/python/requirements/py3.10-ci-requirements.txt @@ -206,12 +206,10 @@ google-auth-httplib2==0.1.0 # via google-api-python-client google-auth-oauthlib==0.5.1 # via gcsfs -google-cloud-bigquery==3.0.1 +google-cloud-bigquery==2.34.3 # via feast (setup.py) google-cloud-bigquery-storage==2.13.1 - # via - # feast (setup.py) - # google-cloud-bigquery + # via feast (setup.py) google-cloud-core==1.7.2 # via # feast (setup.py) @@ -451,7 +449,6 @@ py4j==0.10.9.3 pyarrow==6.0.1 # via # feast (setup.py) - # google-cloud-bigquery # snowflake-connector-python pyasn1==0.4.8 # via diff --git a/sdk/python/requirements/py3.8-ci-requirements.txt b/sdk/python/requirements/py3.8-ci-requirements.txt index 92a7f5dabe..34032ef7d2 100644 --- a/sdk/python/requirements/py3.8-ci-requirements.txt +++ b/sdk/python/requirements/py3.8-ci-requirements.txt @@ -210,12 +210,10 @@ google-auth-httplib2==0.1.0 # via google-api-python-client google-auth-oauthlib==0.5.1 # via gcsfs -google-cloud-bigquery==3.0.1 +google-cloud-bigquery==2.34.3 # via feast (setup.py) google-cloud-bigquery-storage==2.13.1 - # via - # feast (setup.py) - # google-cloud-bigquery + # via feast (setup.py) google-cloud-core==1.7.2 # via # feast (setup.py) @@ -457,7 +455,6 @@ py4j==0.10.9.3 pyarrow==6.0.1 # via # feast (setup.py) - # google-cloud-bigquery # snowflake-connector-python pyasn1==0.4.8 # via diff --git a/sdk/python/requirements/py3.9-ci-requirements.txt b/sdk/python/requirements/py3.9-ci-requirements.txt index bdbd1de4df..1ab910a16d 100644 --- a/sdk/python/requirements/py3.9-ci-requirements.txt +++ b/sdk/python/requirements/py3.9-ci-requirements.txt @@ -206,12 +206,10 @@ google-auth-httplib2==0.1.0 # via google-api-python-client google-auth-oauthlib==0.5.1 # via gcsfs -google-cloud-bigquery==3.0.1 +google-cloud-bigquery==2.34.3 # via feast (setup.py) google-cloud-bigquery-storage==2.13.1 - # via - # feast (setup.py) - # google-cloud-bigquery + # via feast (setup.py) google-cloud-core==1.7.2 # via # feast (setup.py) @@ -451,7 +449,6 @@ py4j==0.10.9.3 pyarrow==6.0.1 # via # feast (setup.py) - # google-cloud-bigquery # snowflake-connector-python pyasn1==0.4.8 # via diff --git a/sdk/python/setup.py b/sdk/python/setup.py index e24ea6e169..a368ff3054 100644 --- a/sdk/python/setup.py +++ b/sdk/python/setup.py @@ -72,7 +72,7 @@ ] GCP_REQUIRED = [ - "google-cloud-bigquery>=2.28.1", + "google-cloud-bigquery>=2.34.*,<3.0.0", "google-cloud-bigquery-storage >= 2.0.0", "google-cloud-datastore>=2.1.*", "google-cloud-storage>=1.34.*,<1.41", From 7ba4ec8c1f9380299cdcbef5eff77d9a35ea886a Mon Sep 17 00:00:00 2001 From: Kevin Zhang Date: Fri, 15 Apr 2022 12:00:47 -0700 Subject: [PATCH 8/9] Fix Signed-off-by: Kevin Zhang --- sdk/python/setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sdk/python/setup.py b/sdk/python/setup.py index a368ff3054..4cf9765fb5 100644 --- a/sdk/python/setup.py +++ b/sdk/python/setup.py @@ -72,7 +72,7 @@ ] GCP_REQUIRED = [ - "google-cloud-bigquery>=2.34.*,<3.0.0", + "google-cloud-bigquery>=2.*,<3", "google-cloud-bigquery-storage >= 2.0.0", "google-cloud-datastore>=2.1.*", "google-cloud-storage>=1.34.*,<1.41", From 03aceb54088eac8f8d6c2dc4dd7d8c5b20949851 Mon Sep 17 00:00:00 2001 From: Kevin Zhang Date: Fri, 15 Apr 2022 12:03:19 -0700 Subject: [PATCH 9/9] Fix Signed-off-by: Kevin Zhang --- sdk/python/setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sdk/python/setup.py b/sdk/python/setup.py index 4cf9765fb5..af6eaea311 100644 --- a/sdk/python/setup.py +++ b/sdk/python/setup.py @@ -72,7 +72,7 @@ ] GCP_REQUIRED = [ - "google-cloud-bigquery>=2.*,<3", + "google-cloud-bigquery>=2,<3", "google-cloud-bigquery-storage >= 2.0.0", "google-cloud-datastore>=2.1.*", "google-cloud-storage>=1.34.*,<1.41",