Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

build: Explicit protobuf build version; consistent build/setup deps #136

Draft
wants to merge 8 commits into
base: master
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
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
6 changes: 2 additions & 4 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -395,10 +395,8 @@ install-go-ci-dependencies:
go install github.com/go-python/gopy
python -m pip install "pybindgen==0.22.1" "protobuf>=4.24.0,<5"

install-protoc-dependencies:
pip install --ignore-installed "protobuf>=4.24.0,<5" "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
pip install --ignore-installed "protobuf==4.25.4" "grpcio-tools>=1.56.2,<2" mypy-protobuf==3.1
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
2 changes: 1 addition & 1 deletion protos/feast/registry/RegistryServer.proto
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ service RegistryServer{
rpc Commit (google.protobuf.Empty) returns (google.protobuf.Empty) {}
rpc Refresh (RefreshRequest) returns (google.protobuf.Empty) {}
rpc Proto (google.protobuf.Empty) returns (feast.core.Registry) {}

}

message RefreshRequest {
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.25.4",
"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 @@ -498,11 +498,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.25.4",
"pybindgen==0.22.0",
"setuptools_scm>=6.2",
],
cmdclass={
"build_python_protos": BuildPythonProtosCommand,
Expand Down
Loading