From c6c21d7f9281f295e32ff72c95f95b600470df0e Mon Sep 17 00:00:00 2001 From: jakirkham Date: Thu, 18 Jul 2024 12:41:21 -0700 Subject: [PATCH] Drop `{{ pin_compatible('numpy', max_pin='x') }}` (#16301) Part of issue: https://github.com/rapidsai/build-planning/issues/82 Drop `{{ pin_compatible('numpy', max_pin='x') }}` as it is no longer needed. `numpy` has its own `run_exports`, which constraints `numpy` to an API compatible version. More details in issue: https://github.com/orgs/rapidsai/projects/132 So `cudf` now uses that in its recipe builds. Also update `requirements/run` to set the `numpy` lower bound to `1.23` as required by us. Lastly add todo comments for NumPy 2 update lines. Authors: - https://github.com/jakirkham Approvers: - James Lamb (https://github.com/jameslamb) URL: https://github.com/rapidsai/cudf/pull/16301 --- conda/recipes/cudf/meta.yaml | 4 +++- dependencies.yaml | 2 ++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/conda/recipes/cudf/meta.yaml b/conda/recipes/cudf/meta.yaml index 3cdc2050631..9137f099ad1 100644 --- a/conda/recipes/cudf/meta.yaml +++ b/conda/recipes/cudf/meta.yaml @@ -64,6 +64,7 @@ requirements: - rapids-build-backend >=0.3.0,<0.4.0.dev0 - scikit-build-core >=0.7.0 - dlpack >=0.8,<1.0 + # TODO: Change to `2.0` for NumPy 2 - numpy 1.23 - pyarrow ==16.1.0.* - libcudf ={{ version }} @@ -82,7 +83,8 @@ requirements: - pandas >=2.0,<2.2.3dev0 - cupy >=12.0.0 - numba >=0.57 - - {{ pin_compatible('numpy', max_pin='x') }} + # TODO: Update `numpy` in `host` when dropping `<2.0a0` + - numpy >=1.23,<2.0a0 - {{ pin_compatible('pyarrow', max_pin='x.x') }} - libcudf ={{ version }} - {{ pin_compatible('rmm', max_pin='x.x') }} diff --git a/dependencies.yaml b/dependencies.yaml index 67ed3773b44..a19574b7658 100644 --- a/dependencies.yaml +++ b/dependencies.yaml @@ -323,6 +323,7 @@ dependencies: packages: # Hard pin the patch version used during the build. # Sync with conda build constraint & wheel run constraint. + # TODO: Change to `2.0.*` for NumPy 2 - numpy==1.23.* build_python_cudf: common: @@ -551,6 +552,7 @@ dependencies: - output_types: [conda, requirements, pyproject] packages: - fsspec>=0.6.0 + # TODO: Update `numpy` in `build_python_common` when dropping `<2.0a0` - numpy>=1.23,<2.0a0 - pandas>=2.0,<2.2.3dev0 run_cudf: