From ed11af700293f7a440550b304726b024e18b2192 Mon Sep 17 00:00:00 2001 From: Paul Taylor Date: Tue, 13 Aug 2019 10:32:10 -0700 Subject: [PATCH 1/3] remove duplicate dlpack definition --- conda/recipes/cudf/meta.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/conda/recipes/cudf/meta.yaml b/conda/recipes/cudf/meta.yaml index 789f4351f05..ae81045161e 100644 --- a/conda/recipes/cudf/meta.yaml +++ b/conda/recipes/cudf/meta.yaml @@ -25,7 +25,6 @@ requirements: - dlpack - pyarrow 0.14.1.* - libcudf {{ version }} - - dlpack run: - python - pandas>=0.24.2,<0.25 From c53e44672939658f66a12d808d5903f5a218fa46 Mon Sep 17 00:00:00 2001 From: ptaylor Date: Tue, 13 Aug 2019 10:36:22 -0700 Subject: [PATCH 2/3] changelog --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 87b6d75b6c3..a99d6c4c91b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -160,6 +160,7 @@ - PR #2466 Fix `dataframe.query` returning null rows erroneously - PR #2548 Orc reader: fix non-deterministic data decoding at chunk boundaries - PR #2521 Fix casting datetimes from/to the same resolution +- PR #2544 Remove duplicate `dlpack` definition in conda recipe # cuDF 0.8.0 (27 June 2019) From 73b0ee8349f48a013e26ccf0d3109668359228e6 Mon Sep 17 00:00:00 2001 From: ptaylor Date: Tue, 13 Aug 2019 10:37:29 -0700 Subject: [PATCH 3/3] changelog --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index a99d6c4c91b..a7b8bc1e315 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -160,7 +160,7 @@ - PR #2466 Fix `dataframe.query` returning null rows erroneously - PR #2548 Orc reader: fix non-deterministic data decoding at chunk boundaries - PR #2521 Fix casting datetimes from/to the same resolution -- PR #2544 Remove duplicate `dlpack` definition in conda recipe +- PR #2560 Remove duplicate `dlpack` definition in conda recipe # cuDF 0.8.0 (27 June 2019)