Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Forward-merge branch-24.10 into branch-24.12 #630

Merged
merged 1 commit into from
Sep 24, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions conda/environments/all_cuda-118_arch-x86_64.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -28,12 +28,11 @@ dependencies:
- nodejs>=18
- notebook>=0.5.0
- numba>=0.57
- numpy>=1.23,<2.0a0
- numpy>=1.23,<3.0a0
- numpydoc
- packaging
- pandoc<=2.0.0
- panel>=1.0
- panel>=1.0,<=1.3.4
- pre-commit
- pydata-sphinx-theme
- pytest
Expand Down
3 changes: 1 addition & 2 deletions conda/environments/all_cuda-125_arch-x86_64.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -27,12 +27,11 @@ dependencies:
- nodejs>=18
- notebook>=0.5.0
- numba>=0.57
- numpy>=1.23,<2.0a0
- numpy>=1.23,<3.0a0
- numpydoc
- packaging
- pandoc<=2.0.0
- panel>=1.0
- panel>=1.0,<=1.3.4
- pre-commit
- pydata-sphinx-theme
- pytest
Expand Down
2 changes: 1 addition & 1 deletion conda/recipes/cuxfilter/meta.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ requirements:
- libwebp-base
- nodejs >=14
- numba >=0.57
- numpy >=1.23,<2.0a0
- numpy >=1.23,<3.0a0
- packaging
- panel >=1.0
- python
Expand Down
5 changes: 1 addition & 4 deletions dependencies.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -196,7 +196,7 @@ dependencies:
- holoviews>=1.16.0
- jupyter-server-proxy
- numba>=0.57
- numpy>=1.23,<2.0a0
- numpy>=1.23,<3.0a0
- packaging
- panel>=1.0
- output_types: conda
Expand Down Expand Up @@ -260,9 +260,6 @@ dependencies:
- pytest
- pytest-cov
- pytest-xdist
- output_types: conda
packages:
- panel>=1.0,<=1.3.4
test_external:
common:
- output_types: [conda]
Expand Down
2 changes: 1 addition & 1 deletion python/pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ dependencies = [
"holoviews>=1.16.0",
"jupyter-server-proxy",
"numba>=0.57",
"numpy>=1.23,<2.0a0",
"numpy>=1.23,<3.0a0",
"packaging",
"panel>=1.0",
] # This list was generated by `rapids-dependency-file-generator`. To make changes, edit ../dependencies.yaml and run `rapids-dependency-file-generator`.
Expand Down
Loading