Update to have the normal rapidsai channel before the nightly so it…

… can be easily adjusted for testing
revans2 · Mar 13, 2019 · dbce617 · dbce617
1 parent 3043724
commit dbce617
Show file tree

Hide file tree

Showing 8 changed files with 15 additions and 12 deletions.
diff --git a/ci/cpu/cudf/build_cudf.sh b/ci/cpu/cudf/build_cudf.sh
@@ -5,8 +5,8 @@ if [ "$BUILD_CUDF" == "1" ]; then
   export CUDF_BUILD_NO_GPU_TEST=1
 
   if [ "$BUILD_ABI" == "1" ]; then
-    conda build conda/recipes/cudf -c rapidsai-nightly -c nvidia -c numba -c conda-forge -c defaults --python=$PYTHON
+    conda build conda/recipes/cudf -c rapidsai -c rapidsai-nightly -c nvidia -c numba -c conda-forge -c defaults --python=$PYTHON
   else
-    conda build conda/recipes/cudf -c rapidsai-nightly/label/cf201901 -c nvidia/label/cf201901 -c numba -c conda-forge/label/cf201901 -c defaults --python=$PYTHON
+    conda build conda/recipes/cudf -c rapidsai/label/cf201901 -c rapidsai-nightly/label/cf201901 -c nvidia/label/cf201901 -c numba -c conda-forge/label/cf201901 -c defaults --python=$PYTHON
   fi
 fi
diff --git a/ci/cpu/cudf/upload-anaconda.sh b/ci/cpu/cudf/upload-anaconda.sh
@@ -6,9 +6,9 @@ set -e
 
 if [ "$BUILD_CUDF" == "1" ]; then
   if [ "$BUILD_ABI" == "1" ]; then
-    export UPLOADFILE=`conda build conda/recipes/cudf -c rapidsai-nightly -c nvidia -c numba -c conda-forge -c defaults --python=$PYTHON --output`
+    export UPLOADFILE=`conda build conda/recipes/cudf -c rapidsai -c rapidsai-nightly -c nvidia -c numba -c conda-forge -c defaults --python=$PYTHON --output`
   else
-    export UPLOADFILE=`conda build conda/recipes/cudf -c rapidsai-nightly/label/cf201901 -c nvidia/label/cf201901 -c numba -c conda-forge/label/cf201901 -c defaults --python=$PYTHON --output`
+    export UPLOADFILE=`conda build conda/recipes/cudf -c rapidsai/label/cf201901 -c rapidsai-nightly/label/cf201901 -c nvidia/label/cf201901 -c numba -c conda-forge/label/cf201901 -c defaults --python=$PYTHON --output`
   fi
 
   SOURCE_BRANCH=master

diff --git a/ci/cpu/libcudf/build_libcudf.sh b/ci/cpu/libcudf/build_libcudf.sh
@@ -9,8 +9,8 @@ if [ "$BUILD_LIBCUDF" == '1' -o "$BUILD_CFFI" == '1' ]; then
   fi
 
   if [ "$BUILD_ABI" == "1" ]; then
-    conda build conda/recipes/libcudf -c nvidia/label/cuda${CUDA_REL} -c rapidsai-nightly/label/cuda${CUDA_REL} -c numba -c conda-forge -c defaults
+    conda build conda/recipes/libcudf -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/libcudf -c nvidia/label/cf201901-cuda${CUDA_REL} -c rapidsai-nightly/label/cf201901-cuda${CUDA_REL} -c numba -c conda-forge/label/cf201901 -c defaults
+    conda build conda/recipes/libcudf -c nvidia/label/cf201901-cuda${CUDA_REL} -c rapidsai/label/cf201901-cuda${CUDA_REL} -c rapidsai-nightly/label/cf201901-cuda${CUDA_REL} -c numba -c conda-forge/label/cf201901 -c defaults
   fi
 fi
diff --git a/ci/cpu/libcudf/build_libcudf_cffi.sh b/ci/cpu/libcudf/build_libcudf_cffi.sh
@@ -9,8 +9,8 @@ if [ "$BUILD_CFFI" == '1' ]; then
   fi
 
   if [ "$BUILD_ABI" == "1" ]; then
