Skip to content

Commit

Permalink
Merge branch 'branch-25.02' into decimal32-decimal64
Browse files Browse the repository at this point in the history
  • Loading branch information
davidwendt authored Jan 22, 2025
2 parents 83aa9ad + 1f0f51f commit 74e9119
Show file tree
Hide file tree
Showing 6 changed files with 14 additions and 6 deletions.
3 changes: 2 additions & 1 deletion conda/environments/all_cuda-118_arch-x86_64.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,8 @@ dependencies:
- nbsphinx
- ninja
- notebook
- numba-cuda>=0.2.0,<0.3.0
- numba-cuda>=0.2.0,<0.3.0a0
- numba>=0.59.1,<0.61.0a0
- numpy>=1.23,<3.0a0
- numpydoc
- nvcc_linux-64=11.8
Expand Down
3 changes: 2 additions & 1 deletion conda/environments/all_cuda-125_arch-x86_64.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,8 @@ dependencies:
- nbsphinx
- ninja
- notebook
- numba-cuda>=0.2.0,<0.3.0
- numba-cuda>=0.2.0,<0.3.0a0
- numba>=0.59.1,<0.61.0a0
- numpy>=1.23,<3.0a0
- numpydoc
- nvcomp==4.1.0.6
Expand Down
3 changes: 2 additions & 1 deletion conda/recipes/cudf/meta.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,8 @@ requirements:
- typing_extensions >=4.0.0
- pandas >=2.0,<2.2.4dev0
- cupy >=12.0.0
- numba-cuda >=0.2.0,<0.3.0
- numba-cuda >=0.2.0,<0.3.0a0
- numba >=0.59.1,<0.61.0a0
- numpy >=1.23,<3.0a0
- pyarrow>=14.0.0,<=19.0.0
- libcudf ={{ version }}
Expand Down
5 changes: 4 additions & 1 deletion dependencies.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -708,7 +708,8 @@ dependencies:
- output_types: [conda, requirements, pyproject]
packages:
- cachetools
- &numba-cuda-dep numba-cuda>=0.2.0,<0.3.0
- &numba-cuda-dep numba-cuda>=0.2.0,<0.3.0a0
- &numba-dep numba>=0.59.1,<0.61.0a0
- nvtx>=0.2.1
- packaging
- rich
Expand Down Expand Up @@ -835,6 +836,7 @@ dependencies:
- matrix: {dependencies: "latest"}
packages:
- *numba-cuda-dep
- *numba-dep
- pandas==2.2.3
- matrix:
packages:
Expand Down Expand Up @@ -917,6 +919,7 @@ dependencies:
packages:
- dask-cuda==25.2.*,>=0.0.0a0
- *numba-cuda-dep
- *numba-dep
specific:
- output_types: [conda, requirements]
matrices:
Expand Down
3 changes: 2 additions & 1 deletion python/cudf/pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,8 @@ dependencies = [
"cupy-cuda11x>=12.0.0",
"fsspec>=0.6.0",
"libcudf==25.2.*,>=0.0.0a0",
"numba-cuda>=0.2.0,<0.3.0",
"numba-cuda>=0.2.0,<0.3.0a0",
"numba>=0.59.1,<0.61.0a0",
"numpy>=1.23,<3.0a0",
"nvtx>=0.2.1",
"packaging",
Expand Down
3 changes: 2 additions & 1 deletion python/dask_cudf/pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,8 @@ cudf = "dask_cudf.backends:CudfBackendEntrypoint"
[project.optional-dependencies]
test = [
"dask-cuda==25.2.*,>=0.0.0a0",
"numba-cuda>=0.2.0,<0.3.0",
"numba-cuda>=0.2.0,<0.3.0a0",
"numba>=0.59.1,<0.61.0a0",
"pytest-cov",
"pytest-xdist",
"pytest<8",
Expand Down

0 comments on commit 74e9119

Please sign in to comment.