Merge pull request #2566 from rapidsai/branch-0.9

[gpuCI] Auto-merge branch-0.9 to branch-0.10 [skip ci]
rapidsai · Aug 13, 2019 · 34d6523 · 34d6523
2 parents e7d4dd4 + e6dacd1
commit 34d6523
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 1 deletion.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -173,6 +173,7 @@
 - PR #2548 Orc reader: fix non-deterministic data decoding at chunk boundaries
 - PR #2557 fix cudautils import in string.py
 - PR #2521 Fix casting datetimes from/to the same resolution
+- PR #2560 Remove duplicate `dlpack` definition in conda recipe
 
 
 # cuDF 0.8.0 (27 June 2019)

diff --git 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
-Original file line number
+Diff line change
@@ Expand Up / @@ -25,7 +25,6 @@ requirements: @@
         - dlpack
         - pyarrow 0.14.1.*
         - libcudf {{ version }}
-        - dlpack
       run:
         - python
         - pandas>=0.24.2,<0.25
@@ Expand Down @@