Merge branch 'branch-23.10' into unlock-p2p

rapidsai · Sep 22, 2023 · 2e1db4f · 2e1db4f
2 parents 562c240 + f0ba859
commit 2e1db4f
Show file tree

Hide file tree

Showing 7 changed files with 19 additions and 15 deletions.
diff --git a/conda/environments/all_cuda-118_arch-x86_64.yaml b/conda/environments/all_cuda-118_arch-x86_64.yaml
@@ -55,8 +55,8 @@ dependencies:
 - nbsphinx
 - ninja
 - notebook
-- numba>=0.57
-- numpy>=1.21
+- numba>=0.57,<0.58
+- numpy>=1.21,<1.25
 - numpydoc
 - nvcc_linux-64=11.8
 - nvcomp==2.6.1

diff --git a/conda/environments/all_cuda-120_arch-x86_64.yaml b/conda/environments/all_cuda-120_arch-x86_64.yaml
@@ -54,8 +54,8 @@ dependencies:
 - nbsphinx
 - ninja
 - notebook
-- numba>=0.57
-- numpy>=1.21
+- numba>=0.57,<0.58
+- numpy>=1.21,<1.25
 - numpydoc
 - nvcomp==2.6.1
 - nvtx>=0.2.1

diff --git a/conda/recipes/cudf/meta.yaml b/conda/recipes/cudf/meta.yaml
@@ -78,8 +78,10 @@ requirements:
     - typing_extensions >=4.0.0
     - pandas >=1.3,<1.6.0dev0
     - cupy >=12.0.0
-    - numba >=0.57
-    - numpy >=1.21
+    # TODO: Pin to numba<0.58 until #14160 is resolved
+    - numba >=0.57,<0.58
+    # TODO: Pin to numpy<1.25 until cudf requires pandas 2
+    - numpy >=1.21,<1.25
     - {{ pin_compatible('pyarrow', max_pin='x.x.x') }}
     - libcudf ={{ version }}
     - {{ pin_compatible('rmm', max_pin='x.x') }}

diff --git a/dependencies.yaml b/dependencies.yaml
@@ -259,7 +259,8 @@ dependencies:
           # Hard pin the patch version used during the build. This must be kept
           # in sync with the version pinned in get_arrow.cmake.
           - pyarrow==12.0.1.*
-          - numpy>=1.21
+          # TODO: Pin to numpy<1.25 until cudf requires pandas 2
+          - &numpy numpy>=1.21,<1.25
   build_python:
     common:
       - output_types: [conda, requirements, pyproject]
@@ -425,14 +426,15 @@ dependencies:
       - output_types: [conda, requirements, pyproject]
         packages:
           - fsspec>=0.6.0
-          - numpy>=1.21
+          - *numpy
           - pandas>=1.3,<1.6.0dev0
   run_cudf:
     common:
       - output_types: [conda, requirements, pyproject]
         packages:
           - cachetools
-          - &numba numba>=0.57
+          # TODO: Pin to numba<0.58 until #14160 is resolved
+          - &numba numba>=0.57,<0.58
           - nvtx>=0.2.1
           - packaging
           - rmm==23.10.*

diff --git a/python/cudf/pyproject.toml b/python/cudf/pyproject.toml
@@ -6,7 +6,7 @@ requires = [
     "cmake>=3.26.4",
     "cython>=3.0.0",
     "ninja",
-    "numpy>=1.21",
+    "numpy>=1.21,<1.25",
     "protoc-wheel",
     "pyarrow==12.0.1.*",
     "rmm==23.10.*",
@@ -31,8 +31,8 @@ dependencies = [
     "cuda-python>=11.7.1,<12.0a0",
     "cupy-cuda11x>=12.0.0",
     "fsspec>=0.6.0",
-    "numba>=0.57",
-    "numpy>=1.21",
+    "numba>=0.57,<0.58",
+    "numpy>=1.21,<1.25",
     "nvtx>=0.2.1",
     "packaging",
     "pandas>=1.3,<1.6.0dev0",

diff --git a/python/cudf_kafka/pyproject.toml b/python/cudf_kafka/pyproject.toml
@@ -4,7 +4,7 @@
 
 requires = [
     "cython>=3.0.0",
-    "numpy>=1.21",
+    "numpy>=1.21,<1.25",
     "pyarrow==12.0.1.*",
     "setuptools",
     "wheel",

diff --git a/python/dask_cudf/pyproject.toml b/python/dask_cudf/pyproject.toml
@@ -23,7 +23,7 @@ dependencies = [
     "dask>=2023.7.1",
     "distributed>=2023.7.1",
     "fsspec>=0.6.0",
-    "numpy>=1.21",
+    "numpy>=1.21,<1.25",
     "pandas>=1.3,<1.6.0dev0",
 ] # This list was generated by `rapids-dependency-file-generator`. To make changes, edit ../../dependencies.yaml and run `rapids-dependency-file-generator`.
 classifiers = [
@@ -40,7 +40,7 @@ dynamic = ["entry-points"]
 [project.optional-dependencies]
 test = [
     "dask-cuda==23.10.*",
-    "numba>=0.57",
+    "numba>=0.57,<0.58",
     "pytest",
     "pytest-cov",
     "pytest-xdist",