Skip to content

Commit

Permalink
FIX-#4589: Pin protobuf<4.0.0 to fix ray. (#4590)
Browse files Browse the repository at this point in the history
Signed-off-by: mvashishtha <mahesh@ponder.io>
  • Loading branch information
mvashishtha authored and RehanSD committed Jun 24, 2022
1 parent efdc97c commit 92fecf0
Show file tree
Hide file tree
Showing 4 changed files with 17 additions and 1 deletion.
3 changes: 3 additions & 0 deletions docs/requirements-doc.txt
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,9 @@ sphinx-click
# Pin ray to < 1.13.0 to work around GH#4564
# TODO(https://github.com/modin-project/modin/issues/4564): let ray go past 1.13.0.
ray[default]>=1.4.0,<1.13.0
# Following https://github.com/ray-project/ray/pull/25648, pin protobuf < 4,
# because versions >= 4.0.0 are incompatible with ray<1.13.0.
protobuf<4.0.0
git+https://github.com/modin-project/modin.git@master#egg=modin[all]
sphinxcontrib_plantuml
sphinx-issues
Expand Down
3 changes: 3 additions & 0 deletions environment-dev.yml
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,9 @@ dependencies:
# Pin ray to < 1.13.0 to work around GH#4564
# TODO(https://github.com/modin-project/modin/issues/4564): let ray go past 1.13.0.
- ray[default]>=1.4.0,<1.13.0
# Following https://github.com/ray-project/ray/pull/25648, pin protobuf < 4,
# because versions >= 4.0.0 are incompatible with ray<1.13.0.
- protobuf<4.0.0
- connectorx>=0.2.6a4
# TODO: remove when resolving GH#4398
- redis>=3.5.0,<4.0.0
Expand Down
3 changes: 3 additions & 0 deletions requirements-dev.txt
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,9 @@ distributed>=2.22.0,<2022.2.0
# Pin ray to < 1.13.0 to work around GH#4564
# TODO(https://github.com/modin-project/modin/issues/4564): let ray go past 1.13.0.
ray[default]>=1.4.0,<1.13.0
# Following https://github.com/ray-project/ray/pull/25648, pin protobuf < 4,
# because versions >= 4.0.0 are incompatible with ray<1.13.0.
protobuf<4.0.0
redis>=3.5.0,<4.0.0
psutil==5.6.6
fsspec
Expand Down
9 changes: 8 additions & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,14 @@
# TODO: remove redis dependency when resolving GH#4398
# Pin ray to < 1.13.0 to work around GH#4564
# TODO(https://github.com/modin-project/modin/issues/4564): let ray go past 1.13.0.
ray_deps = ["ray[default]>=1.4.0,<1.13.0", "pyarrow>=4.0.1", "redis>=3.5.0,<4.0.0"]
# Following https://github.com/ray-project/ray/pull/25648, pin protobuf < 4,
# because versions >= 4.0.0 are incompatible with ray<1.13.0.
ray_deps = [
"ray[default]>=1.4.0,<1.13.0",
"pyarrow>=4.0.1",
"redis>=3.5.0,<4.0.0",
"protobuf<4.0.0",
]
remote_deps = ["rpyc==4.1.5", "cloudpickle", "boto3"]
spreadsheet_deps = ["modin-spreadsheet>=0.1.0"]
sql_deps = ["dfsql>=0.4.2", "pyparsing<=2.4.7"]
Expand Down

0 comments on commit 92fecf0

Please sign in to comment.