diff --git a/ci/gpu/build.sh b/ci/gpu/build.sh index 316f9c5f98a..7614e19cc89 100755 --- a/ci/gpu/build.sh +++ b/ci/gpu/build.sh @@ -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 } @@ -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 diff --git a/conda/environments/cudf_dev_cuda10.1.yml b/conda/environments/cudf_dev_cuda10.1.yml index 3541ed1208c..35108ddd8ca 100644 --- a/conda/environments/cudf_dev_cuda10.1.yml +++ b/conda/environments/cudf_dev_cuda10.1.yml @@ -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 diff --git a/conda/environments/cudf_dev_cuda10.2.yml b/conda/environments/cudf_dev_cuda10.2.yml index 839533516fb..3a24e38a397 100644 --- a/conda/environments/cudf_dev_cuda10.2.yml +++ b/conda/environments/cudf_dev_cuda10.2.yml @@ -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 diff --git a/conda/environments/cudf_dev_cuda11.0.yml b/conda/environments/cudf_dev_cuda11.0.yml index 401eaea63da..821c6f5320d 100644 --- a/conda/environments/cudf_dev_cuda11.0.yml +++ b/conda/environments/cudf_dev_cuda11.0.yml @@ -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