Skip to content

Commit

Permalink
Merge branch-24.12 into branch-25.02
Browse files Browse the repository at this point in the history
  • Loading branch information
jakirkham committed Nov 21, 2024
2 parents 47e928f + 075f8be commit 89fbd19
Show file tree
Hide file tree
Showing 5 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion conda/environments/all_cuda-114_arch-x86_64.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion conda/environments/all_cuda-118_arch-x86_64.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion conda/environments/all_cuda-125_arch-x86_64.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion dependencies.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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`.
Expand Down

0 comments on commit 89fbd19

Please sign in to comment.