Skip to content
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

Update to protobuf>=4.21.6,<4.22. #12864

Merged
merged 7 commits into from
Mar 6, 2023
Merged

Update to protobuf>=4.21.6,<4.22. #12864

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
2731889
Update to protobuf>=4.21.6,<4.22.
bdice Feb 28, 2023
563909c
Bump to protobuf>=4.22,<4.23.
bdice Feb 28, 2023
ccfb3b7
Revert "Bump to protobuf>=4.22,<4.23."
bdice Feb 28, 2023
65be6cc
Merge remote-tracking branch 'upstream/branch-23.04' into update-prot…
bdice Feb 28, 2023
a794434
Merge branch 'branch-23.04' into update-protobuf
bdice Mar 6, 2023
8b556e0
Merge branch 'branch-23.04' into update-protobuf
bdice Mar 6, 2023
9ec1bb7
Merge remote-tracking branch 'upstream/branch-23.04' into update-prot…
bdice Mar 6, 2023
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
2 changes: 1 addition & 1 deletion conda/environments/all_cuda-118_arch-x86_64.yaml
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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