Skip to content

Commit

Permalink
fix: Removed protobuf as a required dependency (feast-dev#4535)
Browse files Browse the repository at this point in the history
* fix: Removed protobuf as a required dependency

Signed-off-by: Bhargav Dodla <bdodla@expediagroup.com>

* fix: Removed install-protoc-dependencies target

Signed-off-by: Bhargav Dodla <bdodla@expediagroup.com>

---------

Signed-off-by: Bhargav Dodla <bdodla@expediagroup.com>
Co-authored-by: Bhargav Dodla <bdodla@expediagroup.com>
  • Loading branch information
EXPEbdodla and Bhargav Dodla authored Sep 18, 2024
1 parent b3c93a0 commit 0fb76e9
Show file tree
Hide file tree
Showing 8 changed files with 8 additions and 23 deletions.
4 changes: 1 addition & 3 deletions pyproject.toml
Original file line number Diff line number Diff line change
@@ -1,9 +1,7 @@
[build-system]
requires = [
"grpcio-tools>=1.56.2,<2",
"grpcio>=1.56.2,<2",
"mypy-protobuf==3.1",
"protobuf==4.24.0",
"mypy-protobuf>=3.1",
"pybindgen==0.22.0",
"setuptools>=60",
"setuptools_scm>=6.2",
Expand Down
1 change: 0 additions & 1 deletion sdk/python/requirements/py3.10-ci-requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -572,7 +572,6 @@ proto-plus==1.24.0
# google-cloud-datastore
protobuf==4.25.4
# via
# feast (setup.py)
# google-api-core
# google-cloud-bigquery-storage
# google-cloud-bigtable
Expand Down
4 changes: 1 addition & 3 deletions sdk/python/requirements/py3.10-requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -89,9 +89,7 @@ partd==1.4.2
prometheus-client==0.20.0
# via feast (setup.py)
protobuf==4.25.4
# via
# feast (setup.py)
# mypy-protobuf
# via mypy-protobuf
psutil==6.0.0
# via feast (setup.py)
pyarrow==17.0.0
Expand Down
1 change: 0 additions & 1 deletion sdk/python/requirements/py3.11-ci-requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -563,7 +563,6 @@ proto-plus==1.24.0
# google-cloud-datastore
protobuf==4.25.4
# via
# feast (setup.py)
# google-api-core
# google-cloud-bigquery-storage
# google-cloud-bigtable
Expand Down
4 changes: 1 addition & 3 deletions sdk/python/requirements/py3.11-requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -87,9 +87,7 @@ partd==1.4.2
prometheus-client==0.20.0
# via feast (setup.py)
protobuf==4.25.4
# via
# feast (setup.py)
# mypy-protobuf
# via mypy-protobuf
psutil==6.0.0
# via feast (setup.py)
pyarrow==17.0.0
Expand Down
1 change: 0 additions & 1 deletion sdk/python/requirements/py3.9-ci-requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -583,7 +583,6 @@ proto-plus==1.24.0
# google-cloud-datastore
protobuf==4.25.4
# via
# feast (setup.py)
# google-api-core
# google-cloud-bigquery-storage
# google-cloud-bigtable
Expand Down
4 changes: 1 addition & 3 deletions sdk/python/requirements/py3.9-requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -91,9 +91,7 @@ partd==1.4.2
prometheus-client==0.20.0
# via feast (setup.py)
protobuf==4.25.4
# via
# feast (setup.py)
# mypy-protobuf
# via mypy-protobuf
psutil==6.0.0
# via feast (setup.py)
pyarrow==17.0.0
Expand Down
12 changes: 4 additions & 8 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,9 @@
import shutil
import subprocess
import sys

from pathlib import Path

from setuptools import find_packages, setup, Command
from setuptools import Command, find_packages, setup
from setuptools.command.build_ext import build_ext as _build_ext
from setuptools.command.build_py import build_py
from setuptools.command.develop import develop
Expand All @@ -43,7 +42,6 @@
"mmh3",
"numpy>=1.22,<2",
"pandas>=1.4.3,<3",
"protobuf>=4.24.0,<5.0.0",
"pyarrow>=4",
"pydantic>=2.0.0",
"pygments>=2.12.0,<3",
Expand Down Expand Up @@ -102,7 +100,7 @@
"psycopg[binary,pool]>=3.0.0,<4",
]

OPENTELEMETRY = ["prometheus_client","psutil"]
OPENTELEMETRY = ["prometheus_client", "psutil"]

MYSQL_REQUIRED = ["pymysql", "types-PyMySQL"]

Expand Down Expand Up @@ -139,7 +137,6 @@

GRPCIO_REQUIRED = [
"grpcio>=1.56.2,<2",
"grpcio-tools>=1.56.2,<2",
"grpcio-reflection>=1.56.2,<2",
"grpcio-health-checking>=1.56.2,<2",
]
Expand All @@ -160,6 +157,7 @@
"virtualenv==20.23.0",
"cryptography>=35.0,<43",
"ruff>=0.3.3",
"grpcio-tools>=1.56.2,<2",
"grpcio-testing>=1.56.2,<2",
# FastAPI does not correctly pull starlette dependency on httpx see thread(https://github.com/tiangolo/fastapi/issues/5656).
"httpx>=0.23.3",
Expand Down Expand Up @@ -403,9 +401,7 @@ def run(self):
use_scm_version=use_scm_version,
setup_requires=[
"grpcio-tools>=1.56.2,<2",
"grpcio>=1.56.2,<2",
"mypy-protobuf==3.1",
"protobuf==4.24.0",
"mypy-protobuf>=3.1",
"pybindgen==0.22.0",
"setuptools_scm>=6.2",
],
Expand Down

0 comments on commit 0fb76e9

Please sign in to comment.