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.

Sign up for GitHub

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

Jump to bottom

Remove NumPy <2 pin, remove panel ceiling #622

Merged
merged 12 commits into from
Sep 24, 2024
Merged

Remove NumPy <2 pin, remove panel ceiling #622

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
278a092
Remove NumPy <2 pin.
seberg Aug 19, 2024
7911239
Include pre-release identifier for upper pin
seberg Aug 20, 2024
d24ecf0
Merge branch 'branch-24.10' into my_new_branch
seberg Aug 27, 2024
47ac436
Merge branch 'branch-24.10' into my_new_branch
jameslamb Sep 19, 2024
ecafc13
test with cuspatial PR artifacts
jameslamb Sep 19, 2024
e559b62
workflow dependencies
jameslamb Sep 19, 2024
d822a32
more commenting
jameslamb Sep 19, 2024
a670e16
put explicit floor on NumPy 2.x to see what happens
jameslamb Sep 23, 2024
54b4c2b
get cudf from rapidsai-nightly
jameslamb Sep 23, 2024
2efb71e
loosen pin, remove testing-only changes
jameslamb Sep 24, 2024
e7dc0f8
remove scripts
jameslamb Sep 24, 2024
b28444a
try loosening panel pin
jameslamb Sep 24, 2024
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Interested to see how this goes

If we need to ignore a specific version, maybe we can do !=

Though if this is just the case of working around a past solver issue or limiting to a set of tested releases, then simply dropping seems reasonable

Maybe we can follow up with the cuxfilter team on which makes more sense

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yep for sure!

Note this pin is only for the testing environment.... it's already unpinned (>=1.0) at runtime for users.

@AjayThorve could the ceiling on panel be removed?

I do see evidence that it helps conda find a solve with cuxftiler=24.10.* and numpy>=2.0.

  + bokeh                                      3.5.2  pyhd8ed1ab_0                         conda-forge                5MB
  + numpy                                      2.0.2  py312h58c1407_0                      conda-forge                8MB
  + panel                                      1.5.0  pyhd8ed1ab_0                         conda-forge               21MB

(build link)

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yeah, AFAIK, there are no issues at runtime, so as long as the tests pass (seems like they do), this should be fine

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Great, thank you!

test_external:
common:
- output_types: [conda]
Expand Down
2 changes: 1 addition & 1 deletion python/pyproject.toml
View file
Open in desktop
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