Skip to content

Commit

Permalink
Update to protobuf>=4.21.6,<4.22. (#12864)
Browse files Browse the repository at this point in the history
This updates cudf's protobuf version to resolve #12830 and a downstream conflict with `ortools` (a dependency of cuopt), which requires `protobuf>=4.21.5`.

Authors:
  - Bradley Dice (https://github.com/bdice)

Approvers:
  - GALI PREM SAGAR (https://github.com/galipremsagar)
  - Jordan Jacobelli (https://github.com/jjacobelli)

URL: #12864
  • Loading branch information
bdice authored Mar 6, 2023
1 parent f00baad commit 98b92a5
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion conda/environments/all_cuda-118_arch-x86_64.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ dependencies:
- pandoc<=2.0.0
- pip
- pre-commit
- protobuf=4.21
- protobuf>=4.21.6,<4.22
- ptxcompiler
- pyarrow=10
- pydata-sphinx-theme
Expand Down
4 changes: 2 additions & 2 deletions conda/recipes/cudf/meta.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ requirements:
- ninja
- sysroot_{{ target_platform }} {{ sysroot_version }}
host:
- protobuf =4.21
- protobuf >=4.21.6,<4.22
- python
- cython >=0.29,<0.30
- scikit-build >=0.13.1
Expand All @@ -57,7 +57,7 @@ requirements:
- rmm ={{ minor_version }}
- cudatoolkit ={{ cuda_version }}
run:
- protobuf =4.21
- protobuf >=4.21.6,<4.22
- python
- typing_extensions
- pandas >=1.0,<1.6.0dev0
Expand Down
2 changes: 1 addition & 1 deletion dependencies.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@ dependencies:
- scikit-build>=0.13.1
- output_types: conda
packages:
- protobuf=4.21
- protobuf>=4.21.6,<4.22
cudatoolkit:
specific:
- output_types: conda
Expand Down
2 changes: 1 addition & 1 deletion python/cudf/pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ dependencies = [
"nvtx>=0.2.1",
"packaging",
"pandas>=1.0,<1.6.0dev0",
"protobuf==4.21",
"protobuf>=4.21.6,<4.22",
"typing_extensions",
# Allow floating minor versions for Arrow.
"pyarrow==10",
Expand Down

0 comments on commit 98b92a5

Please sign in to comment.