Skip to content

Commit

Permalink
Change dask and distributed branch to main (rapidsai#7532)
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:
  - Keith Kraus (@kkraus14)
  - AJ Schmidt (@ajschmidt8)

URL: rapidsai#7532
  • Loading branch information
dantegd authored and hyperbolic2346 committed Mar 23, 2021
1 parent 6b5b477 commit c8a8669
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 11 deletions.
10 changes: 5 additions & 5 deletions ci/gpu/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -98,11 +98,11 @@ conda config --show-sources
conda list --show-channel-urls

function install_dask {
# Install the master version of dask, distributed, and streamz
gpuci_logger "Install the master version of dask, distributed, and streamz"
# Install the main version of dask, distributed, and streamz
gpuci_logger "Install the main version of dask, distributed, and streamz"
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
pip install "git+https://github.com/python-streamz/streamz.git" --upgrade --no-deps
set +x
}
Expand Down Expand Up @@ -152,7 +152,7 @@ else
#Project Flash
export LIB_BUILD_DIR="$WORKSPACE/ci/artifacts/cudf/cpu/libcudf_work/cpp/build"
export LD_LIBRARY_PATH="$LIB_BUILD_DIR:$CONDA_PREFIX/lib:$LD_LIBRARY_PATH"

if hasArg --skip-tests; then
gpuci_logger "Skipping Tests"
exit 0
Expand Down
4 changes: 2 additions & 2 deletions conda/environments/cudf_dev_cuda10.1.yml
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ dependencies:
- nvtx>=0.2.1
- cachetools
- pip:
- 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
- git+https://github.com/python-streamz/streamz.git
- pyorc
4 changes: 2 additions & 2 deletions conda/environments/cudf_dev_cuda10.2.yml
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ dependencies:
- nvtx>=0.2.1
- cachetools
- pip:
- 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
- git+https://github.com/python-streamz/streamz.git
- pyorc
4 changes: 2 additions & 2 deletions conda/environments/cudf_dev_cuda11.0.yml
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ dependencies:
- nvtx>=0.2.1
- cachetools
- pip:
- 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
- git+https://github.com/python-streamz/streamz.git
- pyorc

0 comments on commit c8a8669

Please sign in to comment.