-    conda build conda/recipes/libcudf_cffi -c nvidia/label/cuda${CUDA_REL} -c rapidsai-nightly/label/cuda${CUDA_REL} -c numba -c conda-forge -c defaults --python=$PYTHON
+    conda build conda/recipes/libcudf_cffi -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/libcudf_cffi -c nvidia/label/cf201901-cuda${CUDA_REL} -c rapidsai-nightly/label/cf201901-cuda${CUDA_REL} -c numba -c conda-forge/label/cf201901 -c defaults --python=$PYTHON
+    conda build conda/recipes/libcudf_cffi -c nvidia/label/cf201901-cuda${CUDA_REL} -c rapidsai/label/cf201901-cuda${CUDA_REL} -c rapidsai-nightly/label/cf201901-cuda${CUDA_REL} -c numba -c conda-forge/label/cf201901 -c defaults --python=$PYTHON
   fi
 fi
diff --git a/ci/cpu/libcudf/upload.sh b/ci/cpu/libcudf/upload.sh
@@ -19,19 +19,19 @@ fi
 if [ "$BUILD_LIBCUDF" == "1" ]; then
   # Upload libcudf
   if [ "$BUILD_ABI" == "1" ]; then
-    export UPLOADFILE=`conda build conda/recipes/libcudf -c nvidia/label/cuda${CUDA_REL} -c rapidsai-nightly/label/cuda${CUDA_REL} -c numba -c conda-forge -c defaults --output`
+    export UPLOADFILE=`conda build conda/recipes/libcudf -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 --output`
   else
-    export UPLOADFILE=`conda build conda/recipes/libcudf -c nvidia/label/cf201901-cuda${CUDA_REL} -c rapidsai-nightly/label/cf201901-cuda${CUDA_REL} -c numba -c conda-forge/label/cf201901 -c defaults --output`
+    export UPLOADFILE=`conda build conda/recipes/libcudf -c nvidia/label/cf201901-cuda${CUDA_REL} -c rapidsai/label/cf201901-cuda${CUDA_REL} -c rapidsai-nightly/label/cf201901-cuda${CUDA_REL} -c numba -c conda-forge/label/cf201901 -c defaults --output`
   fi
   upload
 fi
 
 if [ "$BUILD_CFFI" == "1" ]; then
   # Upload libcudf_cffi
   if [ "$BUILD_ABI" == "1" ]; then
-    export UPLOADFILE=`conda build conda/recipes/libcudf_cffi -c nvidia/label/cuda${CUDA_REL} -c rapidsai-nightly/label/cuda${CUDA_REL} -c numba -c conda-forge -c defaults --python=$PYTHON --output`
+    export UPLOADFILE=`conda build conda/recipes/libcudf_cffi -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 --output`
   else
-    export UPLOADFILE=`conda build conda/recipes/libcudf_cffi -c nvidia/label/cf201901-cuda${CUDA_REL} -c rapidsai-nightly/label/cf201901-cuda${CUDA_REL} -c numba -c conda-forge/label/cf201901 -c defaults --python=$PYTHON --output`
+    export UPLOADFILE=`conda build conda/recipes/libcudf_cffi -c nvidia/label/cf201901-cuda${CUDA_REL} -c rapidsai/label/cf201901-cuda${CUDA_REL} -c rapidsai-nightly/label/cf201901-cuda${CUDA_REL} -c numba -c conda-forge/label/cf201901 -c defaults --python=$PYTHON --output`
   fi
   upload
 fi
diff --git a/conda/recipes/cudf/meta.yaml b/conda/recipes/cudf/meta.yaml
@@ -20,6 +20,7 @@ build:
 requirements:
   # use channel:
   #   - nvidia
+  #   - rapidsai
   #   - rapidsai-nightly
   #   - numba
   #   - conda-forge

diff --git a/conda/recipes/libcudf/meta.yaml b/conda/recipes/libcudf/meta.yaml
@@ -26,6 +26,7 @@ build:
 requirements:
   # use channel:
   #   - nvidia
+  #   - rapidsai
   #   - rapidsai-nightly
   #   - conda-forge
   #   - defaults

diff --git a/conda/recipes/libcudf_cffi/meta.yaml b/conda/recipes/libcudf_cffi/meta.yaml
@@ -27,6 +27,7 @@ build:
 requirements:
   # use channel:
   #   - nvidia
+  #   - rapidsai
   #   - rapidsai-nightly
   #   - conda-forge
   #   - defaults