put explicit floor on NumPy 2.x to see what happens

rapidsai · Sep 23, 2024 · a670e16 · a670e16
1 parent d822a32
commit a670e16
Show file tree

Hide file tree

Showing 7 changed files with 6 additions and 36 deletions.
diff --git a/ci/use_conda_packages_from_prs.sh b/ci/use_conda_packages_from_prs.sh
@@ -6,20 +6,12 @@ RMM_CHANNEL=$(rapids-get-pr-conda-artifact rmm 1678 python)
 CUDF_CPP_CHANNEL=$(rapids-get-pr-conda-artifact cudf 16806 cpp)
 CUDF_PYTHON_CHANNEL=$(rapids-get-pr-conda-artifact cudf 16806 python)
 
-# UCXX_CHANNEL=$(rapids-get-pr-conda-artifact ucxx 278 cpp)
-
-# LIBRAFT_CHANNEL=$(rapids-get-pr-conda-artifact raft 2433 cpp)
-# RAFT_CHANNEL=$(rapids-get-pr-conda-artifact raft 2433 python)
-
 LIBCUSPATIAL_CHANNEL=$(rapids-get-pr-conda-artifact cuspatial 1441 cpp)
 CUSPATIAL_CHANNEL=$(rapids-get-pr-conda-artifact cuspatial 1441 python)
 
 conda config --system --add channels "${LIBRMM_CHANNEL}"
 conda config --system --add channels "${RMM_CHANNEL}"
 conda config --system --add channels "${CUDF_CPP_CHANNEL}"
 conda config --system --add channels "${CUDF_PYTHON_CHANNEL}"
-# conda config --system --add channels "${UCXX_CHANNEL}"
-# conda config --system --add channels "${LIBRAFT_CHANNEL}"
-# conda config --system --add channels "${RAFT_CHANNEL}"
 conda config --system --add channels "${LIBCUSPATIAL_CHANNEL}"
 conda config --system --add channels "${CUSPATIAL_CHANNEL}"
diff --git a/ci/use_wheels_from_prs.sh b/ci/use_wheels_from_prs.sh
@@ -9,16 +9,6 @@ RMM_CHANNEL=$(
   RAPIDS_PY_WHEEL_NAME=rmm_${RAPIDS_PY_CUDA_SUFFIX} rapids-get-pr-wheel-artifact rmm 1678 python
 )
 
-# UCXX_CHANNEL=$(
-#   RAPIDS_PY_WHEEL_NAME=ucxx_${RAPIDS_PY_CUDA_SUFFIX} rapids-get-pr-wheel-artifact ucxx 278 python
-# )
-# LIBUCXX_CHANNEL=$(
-#   RAPIDS_PY_WHEEL_NAME=libucxx_${RAPIDS_PY_CUDA_SUFFIX} rapids-get-pr-wheel-artifact ucxx 278 cpp
-# )
-# DISTRIBUTED_UCXX_CHANNEL=$(
-#   RAPIDS_PY_WHEEL_NAME=distributed_ucxx_${RAPIDS_PY_CUDA_SUFFIX} rapids-get-pr-wheel-artifact ucxx 278 python
-# )
-
 CUDF_CHANNEL=$(
   RAPIDS_PY_WHEEL_NAME=cudf_${RAPIDS_PY_CUDA_SUFFIX} rapids-get-pr-wheel-artifact cudf 16806 python
 )
@@ -34,18 +24,11 @@ DASK_CUDF_CHANNEL=$(
     rapids-get-pr-wheel-artifact cudf 16806 python
 )
 
