Skip to content

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

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.

Sign up for GitHub

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

Merged
tokoko merged 1 commit into from
Sep 3, 2024
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
View file
Open in desktop
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
3 changes: 0 additions & 3 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -395,9 +395,6 @@ test-trino-plugin-locally:
kill-trino-locally:
cd ${ROOT_DIR}; docker stop trino

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

# Docker

build-docker: build-feature-server-python-aws-docker build-feature-transformation-server-docker build-feature-server-java-docker
Expand Down
3 changes: 1 addition & 2 deletions environment-setup.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,10 @@ 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
5. run unit tests:
```bash
make test-python-unit
```
```
11 changes: 6 additions & 5 deletions pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,14 @@
[build-system]
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",
"wheel",
"setuptools_scm>=6.2",
"grpcio",
"grpcio-tools>=1.47.0",
"mypy-protobuf==3.1",
"protobuf>=4.24.0,<5.0.0",
"sphinx!=4.0.0",
"wheel",
]
build-backend = "setuptools.build_meta"

Expand Down
7 changes: 4 additions & 3 deletions setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -403,11 +403,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