Skip to content

Commit

Permalink
Merge branch 'branch-0.19' into spark-hash-struct
Browse files Browse the repository at this point in the history
  • Loading branch information
jlowe committed Mar 30, 2021
2 parents 87687c9 + 7d49f75 commit 1fdcdf5
Show file tree
Hide file tree
Showing 5 changed files with 13 additions and 13 deletions.
2 changes: 1 addition & 1 deletion conda/recipes/cudf/meta.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ requirements:
- numba >=0.49.0
- dlpack
- pyarrow 1.0.1
- libcudf {{ version }}
- libcudf {{ version }}=*_{{ GIT_DESCRIBE_NUMBER }}
- rmm {{ minor_version }}
- cudatoolkit {{ cuda_version }}
run:
Expand Down
8 changes: 4 additions & 4 deletions conda/recipes/cudf_kafka/meta.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -29,12 +29,12 @@ requirements:
- python
- cython >=0.29,<0.30
- setuptools
- cudf {{ version }}
- libcudf_kafka {{ version }}
- cudf {{ version }}=*_{{ GIT_DESCRIBE_NUMBER }}
- libcudf_kafka {{ version }}=*_{{ GIT_DESCRIBE_NUMBER }}
run:
- libcudf_kafka {{ version }}
- libcudf_kafka {{ version }}=*_{{ GIT_DESCRIBE_NUMBER }}
- python-confluent-kafka
- cudf {{ version }}
- cudf {{ version }}=*_{{ GIT_DESCRIBE_NUMBER }}

test:
requires:
Expand Down
8 changes: 4 additions & 4 deletions conda/recipes/custreamz/meta.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -23,15 +23,15 @@ requirements:
host:
- python
- python-confluent-kafka
- cudf_kafka {{ version }}
- cudf_kafka {{ version }}=*_{{ GIT_DESCRIBE_NUMBER }}
run:
- python
- streamz
- cudf {{ version }}
- streamz
- cudf {{ version }}=*_{{ GIT_DESCRIBE_NUMBER }}
- dask >=2.22.0
- distributed >=2.22.0
- python-confluent-kafka
- cudf_kafka {{ version }}
- cudf_kafka {{ version }}=*_{{ GIT_DESCRIBE_NUMBER }}

test:
requires:
Expand Down
6 changes: 3 additions & 3 deletions conda/recipes/dask-cudf/meta.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -22,15 +22,15 @@ build:
requirements:
host:
- python
- cudf {{ version }}
- cudf {{ version }}=*_{{ GIT_DESCRIBE_NUMBER }}
- dask >=2.22.0
- distributed >=2.22.0
run:
- python
- cudf {{ version }}
- cudf {{ version }}=*_{{ GIT_DESCRIBE_NUMBER }}
- dask >=2.22.0
- distributed >=2.22.0

test:
requires:
- cudatoolkit {{ cuda_version }}.*
Expand Down
2 changes: 1 addition & 1 deletion conda/recipes/libcudf_kafka/meta.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ requirements:
build:
- cmake >=3.17.0
host:
- libcudf {{ version }}
- libcudf {{ version }}=*_{{ GIT_DESCRIBE_NUMBER }}
- librdkafka >=1.5.0,<1.5.3
run:
- {{ pin_compatible('librdkafka', max_pin='x.x') }} #TODO: librdkafka should be automatically included here by run_exports but is not
Expand Down

0 comments on commit 1fdcdf5

Please sign in to comment.