Skip to content

Commit

Permalink
Change dask and distributed branch to main (#3593)
Browse files Browse the repository at this point in the history
`dask` and `distributed` are changing their default branches name from `master` to `main`, this will break our dev environments and CI, this PR updates the required files. 

`distributed` already merged the PR that does the change, `dask` will probably do the same very soon so a PR that updates both seems to be the best approach.

Authors:
  - Dante Gama Dessavre (@dantegd)

Approvers:
  - William Hicks (@wphicks)
  - AJ Schmidt (@ajschmidt8)
  - @jakirkham
  - Dillon Cullinan (@dillon-cullinan)

URL: #3593
  • Loading branch information
dantegd authored Mar 8, 2021
1 parent bacb05e commit fd9ec89
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 9 deletions.
6 changes: 3 additions & 3 deletions ci/gpu/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -69,10 +69,10 @@ if [ "$py_ver" == "3.6" ];then
conda install contextvars
fi

gpuci_logger "Install the master version of dask and distributed"
gpuci_logger "Install the main version of dask and distributed"
set -x
pip install "git+https://github.com/dask/distributed.git@master" --upgrade --no-deps
pip install "git+https://github.com/dask/dask.git@master" --upgrade --no-deps
pip install "git+https://github.com/dask/distributed.git@main" --upgrade --no-deps
pip install "git+https://github.com/dask/dask.git@main" --upgrade --no-deps
set +x

gpuci_logger "Check compiler versions"
Expand Down
4 changes: 2 additions & 2 deletions conda/environments/cuml_dev_cuda10.1.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,8 @@ dependencies:
- pip
- pip:
- sphinx_markdown_tables
- git+https://github.com/dask/dask.git@master
- git+https://github.com/dask/distributed.git@master
- git+https://github.com/dask/dask.git@main
- git+https://github.com/dask/distributed.git@main

# rapids-build-env, notebook-env and doc-env meta packages are defined in
# https://docs.rapids.ai/maintainers/depmgmt/
Expand Down
4 changes: 2 additions & 2 deletions conda/environments/cuml_dev_cuda10.2.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,8 @@ dependencies:
- pip
- pip:
- sphinx_markdown_tables
- git+https://github.com/dask/dask.git@master
- git+https://github.com/dask/distributed.git@master
- git+https://github.com/dask/dask.git@main
- git+https://github.com/dask/distributed.git@main

# rapids-build-env, notebook-env and doc-env are defined in
# https://docs.rapids.ai/maintainers/depmgmt/
Expand Down
4 changes: 2 additions & 2 deletions conda/environments/cuml_dev_cuda11.0.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,8 @@ dependencies:
- pip
- pip:
- sphinx_markdown_tables
- git+https://github.com/dask/dask.git@master
- git+https://github.com/dask/distributed.git@master
- git+https://github.com/dask/dask.git@main
- git+https://github.com/dask/distributed.git@main

# rapids-build-env, notebook-env and doc-env are defined in
# https://docs.rapids.ai/maintainers/depmgmt/
Expand Down

0 comments on commit fd9ec89

Please sign in to comment.