Merge pull request #204 from rapidsai/branch-0.11

[gpuCI] Auto-merge branch-0.11 to branch-0.12 [skip ci]
rapidsai · Dec 6, 2019 · 04fa244 · 04fa244
2 parents 4633144 + d46fb2f
commit 04fa244
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 4 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -26,6 +26,7 @@
 - PR #186 Add nbytes and len to DeviceBuffer
 - PR #188 Require kwargs in `DeviceBuffer`'s constructor
 - PR #194 Drop unused imports from `device_buffer.pyx`
+- PR #196 Remove unused CUDA conda labels
 - PR #200 Simplify DeviceBuffer methods
 
 ## Bug Fixes

diff --git a/ci/cpu/librmm/upload-anaconda.sh b/ci/cpu/librmm/upload-anaconda.sh
@@ -12,7 +12,7 @@ if [ "$UPLOAD_LIBRMM" == '1' ]; then
 
   SOURCE_BRANCH=master
 
-  LABEL_OPTION="--label main --label cuda${CUDA_REL}"
+  LABEL_OPTION="--label main"
   echo "LABEL_OPTION=${LABEL_OPTION}"
 
   # Restrict uploads to master branch

diff --git a/ci/cpu/rmm/upload-anaconda.sh b/ci/cpu/rmm/upload-anaconda.sh
@@ -9,7 +9,7 @@ if [ "$UPLOAD_RMM" == "1" ]; then
 
   SOURCE_BRANCH=master
 
-  LABEL_OPTION="--label main --label cuda9.2 --label cuda10.0 --label cuda10.1"
+  LABEL_OPTION="--label main"
   echo "LABEL_OPTION=${LABEL_OPTION}"
 
   test -e ${UPLOADFILE}

diff --git a/conda/environments/rmm_dev_cuda10.0.yml b/conda/environments/rmm_dev_cuda10.0.yml
@@ -1,6 +1,6 @@
 name: rmm_dev
 channels:
-- rapidsai/label/cuda10.0
+- rapidsai
 - conda-forge
 dependencies:
 - cmake>=3.12

diff --git a/conda/environments/rmm_dev_cuda9.2.yml b/conda/environments/rmm_dev_cuda9.2.yml
@@ -1,6 +1,6 @@
 name: rmm_dev
 channels:
-- rapidsai/label/cuda9.2
+- rapidsai
 - conda-forge
 dependencies:
 - cmake>=3.12