From e73dae3cc8b0436c28daa9f4e7b7f56daf9cd21d Mon Sep 17 00:00:00 2001 From: cburroughs Date: Sat, 16 Mar 2024 06:48:40 -0400 Subject: [PATCH] chore: Loosen mypy-protobuf version constraint (#4009) chore: loosen mypy-protobuf version constraint Having this pinned to an exact version increases the likelihood of conflict with user code or other libraries. Changelog: https://github.com/nipunn1313/mypy-protobuf/blob/main/CHANGELOG.md Signed-off-by: Chris Burroughs --- .../requirements/py3.10-ci-requirements.txt | 54 ++++++++----------- .../requirements/py3.10-requirements.txt | 12 ++--- .../requirements/py3.8-ci-requirements.txt | 38 +++++++------ .../requirements/py3.8-requirements.txt | 10 ++-- .../requirements/py3.9-ci-requirements.txt | 54 ++++++++----------- .../requirements/py3.9-requirements.txt | 12 ++--- setup.py | 9 ++-- 7 files changed, 79 insertions(+), 110 deletions(-) diff --git a/sdk/python/requirements/py3.10-ci-requirements.txt b/sdk/python/requirements/py3.10-ci-requirements.txt index 54dc41fe5b..638d9ae19d 100644 --- a/sdk/python/requirements/py3.10-ci-requirements.txt +++ b/sdk/python/requirements/py3.10-ci-requirements.txt @@ -63,11 +63,11 @@ black==22.12.0 # via feast (setup.py) bleach==6.1.0 # via nbconvert -boto3==1.34.59 +boto3==1.34.60 # via # feast (setup.py) # moto -botocore==1.34.59 +botocore==1.34.60 # via # boto3 # moto @@ -122,14 +122,12 @@ colorama==0.4.6 # via # feast (setup.py) # great-expectations -comm==0.2.1 +comm==0.2.2 # via # ipykernel # ipywidgets coverage[toml]==7.4.3 - # via - # coverage - # pytest-cov + # via pytest-cov cryptography==42.0.5 # via # azure-identity @@ -215,7 +213,7 @@ google-api-core[grpc]==2.17.1 # google-cloud-datastore # google-cloud-firestore # google-cloud-storage -google-api-python-client==2.121.0 +google-api-python-client==2.122.0 # via firebase-admin google-auth==2.28.2 # via @@ -228,9 +226,7 @@ google-auth==2.28.2 google-auth-httplib2==0.2.0 # via google-api-python-client google-cloud-bigquery[pandas]==3.12.0 - # via - # feast (setup.py) - # google-cloud-bigquery + # via feast (setup.py) google-cloud-bigquery-storage==2.24.0 # via feast (setup.py) google-cloud-bigtable==2.23.0 @@ -258,7 +254,7 @@ google-resumable-media==2.7.0 # via # google-cloud-bigquery # google-cloud-storage -googleapis-common-protos[grpc]==1.62.0 +googleapis-common-protos[grpc]==1.63.0 # via # feast (setup.py) # google-api-core @@ -391,12 +387,12 @@ jsonschema[format-nongpl]==4.21.1 # nbformat jsonschema-specifications==2023.12.1 # via jsonschema -jupyter-client==8.6.0 +jupyter-client==8.6.1 # via # ipykernel # jupyter-server # nbclient -jupyter-core==5.7.1 +jupyter-core==5.7.2 # via # ipykernel # jupyter-client @@ -405,7 +401,7 @@ jupyter-core==5.7.1 # nbclient # nbconvert # nbformat -jupyter-events==0.9.0 +jupyter-events==0.9.1 # via jupyter-server jupyter-lsp==2.2.4 # via jupyterlab @@ -416,13 +412,13 @@ jupyter-server==2.13.0 # jupyterlab-server # notebook # notebook-shim -jupyter-server-terminals==0.5.2 +jupyter-server-terminals==0.5.3 # via jupyter-server jupyterlab==4.1.4 # via notebook jupyterlab-pygments==0.3.0 # via nbconvert -jupyterlab-server==2.25.3 +jupyterlab-server==2.25.4 # via # jupyterlab # notebook @@ -485,13 +481,13 @@ mypy-extensions==1.0.0 # via # black # mypy -mypy-protobuf==3.1.0 +mypy-protobuf==3.3.0 # via feast (setup.py) -nbclient==0.9.0 +nbclient==0.9.1 # via nbconvert nbconvert==7.16.2 # via jupyter-server -nbformat==5.9.2 +nbformat==5.10.2 # via # great-expectations # jupyter-server @@ -651,7 +647,7 @@ pycodestyle==2.10.0 # via flake8 pycparser==2.21 # via cffi -pydantic==2.6.3 +pydantic==2.6.4 # via # fastapi # feast (setup.py) @@ -830,9 +826,7 @@ sniffio==1.3.1 snowballstemmer==2.2.0 # via sphinx snowflake-connector-python[pandas]==3.7.1 - # via - # feast (setup.py) - # snowflake-connector-python + # via feast (setup.py) sortedcontainers==2.4.0 # via snowflake-connector-python soupsieve==2.5 @@ -852,9 +846,7 @@ sphinxcontrib-qthelp==1.0.7 sphinxcontrib-serializinghtml==1.1.10 # via sphinx sqlalchemy[mypy]==1.4.52 - # via - # feast (setup.py) - # sqlalchemy + # via feast (setup.py) sqlalchemy2-stubs==0.0.2a38 # via sqlalchemy sqlglot==20.11.0 @@ -869,7 +861,7 @@ tabulate==0.9.0 # via feast (setup.py) tenacity==8.2.3 # via feast (setup.py) -terminado==0.18.0 +terminado==0.18.1 # via # jupyter-server # jupyter-server-terminals @@ -911,7 +903,7 @@ tqdm==4.66.2 # via # feast (setup.py) # great-expectations -traitlets==5.14.1 +traitlets==5.14.2 # via # comm # ipykernel @@ -994,9 +986,7 @@ urllib3==1.26.18 # responses # rockset uvicorn[standard]==0.28.0 - # via - # feast (setup.py) - # uvicorn + # via feast (setup.py) uvloop==0.19.0 # via uvicorn virtualenv==20.23.0 @@ -1023,7 +1013,7 @@ websockets==12.0 # via uvicorn werkzeug==3.0.1 # via moto -wheel==0.42.0 +wheel==0.43.0 # via pip-tools widgetsnbextension==4.0.10 # via ipywidgets diff --git a/sdk/python/requirements/py3.10-requirements.txt b/sdk/python/requirements/py3.10-requirements.txt index 91b42f8271..bbce1ecb7f 100644 --- a/sdk/python/requirements/py3.10-requirements.txt +++ b/sdk/python/requirements/py3.10-requirements.txt @@ -93,7 +93,7 @@ mypy==1.9.0 # via sqlalchemy mypy-extensions==1.0.0 # via mypy -mypy-protobuf==3.1.0 +mypy-protobuf==3.5.0 # via feast (setup.py) numpy==1.24.4 # via @@ -117,7 +117,7 @@ protobuf==4.25.3 # proto-plus pyarrow==15.0.1 # via feast (setup.py) -pydantic==2.6.3 +pydantic==2.6.4 # via # fastapi # feast (setup.py) @@ -153,9 +153,7 @@ sniffio==1.3.1 # anyio # httpx sqlalchemy[mypy]==1.4.52 - # via - # feast (setup.py) - # sqlalchemy + # via feast (setup.py) sqlalchemy2-stubs==0.0.2a38 # via sqlalchemy starlette==0.36.3 @@ -193,9 +191,7 @@ tzdata==2024.1 urllib3==2.2.1 # via requests uvicorn[standard]==0.28.0 - # via - # feast (setup.py) - # uvicorn + # via feast (setup.py) uvloop==0.19.0 # via uvicorn volatile==2.1.0 diff --git a/sdk/python/requirements/py3.8-ci-requirements.txt b/sdk/python/requirements/py3.8-ci-requirements.txt index 18da48cc5c..c76294b6c2 100644 --- a/sdk/python/requirements/py3.8-ci-requirements.txt +++ b/sdk/python/requirements/py3.8-ci-requirements.txt @@ -67,11 +67,11 @@ black==22.12.0 # via feast (setup.py) bleach==6.1.0 # via nbconvert -boto3==1.34.59 +boto3==1.34.60 # via # feast (setup.py) # moto -botocore==1.34.59 +botocore==1.34.60 # via # boto3 # moto @@ -126,7 +126,7 @@ colorama==0.4.6 # via # feast (setup.py) # great-expectations -comm==0.2.1 +comm==0.2.2 # via # ipykernel # ipywidgets @@ -216,7 +216,7 @@ google-api-core[grpc]==2.17.1 # google-cloud-datastore # google-cloud-firestore # google-cloud-storage -google-api-python-client==2.121.0 +google-api-python-client==2.122.0 # via firebase-admin google-auth==2.28.2 # via @@ -257,7 +257,7 @@ google-resumable-media==2.7.0 # via # google-cloud-bigquery # google-cloud-storage -googleapis-common-protos[grpc]==1.62.0 +googleapis-common-protos[grpc]==1.63.0 # via # feast (setup.py) # google-api-core @@ -402,12 +402,12 @@ jsonschema[format-nongpl]==4.21.1 # nbformat jsonschema-specifications==2023.12.1 # via jsonschema -jupyter-client==8.6.0 +jupyter-client==8.6.1 # via # ipykernel # jupyter-server # nbclient -jupyter-core==5.7.1 +jupyter-core==5.7.2 # via # ipykernel # jupyter-client @@ -416,7 +416,7 @@ jupyter-core==5.7.1 # nbclient # nbconvert # nbformat -jupyter-events==0.9.0 +jupyter-events==0.9.1 # via jupyter-server jupyter-lsp==2.2.4 # via jupyterlab @@ -427,13 +427,13 @@ jupyter-server==2.13.0 # jupyterlab-server # notebook # notebook-shim -jupyter-server-terminals==0.5.2 +jupyter-server-terminals==0.5.3 # via jupyter-server jupyterlab==4.1.4 # via notebook jupyterlab-pygments==0.3.0 # via nbconvert -jupyterlab-server==2.25.3 +jupyterlab-server==2.25.4 # via # jupyterlab # notebook @@ -496,13 +496,13 @@ mypy-extensions==1.0.0 # via # black # mypy -mypy-protobuf==3.1.0 +mypy-protobuf==3.3.0 # via feast (setup.py) -nbclient==0.9.0 +nbclient==0.9.1 # via nbconvert nbconvert==7.16.2 # via jupyter-server -nbformat==5.9.2 +nbformat==5.10.2 # via # great-expectations # jupyter-server @@ -663,7 +663,7 @@ pycodestyle==2.10.0 # via flake8 pycparser==2.21 # via cffi -pydantic==2.6.3 +pydantic==2.6.4 # via # fastapi # feast (setup.py) @@ -866,9 +866,7 @@ sphinxcontrib-qthelp==1.0.3 sphinxcontrib-serializinghtml==1.1.5 # via sphinx sqlalchemy[mypy]==1.4.52 - # via - # feast (setup.py) - # sqlalchemy + # via feast (setup.py) sqlalchemy2-stubs==0.0.2a38 # via sqlalchemy sqlglot==10.6.4 @@ -881,7 +879,7 @@ tabulate==0.9.0 # via feast (setup.py) tenacity==8.2.3 # via feast (setup.py) -terminado==0.18.0 +terminado==0.18.1 # via # jupyter-server # jupyter-server-terminals @@ -923,7 +921,7 @@ tqdm==4.66.2 # via # feast (setup.py) # great-expectations -traitlets==5.14.1 +traitlets==5.14.2 # via # comm # ipykernel @@ -1037,7 +1035,7 @@ websockets==12.0 # via uvicorn werkzeug==3.0.1 # via moto -wheel==0.42.0 +wheel==0.43.0 # via pip-tools widgetsnbextension==4.0.10 # via ipywidgets diff --git a/sdk/python/requirements/py3.8-requirements.txt b/sdk/python/requirements/py3.8-requirements.txt index dceca2c94c..e689c011c5 100644 --- a/sdk/python/requirements/py3.8-requirements.txt +++ b/sdk/python/requirements/py3.8-requirements.txt @@ -38,7 +38,7 @@ cloudpickle==3.0.0 # via dask colorama==0.4.6 # via feast (setup.py) -dask==2023.5.0 +dask==2023.2.1 # via feast (setup.py) dill==0.3.8 # via feast (setup.py) @@ -97,7 +97,7 @@ mypy==1.9.0 # via sqlalchemy mypy-extensions==1.0.0 # via mypy -mypy-protobuf==3.1.0 +mypy-protobuf==3.5.0 # via feast (setup.py) numpy==1.24.4 # via @@ -123,7 +123,7 @@ protobuf==4.25.3 # proto-plus pyarrow==15.0.1 # via feast (setup.py) -pydantic==2.6.3 +pydantic==2.6.4 # via # fastapi # feast (setup.py) @@ -159,9 +159,7 @@ sniffio==1.3.1 # anyio # httpx sqlalchemy[mypy]==1.4.52 - # via - # feast (setup.py) - # sqlalchemy + # via feast (setup.py) sqlalchemy2-stubs==0.0.2a38 # via sqlalchemy starlette==0.36.3 diff --git a/sdk/python/requirements/py3.9-ci-requirements.txt b/sdk/python/requirements/py3.9-ci-requirements.txt index 7f1082f55b..6e7e7a4ef2 100644 --- a/sdk/python/requirements/py3.9-ci-requirements.txt +++ b/sdk/python/requirements/py3.9-ci-requirements.txt @@ -63,11 +63,11 @@ black==22.12.0 # via feast (setup.py) bleach==6.1.0 # via nbconvert -boto3==1.34.59 +boto3==1.34.60 # via # feast (setup.py) # moto -botocore==1.34.59 +botocore==1.34.60 # via # boto3 # moto @@ -122,14 +122,12 @@ colorama==0.4.6 # via # feast (setup.py) # great-expectations -comm==0.2.1 +comm==0.2.2 # via # ipykernel # ipywidgets coverage[toml]==7.4.3 - # via - # coverage - # pytest-cov + # via pytest-cov cryptography==42.0.5 # via # azure-identity @@ -215,7 +213,7 @@ google-api-core[grpc]==2.17.1 # google-cloud-datastore # google-cloud-firestore # google-cloud-storage -google-api-python-client==2.121.0 +google-api-python-client==2.122.0 # via firebase-admin google-auth==2.28.2 # via @@ -228,9 +226,7 @@ google-auth==2.28.2 google-auth-httplib2==0.2.0 # via google-api-python-client google-cloud-bigquery[pandas]==3.12.0 - # via - # feast (setup.py) - # google-cloud-bigquery + # via feast (setup.py) google-cloud-bigquery-storage==2.24.0 # via feast (setup.py) google-cloud-bigtable==2.23.0 @@ -258,7 +254,7 @@ google-resumable-media==2.7.0 # via # google-cloud-bigquery # google-cloud-storage -googleapis-common-protos[grpc]==1.62.0 +googleapis-common-protos[grpc]==1.63.0 # via # feast (setup.py) # google-api-core @@ -399,12 +395,12 @@ jsonschema[format-nongpl]==4.21.1 # nbformat jsonschema-specifications==2023.12.1 # via jsonschema -jupyter-client==8.6.0 +jupyter-client==8.6.1 # via # ipykernel # jupyter-server # nbclient -jupyter-core==5.7.1 +jupyter-core==5.7.2 # via # ipykernel # jupyter-client @@ -413,7 +409,7 @@ jupyter-core==5.7.1 # nbclient # nbconvert # nbformat -jupyter-events==0.9.0 +jupyter-events==0.9.1 # via jupyter-server jupyter-lsp==2.2.4 # via jupyterlab @@ -424,13 +420,13 @@ jupyter-server==2.13.0 # jupyterlab-server # notebook # notebook-shim -jupyter-server-terminals==0.5.2 +jupyter-server-terminals==0.5.3 # via jupyter-server jupyterlab==4.1.4 # via notebook jupyterlab-pygments==0.3.0 # via nbconvert -jupyterlab-server==2.25.3 +jupyterlab-server==2.25.4 # via # jupyterlab # notebook @@ -493,13 +489,13 @@ mypy-extensions==1.0.0 # via # black # mypy -mypy-protobuf==3.1.0 +mypy-protobuf==3.3.0 # via feast (setup.py) -nbclient==0.9.0 +nbclient==0.9.1 # via nbconvert nbconvert==7.16.2 # via jupyter-server -nbformat==5.9.2 +nbformat==5.10.2 # via # great-expectations # jupyter-server @@ -659,7 +655,7 @@ pycodestyle==2.10.0 # via flake8 pycparser==2.21 # via cffi -pydantic==2.6.3 +pydantic==2.6.4 # via # fastapi # feast (setup.py) @@ -840,9 +836,7 @@ sniffio==1.3.1 snowballstemmer==2.2.0 # via sphinx snowflake-connector-python[pandas]==3.7.1 - # via - # feast (setup.py) - # snowflake-connector-python + # via feast (setup.py) sortedcontainers==2.4.0 # via snowflake-connector-python soupsieve==2.5 @@ -862,9 +856,7 @@ sphinxcontrib-qthelp==1.0.7 sphinxcontrib-serializinghtml==1.1.10 # via sphinx sqlalchemy[mypy]==1.4.52 - # via - # feast (setup.py) - # sqlalchemy + # via feast (setup.py) sqlalchemy2-stubs==0.0.2a38 # via sqlalchemy sqlglot==20.11.0 @@ -879,7 +871,7 @@ tabulate==0.9.0 # via feast (setup.py) tenacity==8.2.3 # via feast (setup.py) -terminado==0.18.0 +terminado==0.18.1 # via # jupyter-server # jupyter-server-terminals @@ -921,7 +913,7 @@ tqdm==4.66.2 # via # feast (setup.py) # great-expectations -traitlets==5.14.1 +traitlets==5.14.2 # via # comm # ipykernel @@ -1008,9 +1000,7 @@ urllib3==1.26.18 # rockset # snowflake-connector-python uvicorn[standard]==0.28.0 - # via - # feast (setup.py) - # uvicorn + # via feast (setup.py) uvloop==0.19.0 # via uvicorn virtualenv==20.23.0 @@ -1037,7 +1027,7 @@ websockets==12.0 # via uvicorn werkzeug==3.0.1 # via moto -wheel==0.42.0 +wheel==0.43.0 # via pip-tools widgetsnbextension==4.0.10 # via ipywidgets diff --git a/sdk/python/requirements/py3.9-requirements.txt b/sdk/python/requirements/py3.9-requirements.txt index 090d013494..ac0954c167 100644 --- a/sdk/python/requirements/py3.9-requirements.txt +++ b/sdk/python/requirements/py3.9-requirements.txt @@ -94,7 +94,7 @@ mypy==1.9.0 # via sqlalchemy mypy-extensions==1.0.0 # via mypy -mypy-protobuf==3.1.0 +mypy-protobuf==3.5.0 # via feast (setup.py) numpy==1.24.4 # via @@ -118,7 +118,7 @@ protobuf==4.25.3 # proto-plus pyarrow==15.0.1 # via feast (setup.py) -pydantic==2.6.3 +pydantic==2.6.4 # via # fastapi # feast (setup.py) @@ -154,9 +154,7 @@ sniffio==1.3.1 # anyio # httpx sqlalchemy[mypy]==1.4.52 - # via - # feast (setup.py) - # sqlalchemy + # via feast (setup.py) sqlalchemy2-stubs==0.0.2a38 # via sqlalchemy starlette==0.36.3 @@ -195,9 +193,7 @@ tzdata==2024.1 urllib3==2.2.1 # via requests uvicorn[standard]==0.28.0 - # via - # feast (setup.py) - # uvicorn + # via feast (setup.py) uvloop==0.19.0 # via uvicorn volatile==2.1.0 diff --git a/setup.py b/setup.py index 4da59c4e21..50b45da5db 100644 --- a/setup.py +++ b/setup.py @@ -44,7 +44,7 @@ "click>=7.0.0,<9.0.0", "colorama>=0.3.9,<1", "dill~=0.3.0", - "mypy-protobuf==3.1", + "mypy-protobuf>=3.1", "Jinja2>=2,<4", "jsonschema", "mmh3", @@ -67,7 +67,8 @@ "fastapi>=0.68.0", "uvicorn[standard]>=0.14.0,<1", "gunicorn", - "dask>=2021.1.0", + # https://github.com/dask/dask/issues/10996 + "dask>=2021.1.0,<2024.3.0", "bowler", # Needed for automatic repo upgrades # FastAPI does not correctly pull starlette dependency on httpx see thread(https://github.com/tiangolo/fastapi/issues/5656). "httpx>=0.23.3", @@ -222,7 +223,7 @@ for _r in MYSQL_REQUIRED: DOCS_REQUIRED.remove(_r) -DEV_REQUIRED = ["mypy-protobuf==3.1", "grpcio-testing~=1.0"] + CI_REQUIRED +DEV_REQUIRED = ["grpcio-testing~=1.0"] + CI_REQUIRED # Get git repo root directory repo_root = str(pathlib.Path(__file__).resolve().parent) @@ -400,7 +401,7 @@ def run(self): "setuptools_scm", "grpcio>=1.56.2,<2", "grpcio-tools>=1.56.2,<2", - "mypy-protobuf==3.1", + "mypy-protobuf>=3.1", "pybindgen==0.22.0", ], cmdclass={