Skip to content

Commit

Permalink
Remove NumPy <2 pin, remove proj pin (#1441)
Browse files Browse the repository at this point in the history
This PR removes the NumPy<2 pin which is expected to work for
RAPIDS projects once CuPy 13.3.0 is released (CuPy 13.2.0 had
some issues preventing the use with NumPy 2).

Also contributes to rapidsai/build-planning#56 by removing the pin on `proj` (which allows this project to work with newer `fmt` / `spdlog`, in sync with conda-forge).

Authors:
  - Sebastian Berg (https://github.com/seberg)
  - Bradley Dice (https://github.com/bdice)
  - James Lamb (https://github.com/jameslamb)
  - https://github.com/jakirkham

Approvers:
  - Bradley Dice (https://github.com/bdice)

URL: #1441
  • Loading branch information
seberg authored Sep 24, 2024
1 parent 43776f2 commit be73c8e
Show file tree
Hide file tree
Showing 8 changed files with 12 additions and 12 deletions.
4 changes: 2 additions & 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,12 @@ dependencies:
- nbsphinx
- ninja
- notebook
- numpy>=1.23,<2.0a0
- numpy>=1.23,<3.0a0
- numpydoc
- nvcc_linux-64=11.8
- osmnx>=1.9.3
- pre-commit
- proj >=9.3.0,<9.3.1.0a0
- proj
- pydata-sphinx-theme!=0.14.2
- pydeck
- pylibcudf==24.10.*,>=0.0.0a0
Expand Down
4 changes: 2 additions & 2 deletions conda/environments/all_cuda-125_arch-x86_64.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -31,11 +31,11 @@ dependencies:
- nbsphinx
- ninja
- notebook
- numpy>=1.23,<2.0a0
- numpy>=1.23,<3.0a0
- numpydoc
- osmnx>=1.9.3
- pre-commit
- proj >=9.3.0,<9.3.1.0a0
- proj
- pydata-sphinx-theme!=0.14.2
- pydeck
- pylibcudf==24.10.*,>=0.0.0a0
Expand Down
2 changes: 1 addition & 1 deletion conda/recipes/cuproj/meta.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ requirements:
- rapids-build-backend >=0.3.0,<0.4.0.dev0
- librmm ={{ minor_version }}
- scikit-build-core >=0.10.0
- proj >=9.3.0,<9.3.1.0a0 # TODO: proj is being held back due to needing spdlog/fmt upgrades to support recent conda-forge builds of tiledb
- proj
- sqlite
run:
{% if cuda_major == "11" %}
Expand Down
2 changes: 1 addition & 1 deletion conda/recipes/cuspatial/meta.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ requirements:
- cudf ={{ minor_version }}
- pylibcudf ={{ minor_version }}
- geopandas >=1.0.0
- numpy >=1.23,<2.0a0
- numpy >=1.23,<3.0a0
- python
- rmm ={{ minor_version }}

Expand Down
4 changes: 2 additions & 2 deletions conda/recipes/libcuspatial/meta.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ requirements:
- libcudf ={{ minor_version }}
- librmm ={{ minor_version }}
- sqlite
- proj >=9.3.0,<9.3.1.0a0 # TODO: proj is being held back due to needing spdlog/fmt upgrades to support recent conda-forge builds of tiledb
- proj

outputs:
- name: libcuspatial
Expand Down Expand Up @@ -85,7 +85,7 @@ outputs:
- libcudf ={{ minor_version }}
- librmm ={{ minor_version }}
- sqlite
- proj >=9.3.0,<9.3.1.0a0 # TODO: proj is being held back due to needing spdlog/fmt upgrades to support recent conda-forge builds of tiledb
- proj
test:
commands:
- test -f $PREFIX/lib/libcuspatial.so
Expand Down
4 changes: 2 additions & 2 deletions dependencies.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -180,7 +180,7 @@ dependencies:
packages:
- c-compiler
- cxx-compiler
- proj >=9.3.0,<9.3.1.0a0 # TODO: proj is being held back due to needing spdlog/fmt upgrades to support recent conda-forge builds of tiledb
- proj
- sqlite
specific:
- output_types: conda
Expand Down Expand Up @@ -400,7 +400,7 @@ dependencies:
- output_types: [conda, requirements, pyproject]
packages:
- &geopandas geopandas>=1.0.0
- &numpy numpy>=1.23,<2.0a0
- &numpy numpy>=1.23,<3.0a0
test_python_cuspatial:
common:
- output_types: [conda, requirements, pyproject]
Expand Down
2 changes: 1 addition & 1 deletion python/cuproj/pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ classifiers = [
test = [
"cuspatial==24.10.*,>=0.0.0a0",
"geopandas>=1.0.0",
"numpy>=1.23,<2.0a0",
"numpy>=1.23,<3.0a0",
"pyproj>=3.6.0,<3.7a0",
"pytest",
"pytest-cov",
Expand Down
2 changes: 1 addition & 1 deletion python/cuspatial/pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ dependencies = [
"geopandas>=1.0.0",
"libcudf==24.10.*,>=0.0.0a0",
"libcuspatial==24.10.*,>=0.0.0a0",
"numpy>=1.23,<2.0a0",
"numpy>=1.23,<3.0a0",
"rmm==24.10.*,>=0.0.0a0",
] # This list was generated by `rapids-dependency-file-generator`. To make changes, edit ../../dependencies.yaml and run `rapids-dependency-file-generator`.
classifiers = [
Expand Down

0 comments on commit be73c8e

Please sign in to comment.