-# RAFT_DASK_CHANNEL=$(
-#   RAPIDS_PY_WHEEL_NAME=raft_dask_${RAPIDS_PY_CUDA_SUFFIX} rapids-get-pr-wheel-artifact raft 2433 python
-# )
-# PYLIBRAFT_CHANNEL=$(
-#   RAPIDS_PY_WHEEL_NAME=pylibraft_${RAPIDS_PY_CUDA_SUFFIX} rapids-get-pr-wheel-artifact raft 2433 python
-# )
-
 CUSPATIAL_CHANNEL=$(
   RAPIDS_PY_WHEEL_NAME=cuspatial_${RAPIDS_PY_CUDA_SUFFIX} rapids-get-pr-wheel-artifact cuspatial 1441 python
 )
 CUPROJ_CHANNEL=$(
-  RAPIDS_PY_WHEEL_NAME=cuproj_${RAPIDS_PY_CUDA_SUFFIX} rapids-get-pr-wheel-artifact cuproj 1441 python
+  RAPIDS_PY_WHEEL_NAME=cuproj_${RAPIDS_PY_CUDA_SUFFIX} rapids-get-pr-wheel-artifact cuspatial 1441 python
 )
 LIBCUSPATIAL_CHANNEL=$(
   RAPIDS_PY_WHEEL_NAME=libcuspatial_${RAPIDS_PY_CUDA_SUFFIX} rapids-get-pr-wheel-artifact cuspatial 1441 cpp
@@ -63,9 +46,4 @@ libcuspatial-${RAPIDS_PY_CUDA_SUFFIX} @ file://$(echo ${LIBCUSPATIAL_CHANNEL}/li
 cuproj-${RAPIDS_PY_CUDA_SUFFIX} @ file://$(echo ${CUPROJ_CHANNEL}/cuproj_*.whl)
 EOF
 
-# ucxx-${RAPIDS_PY_CUDA_SUFFIX} @ file://$(echo ${UCXX_CHANNEL}/ucxx_*.whl)
-# libucxx-${RAPIDS_PY_CUDA_SUFFIX} @ file://$(echo ${LIBUCXX_CHANNEL}/libucxx_*.whl)
-# distributed-ucxx-${RAPIDS_PY_CUDA_SUFFIX} @ file://$(echo ${DISTRIBUTED_UCXX_CHANNEL}/distributed_ucxx_*.whl)
-# raft-dask-${RAPIDS_PY_CUDA_SUFFIX} @ file://$(echo ${RAFT_DASK_CHANNEL}/raft_dask_*.whl)
-# pylibraft-${RAPIDS_PY_CUDA_SUFFIX} @ file://$(echo ${PYLIBRAFT_CHANNEL}/pylibraft_*.whl)
 export PIP_CONSTRAINT=/tmp/constraints.txt
diff --git a/conda/environments/all_cuda-118_arch-x86_64.yaml b/conda/environments/all_cuda-118_arch-x86_64.yaml
@@ -28,7 +28,7 @@ dependencies:
 - nodejs>=18
 - notebook>=0.5.0
 - numba>=0.57
-- numpy>=1.23,<3.0a0
+- numpy>=2.0,<3.0a0
 - numpydoc
 - packaging
 - pandoc<=2.0.0

diff --git a/conda/environments/all_cuda-125_arch-x86_64.yaml b/conda/environments/all_cuda-125_arch-x86_64.yaml
@@ -27,7 +27,7 @@ dependencies:
 - nodejs>=18
 - notebook>=0.5.0
 - numba>=0.57
-- numpy>=1.23,<3.0a0
+- numpy>=2.0,<3.0a0
 - numpydoc
 - packaging
 - pandoc<=2.0.0

diff --git a/conda/recipes/cuxfilter/meta.yaml b/conda/recipes/cuxfilter/meta.yaml
@@ -37,7 +37,7 @@ requirements:
     - libwebp-base
     - nodejs >=14
     - numba >=0.57
-    - numpy >=1.23,<3.0a0
+    - numpy >=2.0,<3.0a0
     - packaging
     - panel >=1.0
     - python

diff --git a/dependencies.yaml b/dependencies.yaml
@@ -196,7 +196,7 @@ dependencies:
           - holoviews>=1.16.0
           - jupyter-server-proxy
           - numba>=0.57
-          - numpy>=1.23,<3.0a0
+          - numpy>=2.0,<3.0a0
           - packaging
           - panel>=1.0
       - output_types: conda

diff --git a/python/pyproject.toml b/python/pyproject.toml
@@ -28,7 +28,7 @@ dependencies = [
     "holoviews>=1.16.0",
     "jupyter-server-proxy",
     "numba>=0.57",
-    "numpy>=1.23,<3.0a0",
+    "numpy>=2.0,<3.0a0",
     "packaging",
     "panel>=1.0",
 ] # This list was generated by `rapids-dependency-file-generator`. To make changes, edit ../dependencies.yaml and run `rapids-dependency-file-generator`.