Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Specify git branches to avoid pip unresolvable issues #6869

Merged
merged 3 commits into from
Dec 2, 2020
Merged

Specify git branches to avoid pip unresolvable issues #6869

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
856a5ac
Specify git branches to avoid pip unresolvable issues
jdye64 Dec 1, 2020
e0c6aca
changelog
jdye64 Dec 1, 2020
4609c01
Added @master to build scripts and also altered 'echo' statements to …
jdye64 Dec 1, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -175,6 +175,7 @@
- PR #6855 Fix `.str.replace_with_backrefs` docs examples
- PR #6853 Fix contiguous split of null string columns
- PR #6861 Fix compile error in type_dispatch_benchmark.cu
- PR #6869 Avoid dependency resolution failure in latest version of pip by explicitly specifying versions for dask and distributed


# cuDF 0.16.0 (21 Oct 2020)
Expand Down
8 changes: 4 additions & 4 deletions ci/benchmark/build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,10 +75,10 @@ conda install "rmm=$MINOR_VERSION.*" "cudatoolkit=$CUDA_REL" \
# conda install "your-pkg=1.0.0"

# Install the master version of dask, distributed, and streamz
logger "pip install git+https://github.com/dask/distributed.git --upgrade --no-deps"
pip install "git+https://github.com/dask/distributed.git" --upgrade --no-deps
logger "pip install git+https://github.com/dask/dask.git --upgrade --no-deps"
pip install "git+https://github.com/dask/dask.git" --upgrade --no-deps
logger "pip install git+https://github.com/dask/distributed.git@master --upgrade --no-deps"
pip install "git+https://github.com/dask/distributed.git@master" --upgrade --no-deps
logger "pip install git+https://github.com/dask/dask.git@master --upgrade --no-deps"
pip install "git+https://github.com/dask/dask.git@master" --upgrade --no-deps
logger "pip install git+https://github.com/python-streamz/streamz.git --upgrade --no-deps"
pip install "git+https://github.com/python-streamz/streamz.git" --upgrade --no-deps

Expand Down
4 changes: 2 additions & 2 deletions ci/gpu/build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,8 +88,8 @@ gpuci_conda_retry install -y \
# Install the master version of dask, distributed, and streamz
gpuci_logger "Install the master version of dask, distributed, and streamz"
set -x
pip install "git+https://github.com/dask/distributed.git" --upgrade --no-deps
pip install "git+https://github.com/dask/dask.git" --upgrade --no-deps
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/python-streamz/streamz.git" --upgrade --no-deps
set +x

Expand Down
4 changes: 2 additions & 2 deletions conda/environments/cudf_dev_cuda10.1.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,6 @@ dependencies:
- protobuf
- nvtx>=0.2.1
- pip:
- git+https://github.com/dask/dask.git
- git+https://github.com/dask/distributed.git
- git+https://github.com/dask/dask.git@master
- git+https://github.com/dask/distributed.git@master
- git+https://github.com/python-streamz/streamz.git
4 changes: 2 additions & 2 deletions conda/environments/cudf_dev_cuda10.2.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,6 @@ dependencies:
- protobuf
- nvtx>=0.2.1
- pip:
- git+https://github.com/dask/dask.git
- git+https://github.com/dask/distributed.git
- git+https://github.com/dask/dask.git@master
- git+https://github.com/dask/distributed.git@master
- git+https://github.com/python-streamz/streamz.git
4 changes: 2 additions & 2 deletions conda/environments/cudf_dev_cuda11.0.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,6 @@ dependencies:
- protobuf
- nvtx>=0.2.1
- pip:
- git+https://github.com/dask/dask.git
- git+https://github.com/dask/distributed.git
- git+https://github.com/dask/dask.git@master
- git+https://github.com/dask/distributed.git@master
- git+https://github.com/python-streamz/streamz.git
8 changes: 4 additions & 4 deletions conda/recipes/dask-cudf/run_test.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,11 @@ function logger() {
}

# Install the latest version of dask and distributed
logger "pip install git+https://github.com/dask/distributed.git --upgrade --no-deps"
pip install "git+https://github.com/dask/distributed.git" --upgrade --no-deps
logger "pip install git+https://github.com/dask/distributed.git@master --upgrade --no-deps"
pip install "git+https://github.com/dask/distributed.git@master" --upgrade --no-deps

logger "pip install git+https://github.com/dask/dask.git --upgrade --no-deps"
pip install "git+https://github.com/dask/dask.git" --upgrade --no-deps
logger "pip install git+https://github.com/dask/dask.git@master --upgrade --no-deps"
pip install "git+https://github.com/dask/dask.git@master" --upgrade --no-deps

logger "python -c 'import dask_cudf'"
python -c "import dask_cudf"