Merge branch 'branch-24.04' into docs_2404-api_docs

rapidsai · Mar 14, 2024 · 883573f · 883573f
2 parents d74d559 + 6eb9bdb
commit 883573f
Show file tree

Hide file tree

Showing 7 changed files with 7 additions and 7 deletions.
diff --git a/conda/environments/all_cuda-118_arch-aarch64.yaml b/conda/environments/all_cuda-118_arch-aarch64.yaml
@@ -40,7 +40,7 @@ dependencies:
 - make
 - nccl>=2.9.9
 - ninja
-- numpy>=1.23
+- numpy>=1.23,<2.0a0
 - numpydoc
 - nvcc_linux-aarch64=11.8
 - pre-commit

diff --git a/conda/environments/all_cuda-118_arch-x86_64.yaml b/conda/environments/all_cuda-118_arch-x86_64.yaml
@@ -40,7 +40,7 @@ dependencies:
 - make
 - nccl>=2.9.9
 - ninja
-- numpy>=1.23
+- numpy>=1.23,<2.0a0
 - numpydoc
 - nvcc_linux-64=11.8
 - pre-commit

diff --git a/conda/environments/all_cuda-122_arch-aarch64.yaml b/conda/environments/all_cuda-122_arch-aarch64.yaml
@@ -37,7 +37,7 @@ dependencies:
 - make
 - nccl>=2.9.9
 - ninja
-- numpy>=1.23
+- numpy>=1.23,<2.0a0
 - numpydoc
 - pre-commit
 - pydata-sphinx-theme

diff --git a/conda/environments/all_cuda-122_arch-x86_64.yaml b/conda/environments/all_cuda-122_arch-x86_64.yaml
@@ -37,7 +37,7 @@ dependencies:
 - make
 - nccl>=2.9.9
 - ninja
-- numpy>=1.23
+- numpy>=1.23,<2.0a0
 - numpydoc
 - pre-commit
 - pydata-sphinx-theme

diff --git a/dependencies.yaml b/dependencies.yaml
@@ -356,7 +356,7 @@ dependencies:
     common:
       - output_types: [conda, pyproject]
         packages:
-          - &numpy numpy>=1.23
+          - &numpy numpy>=1.23,<2.0a0
       - output_types: [conda]
         packages:
           - *rmm_conda

diff --git a/docs/source/working_with_ann_indexes.rst b/docs/source/working_with_ann_indexes.rst
@@ -8,4 +8,4 @@ Working with ANN Indexes
    working_with_ann_indexes_c.rst
    working_with_ann_indexes_cpp.rst
    working_with_ann_indexes_python.rst
-   working_with_ann_indexes_rust.rst
+   working_with_ann_indexes_rust.rst
diff --git a/python/cuvs/pyproject.toml b/python/cuvs/pyproject.toml
@@ -37,7 +37,7 @@ license = { text = "Apache 2.0" }
 requires-python = ">=3.9"
 dependencies = [
     "cuda-python>=11.7.1,<12.0a0",
-    "numpy>=1.23",
+    "numpy>=1.23,<2.0a0",
     "pylibraft==24.4.*",
 ] # This list was generated by `rapids-dependency-file-generator`. To make changes, edit ../../dependencies.yaml and run `rapids-dependency-file-generator`.
 classifiers = [