Merge pull request #1410 from jakirkham/branch-25.02-merge-24.12

Forward-merge branch-24.12 into branch-25.02
rapidsai · Nov 21, 2024 · 9d2e2d6 · 9d2e2d6
2 parents 47e928f + 89fbd19
commit 9d2e2d6
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 5 deletions.
diff --git a/conda/environments/all_cuda-114_arch-x86_64.yaml b/conda/environments/all_cuda-114_arch-x86_64.yaml
@@ -20,7 +20,7 @@ dependencies:
 - numpydoc>=1.1.0
 - pandas>=1.3
 - pre-commit
-- pynvml>=11.0.0,<11.5
+- pynvml>=11.0.0,<12.0.0a0
 - pytest
 - pytest-cov
 - python>=3.10,<3.13

diff --git a/conda/environments/all_cuda-118_arch-x86_64.yaml b/conda/environments/all_cuda-118_arch-x86_64.yaml
@@ -20,7 +20,7 @@ dependencies:
 - numpydoc>=1.1.0
 - pandas>=1.3
 - pre-commit
-- pynvml>=11.0.0,<11.5
+- pynvml>=11.0.0,<12.0.0a0
 - pytest
 - pytest-cov
 - python>=3.10,<3.13

diff --git a/conda/environments/all_cuda-125_arch-x86_64.yaml b/conda/environments/all_cuda-125_arch-x86_64.yaml
@@ -21,7 +21,7 @@ dependencies:
 - numpydoc>=1.1.0
 - pandas>=1.3
 - pre-commit
-- pynvml>=11.0.0,<11.5
+- pynvml>=11.0.0,<12.0.0a0
 - pytest
 - pytest-cov
 - python>=3.10,<3.13

diff --git a/dependencies.yaml b/dependencies.yaml
@@ -157,7 +157,7 @@ dependencies:
           - numba>=0.57
           - numpy>=1.23,<3.0a0
           - pandas>=1.3
-          - pynvml>=11.0.0,<11.5
+          - pynvml>=11.0.0,<12.0.0a0
           - rapids-dask-dependency==25.2.*,>=0.0.0a0
           - zict>=2.0.0
   test_python:

diff --git a/pyproject.toml b/pyproject.toml
@@ -20,7 +20,7 @@ dependencies = [
     "numba>=0.57",
     "numpy>=1.23,<3.0a0",
     "pandas>=1.3",
-    "pynvml>=11.0.0,<11.5",
+    "pynvml>=11.0.0,<12.0.0a0",
     "rapids-dask-dependency==25.2.*,>=0.0.0a0",
     "zict>=2.0.0",
 ] # This list was generated by `rapids-dependency-file-generator`. To make changes, edit dependencies.yaml and run `rapids-dependency-file-generator`.