Merge branch 'branch-24.04' into fea-scaled-workspace-resource

rapidsai · Mar 1, 2024 · 7dad403 · 7dad403
2 parents b68faf2 + ad27a73
commit 7dad403
Show file tree

Hide file tree

Showing 8 changed files with 15 additions and 9 deletions.
diff --git a/conda/environments/all_cuda-118_arch-aarch64.yaml b/conda/environments/all_cuda-118_arch-aarch64.yaml
@@ -39,7 +39,7 @@ dependencies:
 - nccl>=2.9.9
 - ninja
 - numba>=0.57
-- numpy>=1.21
+- numpy>=1.23
 - 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
@@ -39,7 +39,7 @@ dependencies:
 - nccl>=2.9.9
 - ninja
 - numba>=0.57
-- numpy>=1.21
+- numpy>=1.23
 - 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
@@ -36,7 +36,7 @@ dependencies:
 - nccl>=2.9.9
 - ninja
 - numba>=0.57
-- numpy>=1.21
+- numpy>=1.23
 - 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
@@ -36,7 +36,7 @@ dependencies:
 - nccl>=2.9.9
 - ninja
 - numba>=0.57
-- numpy>=1.21
+- numpy>=1.23
 - numpydoc
 - pre-commit
 - pydata-sphinx-theme

diff --git a/conda/recipes/pylibraft/meta.yaml b/conda/recipes/pylibraft/meta.yaml
@@ -65,7 +65,7 @@ requirements:
     {% endif %}
     - libraft {{ version }}
     - libraft-headers {{ version }}
-    - numpy >=1.21
+    - numpy >=1.23
     - python x.x
     - rmm ={{ minor_version }}
 

diff --git a/dependencies.yaml b/dependencies.yaml
@@ -392,13 +392,17 @@ dependencies:
             packages:
               - python=3.10
           - matrix:
+              py: "3.11"
             packages:
-              - python>=3.9,<3.11
+              - python=3.11
+          - matrix:
+            packages:
+              - python>=3.9,<3.12
   run_pylibraft:
     common:
       - output_types: [conda, pyproject]
         packages:
-          - &numpy numpy>=1.21
+          - &numpy numpy>=1.23
       - output_types: [conda]
         packages:
           - *rmm_conda

diff --git a/python/pylibraft/pyproject.toml b/python/pylibraft/pyproject.toml
@@ -36,14 +36,15 @@ license = { text = "Apache 2.0" }
 requires-python = ">=3.9"
 dependencies = [
     "cuda-python>=11.7.1,<12.0a0",
-    "numpy>=1.21",
+    "numpy>=1.23",
     "rmm==24.4.*",
 ] # This list was generated by `rapids-dependency-file-generator`. To make changes, edit ../../dependencies.yaml and run `rapids-dependency-file-generator`.
 classifiers = [
     "Intended Audience :: Developers",
     "Programming Language :: Python",
     "Programming Language :: Python :: 3.9",
     "Programming Language :: Python :: 3.10",
+    "Programming Language :: Python :: 3.11",
 ]
 
 [project.optional-dependencies]

diff --git a/python/raft-dask/pyproject.toml b/python/raft-dask/pyproject.toml
@@ -36,7 +36,7 @@ dependencies = [
     "dask-cuda==24.4.*",
     "joblib>=0.11",
     "numba>=0.57",
-    "numpy>=1.21",
+    "numpy>=1.23",
     "pylibraft==24.4.*",
     "rapids-dask-dependency==24.4.*",
     "ucx-py==0.37.*",
@@ -46,6 +46,7 @@ classifiers = [
     "Programming Language :: Python",
     "Programming Language :: Python :: 3.9",
     "Programming Language :: Python :: 3.10",
+    "Programming Language :: Python :: 3.11",
 ]
 
 [project.optional-dependencies]