Skip to content

Commit

Permalink
Add upper bound to prevent usage of NumPy 2 (#1359)
Browse files Browse the repository at this point in the history
NumPy 2 is expected to be released in the near future. For the RAPIDS 24.04 release, we will pin to `numpy>=1.23,<2.0a0`. This PR adds an upper bound to affected RAPIDS repositories.

xref: rapidsai/build-planning#29

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

Approvers:
  - Mark Harris (https://github.com/harrism)
  - Ray Douglass (https://github.com/raydouglass)

URL: #1359
  • Loading branch information
bdice authored Mar 13, 2024
1 parent f410685 commit faf6d1c
Show file tree
Hide file tree
Showing 6 changed files with 8 additions and 8 deletions.
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 @@ -30,7 +30,7 @@ dependencies:
- nbsphinx
- ninja
- notebook
- numpy>=1.23
- numpy>=1.23,<2.0a0
- numpydoc
- nvcc_linux-64=11.8
- pre-commit
Expand Down
2 changes: 1 addition & 1 deletion conda/environments/all_cuda-122_arch-x86_64.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ dependencies:
- nbsphinx
- ninja
- notebook
- numpy>=1.23
- numpy>=1.23,<2.0a0
- numpydoc
- pre-commit
- proj
Expand Down
4 changes: 2 additions & 2 deletions conda/recipes/cuspatial/meta.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Copyright (c) 2018-2023, NVIDIA CORPORATION.
# Copyright (c) 2018-2024, NVIDIA CORPORATION.

{% set version = environ['RAPIDS_PACKAGE_VERSION'].lstrip('v') %}
{% set minor_version = version.split('.')[0] + '.' + version.split('.')[1] %}
Expand Down Expand Up @@ -75,7 +75,7 @@ requirements:
- {{ pin_compatible('cuda-version', max_pin='x', min_pin='x') }}
- cudf ={{ minor_version }}
- geopandas >=0.11.0
- numpy >=1.23
- numpy >=1.23,<2.0a0
- python
- rmm ={{ minor_version }}

Expand Down
2 changes: 1 addition & 1 deletion dependencies.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -335,7 +335,7 @@ dependencies:
- output_types: [conda, requirements, pyproject]
packages:
- geopandas>=0.11.0
- &numpy numpy>=1.23
- &numpy numpy>=1.23,<2.0a0
test_python_cuspatial:
common:
- output_types: [conda, requirements, pyproject]
Expand Down
4 changes: 2 additions & 2 deletions python/cuproj/pyproject.toml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Copyright (c) 2022-2023, NVIDIA CORPORATION.
# Copyright (c) 2022-2024, NVIDIA CORPORATION.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
Expand Down Expand Up @@ -51,7 +51,7 @@ classifiers = [
test = [
"cuspatial==24.4.*",
"geopandas>=0.11.0",
"numpy>=1.23",
"numpy>=1.23,<2.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 @@ -38,7 +38,7 @@ requires-python = ">=3.9"
dependencies = [
"cudf==24.4.*",
"geopandas>=0.11.0",
"numpy>=1.23",
"numpy>=1.23,<2.0a0",
"rmm==24.4.*",
] # 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 faf6d1c

Please sign in to comment.