Merge pull request #2155 from ajschmidt8/fix-merge-conflicts

Fix merge conflicts [skip gpuci]
rapidsai · Mar 23, 2022 · ed56b0d · ed56b0d
2 parents 616a587 + 17fd7bb
commit ed56b0d
Show file tree

Hide file tree

Showing 6 changed files with 19 additions and 19 deletions.
diff --git a/.github/ops-bot.yaml b/.github/ops-bot.yaml
@@ -5,4 +5,4 @@ auto_merger: true
 branch_checker: true
 label_checker: true
 release_drafter: true
-external_contributors: true
+external_contributors: false
diff --git a/conda/environments/cugraph_dev_cuda11.0.yml b/conda/environments/cugraph_dev_cuda11.0.yml
@@ -11,11 +11,11 @@ dependencies:
 - libcudf=22.06.*
 - rmm=22.06.*
 - librmm=22.06.*
-- libraft-headers=22.04.*
-- pyraft=22.04.*
+- libraft-headers=22.06.*
+- pyraft=22.06.*
 - cuda-python>=11.5,<12.0
-- dask>=2022.02.1
-- distributed>=2022.02.1
+- dask==2022.03.0
+- distributed==2022.03.0
 - dask-cuda=22.06.*
 - dask-cudf=22.06.*
 - nccl>=2.9.9

diff --git a/conda/environments/cugraph_dev_cuda11.2.yml b/conda/environments/cugraph_dev_cuda11.2.yml
@@ -11,11 +11,11 @@ dependencies:
 - libcudf=22.06.*
 - rmm=22.06.*
 - librmm=22.06.*
-- libraft-headers=22.04.*
-- pyraft=22.04.*
+- libraft-headers=22.06.*
+- pyraft=22.06.*
 - cuda-python>=11.5,<12.0
-- dask>=2022.02.1
-- distributed>=2022.02.1
+- dask==2022.03.0
+- distributed==2022.03.0
 - dask-cuda=22.06.*
 - dask-cudf=22.06.*
 - nccl>=2.9.9

diff --git a/conda/environments/cugraph_dev_cuda11.4.yml b/conda/environments/cugraph_dev_cuda11.4.yml
@@ -11,11 +11,11 @@ dependencies:
 - libcudf=22.06.*
 - rmm=22.06.*
 - librmm=22.06.*
-- libraft-headers=22.04.*
-- pyraft=22.04.*
+- libraft-headers=22.06.*
+- pyraft=22.06.*
 - cuda-python>=11.5,<12.0
-- dask>=2022.02.1
-- distributed>=2022.02.1
+- dask==2022.03.0
+- distributed==2022.03.0
 - dask-cuda=22.06.*
 - dask-cudf=22.06.*
 - nccl>=2.9.9

diff --git a/conda/environments/cugraph_dev_cuda11.5.yml b/conda/environments/cugraph_dev_cuda11.5.yml
@@ -11,11 +11,11 @@ dependencies:
 - libcudf=22.06.*
 - rmm=22.06.*
 - librmm=22.06.*
-- libraft-headers=22.04.*
-- pyraft=22.04.*
+- libraft-headers=22.06.*
+- pyraft=22.06.*
 - cuda-python>=11.5,<12.0
-- dask>=2022.02.1
-- distributed>=2022.02.1
+- dask==2022.03.0
+- distributed==2022.03.0
 - dask-cuda=22.06.*
 - dask-cudf=22.06.*
 - nccl>=2.9.9

diff --git a/conda/recipes/cugraph/meta.yaml b/conda/recipes/cugraph/meta.yaml
@@ -45,8 +45,8 @@ requirements:
     - cudf={{ minor_version }}
     - dask-cudf {{ minor_version }}
     - dask-cuda {{ minor_version }}
-    - dask>=2022.02.1
-    - distributed>=2022.02.1
+    - dask==2022.03.0
+    - distributed==2022.03.0
     - ucx-py {{ ucx_py_version }}
     - ucx-proc=*=gpu
     - {{ pin_compatible('cudatoolkit', max_pin='x', min_pin='x') }}