From 7300cc3a418e498138cffa3b5309d5caac096964 Mon Sep 17 00:00:00 2001 From: James Lamb Date: Mon, 26 Feb 2024 17:18:09 -0600 Subject: [PATCH 1/3] Add support for Python 3.11. --- BUILD.md | 2 +- conda/environments/all_cuda-118_arch-x86_64.yaml | 2 +- conda/environments/all_cuda-122_arch-x86_64.yaml | 2 +- dependencies.yaml | 6 +++++- 4 files changed, 8 insertions(+), 4 deletions(-) diff --git a/BUILD.md b/BUILD.md index afdcfc86dd..4bc8310407 100644 --- a/BUILD.md +++ b/BUILD.md @@ -18,7 +18,7 @@ To install cuML from source, ensure the following dependencies are met: It is recommended to use conda for environment/package management. If doing so, development environment .yaml files are located in `conda/environments/all_*.yaml`. These files contains most of the dependencies mentioned above (notable exceptions are `gcc` and `zlib`). To create a development environment named `cuml_dev`, you can use the follow commands: ```bash -conda create -n cuml_dev python=3.10 +conda create -n cuml_dev python=3.11 conda env update -n cuml_dev --file=conda/environments/all_cuda-118_arch-x86_64.yaml conda activate cuml_dev ``` diff --git a/conda/environments/all_cuda-118_arch-x86_64.yaml b/conda/environments/all_cuda-118_arch-x86_64.yaml index 79003e2d9c..4aeba10d24 100644 --- a/conda/environments/all_cuda-118_arch-x86_64.yaml +++ b/conda/environments/all_cuda-118_arch-x86_64.yaml @@ -58,7 +58,7 @@ dependencies: - pytest-cov - pytest-xdist - pytest==7.* -- python>=3.9,<3.11 +- python>=3.9,<3.12 - raft-dask==24.4.* - rapids-dask-dependency==24.4.* - recommonmark diff --git a/conda/environments/all_cuda-122_arch-x86_64.yaml b/conda/environments/all_cuda-122_arch-x86_64.yaml index 8acaae7050..d75b388405 100644 --- a/conda/environments/all_cuda-122_arch-x86_64.yaml +++ b/conda/environments/all_cuda-122_arch-x86_64.yaml @@ -54,7 +54,7 @@ dependencies: - pytest-cov - pytest-xdist - pytest==7.* -- python>=3.9,<3.11 +- python>=3.9,<3.12 - raft-dask==24.4.* - rapids-dask-dependency==24.4.* - recommonmark diff --git a/dependencies.yaml b/dependencies.yaml index 8544df4f5b..d63702bca5 100644 --- a/dependencies.yaml +++ b/dependencies.yaml @@ -377,8 +377,12 @@ 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 test_libcuml: common: - output_types: conda From 94804518c7b72fcae2e5351506c834926eb411a4 Mon Sep 17 00:00:00 2001 From: James Lamb Date: Tue, 27 Feb 2024 10:14:41 -0600 Subject: [PATCH 2/3] trove classifier --- python/pyproject.toml | 1 + 1 file changed, 1 insertion(+) diff --git a/python/pyproject.toml b/python/pyproject.toml index 43e66952a9..6b05fd4d72 100644 --- a/python/pyproject.toml +++ b/python/pyproject.toml @@ -72,6 +72,7 @@ classifiers = [ "Programming Language :: Python", "Programming Language :: Python :: 3.9", "Programming Language :: Python :: 3.10", + "Programming Language :: Python :: 3.11", ] [project.optional-dependencies] From 0e1eb6d40d18c7f95d02a09922a38df9fb56381e Mon Sep 17 00:00:00 2001 From: James Lamb Date: Tue, 27 Feb 2024 19:05:59 -0600 Subject: [PATCH 3/3] require numpy 1.23+ --- conda/recipes/cuml-cpu/meta.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conda/recipes/cuml-cpu/meta.yaml b/conda/recipes/cuml-cpu/meta.yaml index 8a232bae12..0e812d9f1a 100644 --- a/conda/recipes/cuml-cpu/meta.yaml +++ b/conda/recipes/cuml-cpu/meta.yaml @@ -31,7 +31,7 @@ requirements: - cython>=3.0.0 run: - python x.x - - numpy + - numpy>=1.23 - pandas - scikit-learn=1.2 - hdbscan<=0.8.30