diff --git a/README.md b/README.md index b38f195d8..5ceb75c38 100644 --- a/README.md +++ b/README.md @@ -119,13 +119,13 @@ docker run --gpus all --pull always --rm -it \ ### Install with Conda To install via conda: -> **Note** cuSpatial is supported only on Linux or [through WSL](https://rapids.ai/wsl2.html), and with Python versions 3.9 and 3.10 +> **Note** cuSpatial is supported only on Linux or [through WSL](https://rapids.ai/wsl2.html), and with Python versions 3.9, 3.10, and 3.11. cuSpatial can be installed with conda (miniconda, or the full Anaconda distribution) from the rapidsai channel: ```shell conda install -c rapidsai -c conda-forge -c nvidia \ - cuspatial=24.04 python=3.10 cudatoolkit=11.8 + cuspatial=24.04 python=3.11 cudatoolkit=11.8 ``` We also provide nightly Conda packages built from the HEAD of our latest development branch. @@ -134,7 +134,7 @@ See the [RAPIDS installation documentation](https://docs.rapids.ai/install) for ### Install with pip To install via pip: -> **Note** cuSpatial is supported only on Linux or [through WSL](https://rapids.ai/wsl2.html), and with Python versions 3.9 and 3.10 +> **Note** cuSpatial is supported only on Linux or [through WSL](https://rapids.ai/wsl2.html), and with Python versions 3.9, 3.10, and 3.11. The cuSpatial pip packages can be installed from NVIDIA's PyPI index. pip installations require using the matching wheel to the system's installed CUDA toolkit. - For CUDA 11 toolkits, install the `-cu11` wheels diff --git a/conda/environments/all_cuda-118_arch-x86_64.yaml b/conda/environments/all_cuda-118_arch-x86_64.yaml index 0cb8bdf64..01928e40e 100644 --- a/conda/environments/all_cuda-118_arch-x86_64.yaml +++ b/conda/environments/all_cuda-118_arch-x86_64.yaml @@ -30,6 +30,7 @@ dependencies: - nbsphinx - ninja - notebook +- numpy>=1.23 - numpydoc - nvcc_linux-64=11.8 - pre-commit @@ -39,7 +40,7 @@ dependencies: - pytest - pytest-cov - pytest-xdist -- python>=3.9,<3.11 +- python>=3.9,<3.12 - rmm==24.4.* - scikit-build-core>=0.7.0 - scikit-image diff --git a/conda/environments/all_cuda-122_arch-x86_64.yaml b/conda/environments/all_cuda-122_arch-x86_64.yaml index 09e0ffcc6..fd6299d17 100644 --- a/conda/environments/all_cuda-122_arch-x86_64.yaml +++ b/conda/environments/all_cuda-122_arch-x86_64.yaml @@ -33,6 +33,7 @@ dependencies: - nbsphinx - ninja - notebook +- numpy>=1.23 - numpydoc - pre-commit - proj @@ -41,7 +42,7 @@ dependencies: - pytest - pytest-cov - pytest-xdist -- python>=3.9,<3.11 +- python>=3.9,<3.12 - rmm==24.4.* - scikit-build-core>=0.7.0 - scikit-image diff --git a/conda/recipes/cuspatial/meta.yaml b/conda/recipes/cuspatial/meta.yaml index 780583427..9d57ca7c7 100644 --- a/conda/recipes/cuspatial/meta.yaml +++ b/conda/recipes/cuspatial/meta.yaml @@ -75,6 +75,7 @@ requirements: - {{ pin_compatible('cuda-version', max_pin='x', min_pin='x') }} - cudf ={{ minor_version }} - geopandas >=0.11.0 + - numpy >=1.23 - python - rmm ={{ minor_version }} diff --git a/dependencies.yaml b/dependencies.yaml index f8e8b8a17..e8a75bc05 100644 --- a/dependencies.yaml +++ b/dependencies.yaml @@ -324,13 +324,18 @@ dependencies: packages: - python=3.10 - matrix: + py: "3.11" packages: - - python>=3.9,<3.11 + - python=3.11 + - matrix: + packages: + - python>=3.9,<3.12 run_python_cuspatial: common: - output_types: [conda, requirements, pyproject] packages: - geopandas>=0.11.0 + - &numpy numpy>=1.23 test_python_cuspatial: common: - output_types: [conda, requirements, pyproject] @@ -342,6 +347,7 @@ dependencies: common: - output_types: [conda, requirements, pyproject] packages: + - *numpy - pytest - pytest-cov - pytest-xdist diff --git a/python/cuproj/pyproject.toml b/python/cuproj/pyproject.toml index e033672b8..fa073fec2 100644 --- a/python/cuproj/pyproject.toml +++ b/python/cuproj/pyproject.toml @@ -44,12 +44,14 @@ classifiers = [ "Programming Language :: Python", "Programming Language :: Python :: 3.9", "Programming Language :: Python :: 3.10", + "Programming Language :: Python :: 3.11", ] [project.optional-dependencies] test = [ "cuspatial==24.4.*", "geopandas>=0.11.0", + "numpy>=1.23", "pyproj>=3.6.0,<3.7a0", "pytest", "pytest-cov", diff --git a/python/cuspatial/pyproject.toml b/python/cuspatial/pyproject.toml index bc6901689..8b2055bb7 100644 --- a/python/cuspatial/pyproject.toml +++ b/python/cuspatial/pyproject.toml @@ -38,6 +38,7 @@ requires-python = ">=3.9" dependencies = [ "cudf==24.4.*", "geopandas>=0.11.0", + "numpy>=1.23", "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 = [ @@ -48,6 +49,7 @@ classifiers = [ "Programming Language :: Python", "Programming Language :: Python :: 3.9", "Programming Language :: Python :: 3.10", + "Programming Language :: Python :: 3.11", ] [project.optional-dependencies]