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

Unpin from numpy < 1.20 #7335

Merged
merged 22 commits into from
Feb 9, 2021
Merged

Unpin from numpy < 1.20 #7335

Show file tree
Hide file tree
Changes from 20 commits
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
4a4b4af
Merge branch 'branch-0.17' into branch-0.18
shwina Dec 11, 2020
223f2b5
Merge branch 'branch-0.18' of https://github.com/rapidsai/cudf into b…
shwina Dec 15, 2020
abd6ad2
Merge branch 'branch-0.18' of https://github.com/rapidsai/cudf into b…
shwina Dec 17, 2020
18863b5
Merge branch 'branch-0.18' of https://github.com/rapidsai/cudf into b…
shwina Jan 4, 2021
0fbdd31
Merge branch 'branch-0.18' of https://github.com/rapidsai/cudf into b…
shwina Jan 5, 2021
dc9b943
Merge branch 'branch-0.18' of https://github.com/rapidsai/cudf into b…
shwina Jan 5, 2021
d586aa7
Merge branch 'branch-0.18' of https://github.com/rapidsai/cudf into b…
shwina Jan 7, 2021
996fda8
Merge branch 'branch-0.18' of https://github.com/rapidsai/cudf into b…
shwina Jan 8, 2021
7c9ac23
Merge branch 'branch-0.18' of https://github.com/rapidsai/cudf into b…
shwina Jan 15, 2021
8ae778a
Merge branch 'branch-0.18' of https://github.com/rapidsai/cudf into b…
shwina Jan 21, 2021
d23b8b8
Merge branch 'branch-0.18' of https://github.com/rapidsai/cudf into b…
shwina Jan 26, 2021
9a0db21
bpMerge branch 'branch-0.18' of https://github.com/rapidsai/cudf into…
shwina Jan 27, 2021
b1283e3
Merge branch 'branch-0.18' of https://github.com/rapidsai/cudf into b…
shwina Jan 29, 2021
ed4b022
Merge branch 'branch-0.18' of https://github.com/rapidsai/cudf into b…
shwina Feb 1, 2021
833c1ab
Merge branch 'branch-0.18' of https://github.com/rapidsai/cudf into b…
shwina Feb 1, 2021
1f17c3d
Merge branch 'branch-0.18' of https://github.com/rapidsai/cudf into b…
shwina Feb 2, 2021
0bd19eb
Merge branch 'branch-0.18' of https://github.com/rapidsai/cudf into b…
shwina Feb 3, 2021
86bfaa6
Merge branch 'branch-0.18' of https://github.com/rapidsai/cudf into b…
shwina Feb 5, 2021
abe25c2
Unpin from NumPy<1.20
shwina Feb 5, 2021
881b013
Undo changelog
shwina Feb 5, 2021
30d6a83
Restore example
shwina Feb 5, 2021
0a42d95
More unpinning
shwina Feb 8, 2021
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
3 changes: 1 addition & 2 deletions ci/gpu/build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,6 @@ gpuci_conda_retry install -y \

# https://docs.rapids.ai/maintainers/depmgmt/
# gpuci_conda_retry remove --force rapids-build-env rapids-notebook-env
gpuci_conda_retry install -y "numpy<1.20"
kkraus14 marked this conversation as resolved.
Show resolved Hide resolved


gpuci_logger "Check compiler versions"
Expand Down Expand Up @@ -220,4 +219,4 @@ gpuci_logger "Test notebooks"
${WORKSPACE}/ci/gpu/test-notebooks.sh 2>&1 | tee nbtest.log
python ${WORKSPACE}/ci/utils/nbtestlog2junitxml.py nbtest.log

return ${EXITCODE}
return ${EXITCODE}
2 changes: 1 addition & 1 deletion conda/environments/cudf_dev_cuda10.1.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ dependencies:
- cmake_setuptools>=0.1.3
- python>=3.6,<3.8
- numba>=0.49.0,!=0.51.0
- numpy<1.20
- numpy
- pandas>=1.0,<1.2.0dev0
- pyarrow=1.0.1
- fastavro>=0.22.9
Expand Down
2 changes: 1 addition & 1 deletion conda/environments/cudf_dev_cuda10.2.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ dependencies:
- cmake_setuptools>=0.1.3
- python>=3.6,<3.8
- numba>=0.49,!=0.51.0
- numpy<1.20
- numpy
- pandas>=1.0,<1.2.0dev0
- pyarrow=1.0.1
- fastavro>=0.22.9
Expand Down
2 changes: 1 addition & 1 deletion conda/environments/cudf_dev_cuda11.0.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ dependencies:
- cmake_setuptools>=0.1.3
- python>=3.6,<3.8
- numba>=0.49,!=0.51.0
- numpy<1.20
- numpy
- pandas>=1.0,<1.2.0dev0
- pyarrow=1.0.1
- fastavro>=0.22.9
Expand Down