From c4aacfb20e3afda47643678103231b1fc05d4b54 Mon Sep 17 00:00:00 2001 From: James Lamb Date: Thu, 19 Sep 2024 10:34:50 -0500 Subject: [PATCH] move numpy floor back to 1.23, for integration testing --- conda/environments/all_cuda-118_arch-x86_64.yaml | 2 +- conda/environments/all_cuda-125_arch-x86_64.yaml | 2 +- conda/recipes/cuspatial/meta.yaml | 2 +- dependencies.yaml | 2 +- python/cuproj/pyproject.toml | 2 +- python/cuspatial/pyproject.toml | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/conda/environments/all_cuda-118_arch-x86_64.yaml b/conda/environments/all_cuda-118_arch-x86_64.yaml index a4691ba55..6526e9d5f 100644 --- a/conda/environments/all_cuda-118_arch-x86_64.yaml +++ b/conda/environments/all_cuda-118_arch-x86_64.yaml @@ -28,7 +28,7 @@ dependencies: - nbsphinx - ninja - notebook -- numpy>=2.0.0,<3.0a0 +- numpy>=1.23,<3.0a0 - numpydoc - nvcc_linux-64=11.8 - osmnx>=1.9.3 diff --git a/conda/environments/all_cuda-125_arch-x86_64.yaml b/conda/environments/all_cuda-125_arch-x86_64.yaml index 522dbbef8..9d0e65000 100644 --- a/conda/environments/all_cuda-125_arch-x86_64.yaml +++ b/conda/environments/all_cuda-125_arch-x86_64.yaml @@ -31,7 +31,7 @@ dependencies: - nbsphinx - ninja - notebook -- numpy>=2.0.0,<3.0a0 +- numpy>=1.23,<3.0a0 - numpydoc - osmnx>=1.9.3 - pre-commit diff --git a/conda/recipes/cuspatial/meta.yaml b/conda/recipes/cuspatial/meta.yaml index 6e2805184..f5be07c87 100644 --- a/conda/recipes/cuspatial/meta.yaml +++ b/conda/recipes/cuspatial/meta.yaml @@ -77,7 +77,7 @@ requirements: - cudf ={{ minor_version }} - pylibcudf ={{ minor_version }} - geopandas >=1.0.0 - - numpy >=2.0.0,<3.0a0 + - numpy >=1.23,<3.0a0 - python - rmm ={{ minor_version }} diff --git a/dependencies.yaml b/dependencies.yaml index 76f4d2a4a..8e4c0964e 100644 --- a/dependencies.yaml +++ b/dependencies.yaml @@ -400,7 +400,7 @@ dependencies: - output_types: [conda, requirements, pyproject] packages: - &geopandas geopandas>=1.0.0 - - &numpy numpy>=2.0.0,<3.0a0 + - &numpy numpy>=1.23,<3.0a0 test_python_cuspatial: common: - output_types: [conda, requirements, pyproject] diff --git a/python/cuproj/pyproject.toml b/python/cuproj/pyproject.toml index be2d4c206..f7e920543 100644 --- a/python/cuproj/pyproject.toml +++ b/python/cuproj/pyproject.toml @@ -45,7 +45,7 @@ classifiers = [ test = [ "cuspatial==24.10.*,>=0.0.0a0", "geopandas>=1.0.0", - "numpy>=2.0.0,<3.0a0", + "numpy>=1.23,<3.0a0", "pyproj>=3.6.0,<3.7a0", "pytest", "pytest-cov", diff --git a/python/cuspatial/pyproject.toml b/python/cuspatial/pyproject.toml index ef1d15e2e..94b401472 100644 --- a/python/cuspatial/pyproject.toml +++ b/python/cuspatial/pyproject.toml @@ -34,7 +34,7 @@ dependencies = [ "geopandas>=1.0.0", "libcudf==24.10.*,>=0.0.0a0", "libcuspatial==24.10.*,>=0.0.0a0", - "numpy>=2.0.0,<3.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 = [