From faf6d1cb50a0c9ab01052fc46003a86656dd22d5 Mon Sep 17 00:00:00 2001
From: Bradley Dice <bdice@bradleydice.com>
Date: Wed, 13 Mar 2024 09:22:21 -0500
Subject: [PATCH] Add upper bound to prevent usage of NumPy 2 (#1359)

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: https://github.com/rapidsai/build-planning/issues/29

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

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

URL: https://github.com/rapidsai/cuspatial/pull/1359
---
 conda/environments/all_cuda-118_arch-x86_64.yaml | 2 +-
 conda/environments/all_cuda-122_arch-x86_64.yaml | 2 +-
 conda/recipes/cuspatial/meta.yaml                | 4 ++--
 dependencies.yaml                                | 2 +-
 python/cuproj/pyproject.toml                     | 4 ++--
 python/cuspatial/pyproject.toml                  | 2 +-
 6 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/conda/environments/all_cuda-118_arch-x86_64.yaml b/conda/environments/all_cuda-118_arch-x86_64.yaml
index 01928e40e..506060cf9 100644
--- a/conda/environments/all_cuda-118_arch-x86_64.yaml
+++ b/conda/environments/all_cuda-118_arch-x86_64.yaml
@@ -30,7 +30,7 @@ dependencies:
 - nbsphinx
 - ninja
 - notebook
-- numpy>=1.23
+- numpy>=1.23,<2.0a0
 - numpydoc
 - nvcc_linux-64=11.8
 - pre-commit
diff --git a/conda/environments/all_cuda-122_arch-x86_64.yaml b/conda/environments/all_cuda-122_arch-x86_64.yaml
index fd6299d17..566aa2327 100644
--- a/conda/environments/all_cuda-122_arch-x86_64.yaml
+++ b/conda/environments/all_cuda-122_arch-x86_64.yaml
@@ -33,7 +33,7 @@ dependencies:
 - nbsphinx
 - ninja
 - notebook
-- numpy>=1.23
+- numpy>=1.23,<2.0a0
 - numpydoc
 - pre-commit
 - proj
diff --git a/conda/recipes/cuspatial/meta.yaml b/conda/recipes/cuspatial/meta.yaml
index 9d57ca7c7..c2c60133d 100644
--- a/conda/recipes/cuspatial/meta.yaml
+++ b/conda/recipes/cuspatial/meta.yaml
@@ -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] %}
@@ -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 }}
 
diff --git a/dependencies.yaml b/dependencies.yaml
index e8a75bc05..fabb4149e 100644
--- a/dependencies.yaml
+++ b/dependencies.yaml
@@ -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]
diff --git a/python/cuproj/pyproject.toml b/python/cuproj/pyproject.toml
index fa073fec2..698482319 100644
--- a/python/cuproj/pyproject.toml
+++ b/python/cuproj/pyproject.toml
@@ -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.
@@ -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",
diff --git a/python/cuspatial/pyproject.toml b/python/cuspatial/pyproject.toml
index 15b1053be..e58b6bd54 100644
--- a/python/cuspatial/pyproject.toml
+++ b/python/cuspatial/pyproject.toml
@@ -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 = [