From d00922a6a7a989f7dabbd34b1ea6a059ff48db1e Mon Sep 17 00:00:00 2001
From: Raymond Douglass <ray@raydouglass.com>
Date: Mon, 11 Mar 2019 11:47:58 -0400
Subject: [PATCH] BLD Update conda recipes

---
 ci/cpu/cugraph/build_cugraph.sh       |  8 ++++++--
 ci/cpu/libcugraph/build_libcugraph.sh |  2 +-
 conda/recipes/cugraph/meta.yaml       |  2 ++
 conda/recipes/libcugraph/meta.yaml    |  4 ++--
 conda_build.sh                        | 16 +++++++++-------
 5 files changed, 20 insertions(+), 12 deletions(-)

diff --git a/ci/cpu/cugraph/build_cugraph.sh b/ci/cpu/cugraph/build_cugraph.sh
index 4d991d1d5c4..f7f632a0d05 100755
--- a/ci/cpu/cugraph/build_cugraph.sh
+++ b/ci/cpu/cugraph/build_cugraph.sh
@@ -3,10 +3,14 @@ set -e
 
 if [ "$BUILD_CUGRAPH" == "1" ]; then
   echo "Building cugraph"
-  export CUDF_BUILD_NO_GPU_TEST=1
+  CUDA_REL=${CUDA:0:3}
+  if [ "${CUDA:0:2}" == '10' ]; then
+    # CUDA 10 release
+    CUDA_REL=${CUDA:0:4}
+  fi
 
   if [ "$BUILD_ABI" == "1" ]; then
-    conda build conda/recipes/cugraph -c rapidsai -c nvidia -c numba -c conda-forge -c defaults --python=$PYTHON
+    conda build conda/recipes/cugraph -c nvidia/label/cuda${CUDA_REL} -c rapidsai/label/cuda${CUDA_REL} -c rapidsai-nightly/label/cuda${CUDA_REL} -c numba -c conda-forge -c defaults --python=$PYTHON
   else
     conda build conda/recipes/cugraph -c rapidsai/label/cf201901 -c nvidia/label/cf201901 -c numba -c conda-forge/label/cf201901 -c defaults --python=$PYTHON
   fi
diff --git a/ci/cpu/libcugraph/build_libcugraph.sh b/ci/cpu/libcugraph/build_libcugraph.sh
index db0b30fd048..9eebba2818e 100755
--- a/ci/cpu/libcugraph/build_libcugraph.sh
+++ b/ci/cpu/libcugraph/build_libcugraph.sh
@@ -10,7 +10,7 @@ if [ "$BUILD_LIBCUGRAPH" == '1' ]; then
   fi
 
   if [ "$BUILD_ABI" == "1" ]; then
-    conda build conda/recipes/libcugraph -c nvidia/label/cuda${CUDA_REL} -c rapidsai/label/cuda${CUDA_REL} -c numba -c conda-forge -c defaults
+    conda build conda/recipes/libcugraph -c nvidia/label/cuda${CUDA_REL} -c rapidsai/label/cuda${CUDA_REL} -c rapidsai-nightly/label/cuda${CUDA_REL} -c numba -c conda-forge -c defaults
   else
     conda build conda/recipes/libcugraph -c nvidia/label/cf201901-cuda${CUDA_REL} -c rapidsai/label/cf201901-cuda${CUDA_REL} -c numba -c conda-forge/label/cf201901 -c defaults
   fi
diff --git a/conda/recipes/cugraph/meta.yaml b/conda/recipes/cugraph/meta.yaml
index d445709e00b..c83c9e965c3 100644
--- a/conda/recipes/cugraph/meta.yaml
+++ b/conda/recipes/cugraph/meta.yaml
@@ -25,8 +25,10 @@ build:
 requirements:
   build:
     - libcugraph={{ version }}
+    - cudf=0.6
   run:
     - libcugraph={{ version }}
+    - cudf=0.6
 
 #test:
 #  commands:
diff --git a/conda/recipes/libcugraph/meta.yaml b/conda/recipes/libcugraph/meta.yaml
index a4f6b564fe1..498ac17991c 100644
--- a/conda/recipes/libcugraph/meta.yaml
+++ b/conda/recipes/libcugraph/meta.yaml
@@ -25,12 +25,12 @@ build:
 requirements:
   build:
     - cmake>=3.12.4
-    - cudf>=0.5.1,<0.6.0
+    - libcudf=0.6
     - networkx
     - cython
     - nvgraph
   run:
-    - cudf>=0.5.1,<0.6.0
+    - libcudf=0.6
     - networkx
     - cython
     - nvgraph
diff --git a/conda_build.sh b/conda_build.sh
index 9a5b567a30f..906ff168925 100755
--- a/conda_build.sh
+++ b/conda_build.sh
@@ -1,19 +1,21 @@
 #!/usr/bin/env bash
 set -xe
 
+CUDA_REL=${CUDA:0:3}
+if [ "${CUDA:0:2}" == '10' ]; then
+# CUDA 10 release
+CUDA_REL=${CUDA:0:4}
+fi
+
 conda install conda-build anaconda-client conda-verify -y
-conda build -c nvidia -c rapidsai -c conda-forge -c defaults --python=${PYTHON} conda/recipes/cugraph
+conda build -c nvidia -c rapidsai -c rapidsai-nightly/label/cuda${CUDA_REL} -c conda-forge -c defaults --python=${PYTHON} conda/recipes/cugraph
 
 if [ "$UPLOAD_PACKAGE" == '1' ]; then
     export UPLOADFILE=`conda build -c nvidia -c rapidsai -c conda-forge -c defaults --python=${PYTHON} conda/recipes/cugraph --output`
     SOURCE_BRANCH=master
 
     test -e ${UPLOADFILE}
-    CUDA_REL=${CUDA:0:3}
-    if [ "${CUDA:0:2}" == '10' ]; then
-    # CUDA 10 release
-    CUDA_REL=${CUDA:0:4}
-    fi
+
 
     LABEL_OPTION="--label dev --label cuda${CUDA_REL}"
     if [ "${LABEL_MAIN}" == '1' ]; then
@@ -28,7 +30,7 @@ if [ "$UPLOAD_PACKAGE" == '1' ]; then
 
     echo "Upload"
     echo ${UPLOADFILE}
-    anaconda -t ${MY_UPLOAD_KEY} upload -u nvidia ${LABEL_OPTION} --force ${UPLOADFILE}
+    anaconda -t ${MY_UPLOAD_KEY} upload -u ${CONDA_USERNAME:-rapidsai} ${LABEL_OPTION} --force ${UPLOADFILE}
 else
     echo "Skipping upload"
 fi
\ No newline at end of file