Skip to content

Commit

Permalink
fix: protobuf issues with open source fix
Browse files Browse the repository at this point in the history
  • Loading branch information
zabarn committed Sep 3, 2024
1 parent e7ee21f commit 304a690
Show file tree
Hide file tree
Showing 5 changed files with 18 additions and 12 deletions.
1 change: 0 additions & 1 deletion .github/workflows/build_wheels.yml
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,6 @@ jobs:
# There's a `git restore` in here because `make install-go-ci-dependencies` is actually messing up go.mod & go.sum.
run: |
pip install -U pip setuptools wheel twine
make install-protoc-dependencies
make build-ui
git status
git restore go.mod go.sum
Expand Down
7 changes: 2 additions & 5 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -393,12 +393,9 @@ install-go-ci-dependencies:
# The `go get` command on the previous lines download the lib along with replacing the dep to `feast-dev/gopy`
# but the following command is needed to install it for some reason.
go install github.com/go-python/gopy
python -m pip install "pybindgen==0.22.1"
python -m pip install "pybindgen==0.22.1" "protobuf>=4.24.0,<5"

install-protoc-dependencies:
pip install --ignore-installed "grpcio-tools>=1.56.2,<2" mypy-protobuf==3.1.0

compile-protos-go: install-go-proto-dependencies install-protoc-dependencies
compile-protos-go: install-go-proto-dependencies
python setup.py build_go_protos

install-feast-ci-locally:
Expand Down
1 change: 0 additions & 1 deletion environment-setup.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@ pip install cryptography -U
conda install protobuf
conda install pymssql
pip install -e ".[dev]"
make install-protoc-dependencies PYTHON=3.9
make install-python-ci-dependencies PYTHON=3.9
```
4. start the docker daemon
Expand Down
14 changes: 12 additions & 2 deletions pyproject.toml
Original file line number Diff line number Diff line change
@@ -1,5 +1,15 @@
[build-system]
requires = ["setuptools>=60", "wheel", "setuptools_scm>=6.2", "grpcio", "grpcio-tools>=1.47.0", "mypy-protobuf==3.1", "sphinx!=4.0.0"]
requires = [
"grpcio-tools>=1.56.2,<2",
"grpcio>=1.56.2,<2",
"mypy-protobuf==3.1",
"protobuf==4.24.0",
"pybindgen==0.22.0",
"setuptools>=60",
"setuptools_scm>=6.2",
"sphinx!=4.0.0",
"wheel",
]
build-backend = "setuptools.build_meta"

[tool.setuptools_scm]
Expand All @@ -26,4 +36,4 @@ exclude = [
"pb2.py",
".pyi",
"protos",
"sdk/python/feast/embedded_go/lib"]
"sdk/python/feast/embedded_go/lib"]
7 changes: 4 additions & 3 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -497,11 +497,12 @@ def run(self):
entry_points={"console_scripts": ["feast=feast.cli:cli"]},
use_scm_version=use_scm_version,
setup_requires=[
"setuptools_scm",
"grpcio>=1.56.2,<2",
"grpcio-tools>=1.56.2,<2",
"mypy-protobuf>=3.1",
"grpcio>=1.56.2,<2",
"mypy-protobuf==3.1",
"protobuf==4.24.0",
"pybindgen==0.22.0",
"setuptools_scm>=6.2",
],
cmdclass={
"build_python_protos": BuildPythonProtosCommand,
Expand Down

0 comments on commit 304a690

Please sign in to comment.