Skip to content

Commit

Permalink
remove thriftpy2 ceiling (#4521)
Browse files Browse the repository at this point in the history
#4496 introduced a ceiling on `thriftpy2`. Context: #4496 (comment)

The bug that ceiling was added to avoid was fixed in v0.5.2 of `thriftpy2`, which was just released (#4478 (comment)).

This removes that, adding `!=` constraints to skip the 2 versions that `cugraph` was not compatible with.

## Notes for Reviewers

### Why not a floor?

I'm proposing adding `!=` constraints to skip v0.5.0 and v0.5.1 to maximize `cugraph`'s compatibility with other environments... that'd allow it to be used in environments with `thriftpy2<0.5.0` and in environments with `thriftpy2>0.5.2`.

Let me know if you'd prefer the simplicity of a floor like `>=0.5.2` instead.

Authors:
  - James Lamb (https://github.com/jameslamb)
  - Ralph Liu (https://github.com/nv-rliu)

Approvers:
  - Bradley Dice (https://github.com/bdice)
  - Ralph Liu (https://github.com/nv-rliu)
  - Rick Ratzel (https://github.com/rlratzel)

URL: #4521
  • Loading branch information
jameslamb authored Jul 19, 2024
1 parent 9c4585c commit c9d2843
Show file tree
Hide file tree
Showing 6 changed files with 7 additions and 9 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 @@ -71,7 +71,7 @@ dependencies:
- sphinx-markdown-tables
- sphinx<6
- sphinxcontrib-websupport
- thriftpy2<=0.5.0
- thriftpy2!=0.5.0,!=0.5.1
- ucx-proc=*=gpu
- ucx-py==0.39.*,>=0.0.0a0
- wget
Expand Down
2 changes: 1 addition & 1 deletion conda/environments/all_cuda-125_arch-x86_64.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ dependencies:
- sphinx-markdown-tables
- sphinx<6
- sphinxcontrib-websupport
- thriftpy2<=0.5.0
- thriftpy2!=0.5.0,!=0.5.1
- ucx-proc=*=gpu
- ucx-py==0.39.*,>=0.0.0a0
- wget
Expand Down
4 changes: 2 additions & 2 deletions conda/recipes/cugraph-service/meta.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ outputs:
- rapids-build-backend>=0.3.1,<0.4.0.dev0
run:
- python
- thriftpy2 >=0.4.15
- thriftpy2 >=0.4.15,!=0.5.0,!=0.5.1

- name: cugraph-service-server
version: {{ version }}
Expand Down Expand Up @@ -65,7 +65,7 @@ outputs:
- numpy >=1.23,<2.0a0
- python
- rapids-dask-dependency ={{ minor_version }}
- thriftpy2 >=0.4.15
- thriftpy2 >=0.4.15,!=0.5.0,!=0.5.1
- ucx-py {{ ucx_py_version }}

tests:
Expand Down
4 changes: 1 addition & 3 deletions dependencies.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -563,9 +563,7 @@ dependencies:
common:
- output_types: [conda, pyproject]
packages:
# this thriftpy2 entry can be removed entirely (or switched to a '!=')
# once a new release of that project resolves https://github.com/Thriftpy/thriftpy2/issues/281
- &thrift thriftpy2<=0.5.0
- &thrift thriftpy2!=0.5.0,!=0.5.1
python_run_cugraph_service_server:
common:
- output_types: [conda, pyproject]
Expand Down
2 changes: 1 addition & 1 deletion python/cugraph-service/client/pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ authors = [
license = { text = "Apache 2.0" }
requires-python = ">=3.9"
dependencies = [
"thriftpy2<=0.5.0",
"thriftpy2!=0.5.0,!=0.5.1",
] # This list was generated by `rapids-dependency-file-generator`. To make changes, edit ../../../dependencies.yaml and run `rapids-dependency-file-generator`.
classifiers = [
"Intended Audience :: Developers",
Expand Down
2 changes: 1 addition & 1 deletion python/cugraph-service/server/pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ dependencies = [
"numpy>=1.23,<2.0a0",
"rapids-dask-dependency==24.8.*,>=0.0.0a0",
"rmm==24.8.*,>=0.0.0a0",
"thriftpy2<=0.5.0",
"thriftpy2!=0.5.0,!=0.5.1",
"ucx-py==0.39.*,>=0.0.0a0",
] # This list was generated by `rapids-dependency-file-generator`. To make changes, edit ../../../dependencies.yaml and run `rapids-dependency-file-generator`.
classifiers = [
Expand Down

0 comments on commit c9d2843

Please sign in to comment.