From d2f59ea123a1773036120308596f771c54142775 Mon Sep 17 00:00:00 2001 From: Zach Barnett Date: Wed, 4 Sep 2024 09:29:21 -0500 Subject: [PATCH 1/8] noop test go --- protos/feast/registry/RegistryServer.proto | 1 - 1 file changed, 1 deletion(-) diff --git a/protos/feast/registry/RegistryServer.proto b/protos/feast/registry/RegistryServer.proto index 44529f5409c..131da28e3ae 100644 --- a/protos/feast/registry/RegistryServer.proto +++ b/protos/feast/registry/RegistryServer.proto @@ -67,7 +67,6 @@ 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 { From 6b057f4ab0f020c8a637afe47a55563d92244d61 Mon Sep 17 00:00:00 2001 From: Zach Barnett Date: Wed, 4 Sep 2024 09:47:55 -0500 Subject: [PATCH 2/8] check go compilation --- Makefile | 6 +++--- pyproject.toml | 14 ++++++++++++-- 2 files changed, 15 insertions(+), 5 deletions(-) diff --git a/Makefile b/Makefile index 2ee3b60771d..3e7a7ef62ac 100644 --- a/Makefile +++ b/Makefile @@ -395,10 +395,10 @@ 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 +# 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 python setup.py build_go_protos install-feast-ci-locally: diff --git a/pyproject.toml b/pyproject.toml index 00170ab443e..13ea2e9a557 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -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] @@ -26,4 +36,4 @@ exclude = [ "pb2.py", ".pyi", "protos", - "sdk/python/feast/embedded_go/lib"] + "sdk/python/feast/embedded_go/lib"] \ No newline at end of file From 2e1f828f2f4e0bd355f958e7e14c732fac3f6d69 Mon Sep 17 00:00:00 2001 From: Zach Barnett Date: Wed, 4 Sep 2024 09:55:29 -0500 Subject: [PATCH 3/8] update setup_requires with grpcio-tools --- setup.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/setup.py b/setup.py index 6ea0f76d379..0efe43362cd 100644 --- a/setup.py +++ b/setup.py @@ -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.24.0", "pybindgen==0.22.0", + "setuptools_scm>=6.2", ], cmdclass={ "build_python_protos": BuildPythonProtosCommand, From b2e61b24211ba244665be3e52b1951892db57e97 Mon Sep 17 00:00:00 2001 From: Zach Barnett Date: Wed, 4 Sep 2024 10:08:37 -0500 Subject: [PATCH 4/8] keep protoc dependencies command for go --- Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index 3e7a7ef62ac..2b7d4c7b47c 100644 --- a/Makefile +++ b/Makefile @@ -395,10 +395,10 @@ 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 +install-protoc-dependencies: + pip install --ignore-installed "protobuf==4.24.0" "grpcio-tools>=1.56.2,<2" mypy-protobuf==3.1 -compile-protos-go: install-go-proto-dependencies +compile-protos-go: install-go-proto-dependencies install-protoc-dependencies python setup.py build_go_protos install-feast-ci-locally: From 75a3b5c1c8dee04b5d14eaad58df298b757eb2ad Mon Sep 17 00:00:00 2001 From: Zach Barnett Date: Wed, 4 Sep 2024 10:22:43 -0500 Subject: [PATCH 5/8] set protobuf to 4.25.4 instead of 4.24.0 --- Makefile | 2 +- pyproject.toml | 2 +- setup.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index 2b7d4c7b47c..005a24369bf 100644 --- a/Makefile +++ b/Makefile @@ -396,7 +396,7 @@ install-go-ci-dependencies: python -m pip install "pybindgen==0.22.1" "protobuf>=4.24.0,<5" install-protoc-dependencies: - pip install --ignore-installed "protobuf==4.24.0" "grpcio-tools>=1.56.2,<2" mypy-protobuf==3.1 + pip install --ignore-installed "protobuf==4.25.4" "grpcio-tools>=1.56.2,<2" mypy-protobuf==3.1 compile-protos-go: install-go-proto-dependencies install-protoc-dependencies python setup.py build_go_protos diff --git a/pyproject.toml b/pyproject.toml index 13ea2e9a557..9066ccaebfb 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -3,7 +3,7 @@ requires = [ "grpcio-tools>=1.56.2,<2", "grpcio>=1.56.2,<2", "mypy-protobuf==3.1", - "protobuf==4.24.0", + "protobuf==4.25.4", "pybindgen==0.22.0", "setuptools>=60", "setuptools_scm>=6.2", diff --git a/setup.py b/setup.py index 0efe43362cd..57bb7a3f24e 100644 --- a/setup.py +++ b/setup.py @@ -501,7 +501,7 @@ def run(self): "grpcio-tools>=1.56.2,<2", "grpcio>=1.56.2,<2", "mypy-protobuf==3.1", - "protobuf==4.24.0", + "protobuf==4.25.4", "pybindgen==0.22.0", "setuptools_scm>=6.2", ], From b1b7510c9ad65ceaa6e35a1687fd2dda597570e6 Mon Sep 17 00:00:00 2001 From: Zach Barnett Date: Wed, 4 Sep 2024 10:31:39 -0500 Subject: [PATCH 6/8] fix: add additional open source changes in --- .github/workflows/build_wheels.yml | 1 - Makefile | 4 +--- environment-setup.md | 1 - 3 files changed, 1 insertion(+), 5 deletions(-) diff --git a/.github/workflows/build_wheels.yml b/.github/workflows/build_wheels.yml index 72cb485b80b..0f77e2f30a4 100644 --- a/.github/workflows/build_wheels.yml +++ b/.github/workflows/build_wheels.yml @@ -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 diff --git a/Makefile b/Makefile index 005a24369bf..d8faf567f09 100644 --- a/Makefile +++ b/Makefile @@ -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: +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 - -compile-protos-go: install-go-proto-dependencies install-protoc-dependencies python setup.py build_go_protos install-feast-ci-locally: diff --git a/environment-setup.md b/environment-setup.md index 5dde9dfd942..0f91ca4fee0 100644 --- a/environment-setup.md +++ b/environment-setup.md @@ -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 From 853015fa14c04a4d1e18009188d90b98cd3e5ec5 Mon Sep 17 00:00:00 2001 From: Zach Barnett Date: Wed, 4 Sep 2024 10:48:59 -0500 Subject: [PATCH 7/8] remove install protobuf from Makefile --- Makefile | 1 - protos/feast/registry/RegistryServer.proto | 1 + 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index d8faf567f09..54a8d3b8172 100644 --- a/Makefile +++ b/Makefile @@ -396,7 +396,6 @@ install-go-ci-dependencies: python -m pip install "pybindgen==0.22.1" "protobuf>=4.24.0,<5" 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: diff --git a/protos/feast/registry/RegistryServer.proto b/protos/feast/registry/RegistryServer.proto index 131da28e3ae..6ccc1449a9d 100644 --- a/protos/feast/registry/RegistryServer.proto +++ b/protos/feast/registry/RegistryServer.proto @@ -67,6 +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 { From 0613c1f161b4e8103c68cd6e0adb4e2857e5f600 Mon Sep 17 00:00:00 2001 From: Zach Barnett Date: Wed, 4 Sep 2024 10:52:11 -0500 Subject: [PATCH 8/8] fix: need explicit protobuf and grpcio-tools install in compile-protos-go --- Makefile | 1 + 1 file changed, 1 insertion(+) diff --git a/Makefile b/Makefile index 54a8d3b8172..d8faf567f09 100644 --- a/Makefile +++ b/Makefile @@ -396,6 +396,7 @@ install-go-ci-dependencies: python -m pip install "pybindgen==0.22.1" "protobuf>=4.24.0,<5" 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: