fix: Pinned substrait to fix protobuf issue

ntkathole · ntkathole · commit d0ef4da05dc9 · 2025-11-20T18:35:44.000+05:30
Signed-off-by: ntkathole &lt;nikhilkathole2683@gmail.com&gt;
diff --git a/pyproject.toml b/pyproject.toml
@@ -84,6 +84,7 @@ hbase = ["happybase>=1.2.0,<3"]
 ibis = [
     "ibis-framework>=9.0.0,<=9.5.0",
     "ibis-substrait>=4.0.0",
+    "substrait<0.25.0",  # TODO: remove this once we upgrade protobuf 
     "poetry-core<2",
     "poetry-dynamic-versioning",
 ]
diff --git a/sdk/python/requirements/py3.10-ci-requirements.txt b/sdk/python/requirements/py3.10-ci-requirements.txt
@@ -5359,10 +5359,12 @@ starlette==0.50.0 \
     # via
     #   fastapi
     #   mcp
-substrait==0.25.0 \
-    --hash=sha256:090feda0f1a6e996ce0baf2d64635ff4b9b2cae58542c7cf3f818ff5e88a2924 \
-    --hash=sha256:29ed969f8685109c06abab45dc557c661871c16d289d3fea146e30c36e80be78
-    # via ibis-substrait
+substrait==0.24.2 \
+    --hash=sha256:743cc352e96b0927b2cd37cd5a8fdac0a96a68df9600bd104fc36aebd222a836 \
+    --hash=sha256:d1d475833566fa9d67eed3273456883c0568486ccced92b524b31709d2817e19
+    # via
+    #   feast (setup.py)
+    #   ibis-substrait
 sympy==1.14.0 \
     --hash=sha256:d3d3fe8df1e5a0b42f0e7bdf50541697dbe7d23746e894990c030e2b05e72517 \
     --hash=sha256:e091cc3e99d2141a0ba2847328f5479b05d94a6635cb96148ccb3f34671bd8f5
diff --git a/sdk/python/requirements/py3.10-minimal-sdist-requirements.txt b/sdk/python/requirements/py3.10-minimal-sdist-requirements.txt
@@ -2842,7 +2842,9 @@ starlette==0.50.0 \
 substrait==0.24.2 \
     --hash=sha256:743cc352e96b0927b2cd37cd5a8fdac0a96a68df9600bd104fc36aebd222a836 \
     --hash=sha256:d1d475833566fa9d67eed3273456883c0568486ccced92b524b31709d2817e19
-    # via ibis-substrait
+    # via
+    #   feast (setup.py)
+    #   ibis-substrait
 tabulate==0.9.0 \
     --hash=sha256:0095b12bf5966de529c0feb1fa08671671b3368eec77d7ef7ab114be2c068b3c \
     --hash=sha256:024ca478df22e9340661486f85298cff5f6dcdba14f3813e8830015b9ed1948f
diff --git a/sdk/python/requirements/py3.11-ci-requirements.txt b/sdk/python/requirements/py3.11-ci-requirements.txt
@@ -5585,10 +5585,12 @@ starlette==0.50.0 \
     # via
     #   fastapi
     #   mcp
-substrait==0.25.0 \
-    --hash=sha256:090feda0f1a6e996ce0baf2d64635ff4b9b2cae58542c7cf3f818ff5e88a2924 \
-    --hash=sha256:29ed969f8685109c06abab45dc557c661871c16d289d3fea146e30c36e80be78
-    # via ibis-substrait
+substrait==0.24.2 \
+    --hash=sha256:743cc352e96b0927b2cd37cd5a8fdac0a96a68df9600bd104fc36aebd222a836 \
+    --hash=sha256:d1d475833566fa9d67eed3273456883c0568486ccced92b524b31709d2817e19
+    # via
+    #   feast (setup.py)
+    #   ibis-substrait
 sympy==1.14.0 \
     --hash=sha256:d3d3fe8df1e5a0b42f0e7bdf50541697dbe7d23746e894990c030e2b05e72517 \
     --hash=sha256:e091cc3e99d2141a0ba2847328f5479b05d94a6635cb96148ccb3f34671bd8f5
diff --git a/sdk/python/requirements/py3.11-minimal-sdist-requirements.txt b/sdk/python/requirements/py3.11-minimal-sdist-requirements.txt
@@ -2808,7 +2808,9 @@ starlette==0.50.0 \
 substrait==0.24.2 \
     --hash=sha256:743cc352e96b0927b2cd37cd5a8fdac0a96a68df9600bd104fc36aebd222a836 \
     --hash=sha256:d1d475833566fa9d67eed3273456883c0568486ccced92b524b31709d2817e19
-    # via ibis-substrait
+    # via
+    #   feast (setup.py)
+    #   ibis-substrait
 tabulate==0.9.0 \
     --hash=sha256:0095b12bf5966de529c0feb1fa08671671b3368eec77d7ef7ab114be2c068b3c \
     --hash=sha256:024ca478df22e9340661486f85298cff5f6dcdba14f3813e8830015b9ed1948f
diff --git a/sdk/python/requirements/py3.12-ci-requirements.txt b/sdk/python/requirements/py3.12-ci-requirements.txt
@@ -5576,10 +5576,12 @@ starlette==0.50.0 \
     # via
     #   fastapi
     #   mcp
-substrait==0.25.0 \
-    --hash=sha256:090feda0f1a6e996ce0baf2d64635ff4b9b2cae58542c7cf3f818ff5e88a2924 \
-    --hash=sha256:29ed969f8685109c06abab45dc557c661871c16d289d3fea146e30c36e80be78
-    # via ibis-substrait
+substrait==0.24.2 \
+    --hash=sha256:743cc352e96b0927b2cd37cd5a8fdac0a96a68df9600bd104fc36aebd222a836 \
+    --hash=sha256:d1d475833566fa9d67eed3273456883c0568486ccced92b524b31709d2817e19
+    # via
+    #   feast (setup.py)
+    #   ibis-substrait
 sympy==1.14.0 \
     --hash=sha256:d3d3fe8df1e5a0b42f0e7bdf50541697dbe7d23746e894990c030e2b05e72517 \
     --hash=sha256:e091cc3e99d2141a0ba2847328f5479b05d94a6635cb96148ccb3f34671bd8f5
diff --git a/sdk/python/requirements/py3.12-minimal-sdist-requirements.txt b/sdk/python/requirements/py3.12-minimal-sdist-requirements.txt
@@ -2800,7 +2800,9 @@ starlette==0.50.0 \
 substrait==0.24.2 \
     --hash=sha256:743cc352e96b0927b2cd37cd5a8fdac0a96a68df9600bd104fc36aebd222a836 \
     --hash=sha256:d1d475833566fa9d67eed3273456883c0568486ccced92b524b31709d2817e19
-    # via ibis-substrait
+    # via
+    #   feast (setup.py)
+    #   ibis-substrait
 tabulate==0.9.0 \
     --hash=sha256:0095b12bf5966de529c0feb1fa08671671b3368eec77d7ef7ab114be2c068b3c \
     --hash=sha256:024ca478df22e9340661486f85298cff5f6dcdba14f3813e8830015b9ed1948f
diff --git a/setup.py b/setup.py
@@ -134,6 +134,7 @@
 IBIS_REQUIRED = [
     "ibis-framework>=9.0.0,<10",
     "ibis-substrait>=4.0.0",
+    "substrait<0.25.0",  # TODO: remove this once we upgrade protobuf 
 ]
 
 GRPCIO_REQUIRED = [

Original file line number	Diff line number	Diff line change
`@@ -84,6 +84,7 @@ hbase = ["happybase>=1.2.0,<3"]`
`84`	`84`	`ibis = [`
`85`	`85`	`"ibis-framework>=9.0.0,<=9.5.0",`
`86`	`86`	`"ibis-substrait>=4.0.0",`
	`87`	`+ "substrait<0.25.0", # TODO: remove this once we upgrade protobuf`
`87`	`88`	`"poetry-core<2",`
`88`	`89`	`"poetry-dynamic-versioning",`
`89`	`90`	`]`
Original file line number	Diff line number	Diff line change
`@@ -134,6 +134,7 @@`
`134`	`134`	`IBIS_REQUIRED = [`
`135`	`135`	`"ibis-framework>=9.0.0,<10",`
`136`	`136`	`"ibis-substrait>=4.0.0",`
	`137`	`+ "substrait<0.25.0", # TODO: remove this once we upgrade protobuf`
`137`	`138`	`]`
`138`	`139`
`139`	`140`	`GRPCIO_REQUIRED = [`