Refresh requirements (#3622)

* Allow NumPy 1.24 (soften upper bounds) * Require NumPy 1.21+ consistently * Require Numba 0.57+ consistently * Add Python requirement where it was missed * Drop deprecated `x.x` notation with Python Authors: - https://github.com/jakirkham - Rick Ratzel (https://github.com/rlratzel) Approvers: - Rick Ratzel (https://github.com/rlratzel) - Ray Douglass (https://github.com/raydouglass) URL: #3622
rapidsai · Jun 1, 2023 · 3bbc087 · 3bbc087
1 parent c49643c
commit 3bbc087
Show file tree

Hide file tree

Showing 13 changed files with 28 additions and 22 deletions.
diff --git a/ci/test_python.sh b/ci/test_python.sh
@@ -67,12 +67,14 @@ pushd python/cugraph/cugraph
 export DASK_WORKER_DEVICES="0"
 pytest \
   -v \
+  --benchmark-disable \
   --cache-clear \
   --junitxml="${RAPIDS_TESTS_DIR}/junit-cugraph.xml" \
   --cov-config=../../.coveragerc \
   --cov=cugraph \
   --cov-report=xml:"${RAPIDS_COVERAGE_DIR}/cugraph-coverage.xml" \
   --cov-report=term \
+  -k "not test_property_graph_mg" \
   tests
 popd
 

diff --git a/conda/environments/all_cuda-118_arch-x86_64.yaml b/conda/environments/all_cuda-118_arch-x86_64.yaml
@@ -38,7 +38,7 @@ dependencies:
 - ninja
 - notebook>=0.5.0
 - numba>=0.57
-- numpy>=1.21,<1.24
+- numpy>=1.21
 - numpydoc
 - nvcc_linux-64=11.8
 - openmpi

diff --git a/conda/recipes/cugraph-dgl/meta.yaml b/conda/recipes/cugraph-dgl/meta.yaml
@@ -20,13 +20,13 @@ build:
 
 requirements:
   host:
-    - python x.x
+    - python
   run:
     - cugraph ={{ version }}
     - dgl >=1.1.0.cu*
     - numba >=0.57
-    - numpy
-    - python x.x
+    - numpy >=1.21
+    - python
     - pytorch
 
 tests:

diff --git a/conda/recipes/cugraph-pyg/meta.yaml b/conda/recipes/cugraph-pyg/meta.yaml
@@ -23,12 +23,13 @@ requirements:
     - sysroot_{{ target_platform }} {{ sysroot_version }}
   host:
     - cython >=0.29,<0.30
-    - python x.x
+    - python
     - scikit-build >=0.13.1
   run:
     - distributed ==2023.3.2.1
     - numba >=0.57
-    - numpy
+    - numpy >=1.21
+    - python
     - pytorch >=2.0
     - cupy >=12.0.0
     - cugraph ={{ version }}

diff --git a/conda/recipes/cugraph-service/meta.yaml b/conda/recipes/cugraph-service/meta.yaml
@@ -27,9 +27,9 @@ outputs:
     requirements:
       host:
         - pip
-        - python x.x
+        - python
       run:
-        - python x.x
+        - python
         - thriftpy2 >=0.4.15
 
   - name: cugraph-service-server
@@ -47,7 +47,7 @@ outputs:
     requirements:
       host:
         - pip
-        - python x.x
+        - python
         - setuptools
         - wheel
       run:
@@ -58,8 +58,9 @@ outputs:
         - dask-cuda ={{ minor_version }}
         - dask-cudf ={{ minor_version }}
         - distributed ==2023.3.2.1
-        - numpy
-        - python x.x
+        - numba >=0.57
+        - numpy >=1.21
+        - python
         - thriftpy2 >=0.4.15
         - ucx-py {{ ucx_py_version }}
 

diff --git a/conda/recipes/cugraph/meta.yaml b/conda/recipes/cugraph/meta.yaml
@@ -60,7 +60,7 @@ requirements:
     - libraft ={{ minor_version }}
     - libraft-headers ={{ minor_version }}
     - pylibraft ={{ minor_version}}
-    - python x.x
+    - python
     - raft-dask ={{ minor_version }}
     - scikit-build >=0.13.1
     - setuptools
@@ -81,7 +81,7 @@ requirements:
     - libraft-headers ={{ minor_version }}
     - pylibcugraph ={{ version }}
     - pylibraft ={{ minor_version }}
-    - python x.x
+    - python
     - raft-dask ={{ minor_version }}
     - ucx-proc=*=gpu
     - ucx-py {{ ucx_py_version }}

diff --git a/conda/recipes/pylibcugraph/meta.yaml b/conda/recipes/pylibcugraph/meta.yaml
@@ -60,7 +60,7 @@ requirements:
     - libraft ={{ minor_version }}
     - libraft-headers ={{ minor_version }}
     - pylibraft ={{ minor_version}}
-    - python x.x
+    - python
     - rmm ={{ minor_version }}
     - scikit-build >=0.13.1
     - setuptools
@@ -69,7 +69,7 @@ requirements:
   run:
     - {{ pin_compatible('cudatoolkit', max_pin='x', min_pin='x') }}
     - libcugraph ={{ version }}
-    - python x.x
+    - python
 
 tests:
   requirements:

diff --git a/dependencies.yaml b/dependencies.yaml
@@ -329,7 +329,7 @@ dependencies:
       - output_types: [conda, pyproject]
         packages:
           - *numba
-          - &numpy numpy>=1.21,<1.24  # Temporarily upper bound numpy to avoid overflow deprecations
+          - &numpy numpy>=1.21
       - output_types: [pyproject]
         packages:
           - &cugraph cugraph==23.6.*
@@ -356,6 +356,7 @@ dependencies:
           - *dask_cuda
           - *dask_cudf
           - *distributed
+          - *numba
           - *numpy
           - *rmm
           - *thrift

diff --git a/python/cugraph-dgl/pyproject.toml b/python/cugraph-dgl/pyproject.toml
@@ -21,7 +21,7 @@ requires-python = ">=3.9"
 dependencies = [
     "cugraph==23.6.*",
     "numba>=0.57",
-    "numpy>=1.21,<1.24",
+    "numpy>=1.21",
 ] # 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",

diff --git a/python/cugraph-pyg/pyproject.toml b/python/cugraph-pyg/pyproject.toml
@@ -28,7 +28,7 @@ classifiers = [
 dependencies = [
     "cugraph==23.6.*",
     "numba>=0.57",
-    "numpy>=1.21,<1.24",
+    "numpy>=1.21",
 ] # This list was generated by `rapids-dependency-file-generator`. To make changes, edit ../../dependencies.yaml and run `rapids-dependency-file-generator`.
 
 [project.urls]

diff --git a/python/cugraph-service/server/pyproject.toml b/python/cugraph-service/server/pyproject.toml
@@ -27,7 +27,8 @@ dependencies = [
     "dask-cudf==23.6.*",
     "dask==2023.3.2",
     "distributed==2023.3.2.1",
-    "numpy>=1.21,<1.24",
+    "numba>=0.57",
+    "numpy>=1.21",
     "rmm==23.6.*",
     "thriftpy2",
     "ucx-py==0.32.*",
@@ -45,7 +46,7 @@ test = [
     "aiohttp",
     "fsspec[http]>=0.6.0",
     "networkx>=2.5.1",
-    "numpy>=1.21,<1.24",
+    "numpy>=1.21",
     "pandas",
     "pytest",
     "pytest-benchmark",

diff --git a/python/cugraph/pyproject.toml b/python/cugraph/pyproject.toml
@@ -53,7 +53,7 @@ test = [
     "aiohttp",
     "fsspec[http]>=0.6.0",
     "networkx>=2.5.1",
-    "numpy>=1.21,<1.24",
+    "numpy>=1.21",
     "pandas",
     "pytest",
     "pytest-benchmark",

diff --git a/python/pylibcugraph/pyproject.toml b/python/pylibcugraph/pyproject.toml
@@ -42,7 +42,7 @@ classifiers = [
 test = [
     "cudf==23.6.*",
     "networkx>=2.5.1",
-    "numpy>=1.21,<1.24",
+    "numpy>=1.21",
     "pandas",
     "pytest",
     "pytest-benchmark",