From cca5d083c8670914ffe16f29d5e0f300317c6888 Mon Sep 17 00:00:00 2001 From: James Lamb Date: Mon, 23 Dec 2024 11:44:58 -0600 Subject: [PATCH] remove cython dependency, remove setup.cfg Signed-off-by: James Lamb --- .flake8 | 13 ++++++++++++ .pre-commit-config.yaml | 1 + CMakeLists.txt | 2 +- .../all_cuda-125_arch-x86_64.yaml | 2 -- conda/recipes/legate-raft/meta.yaml | 1 - dependencies.yaml | 2 -- pyproject.toml | 4 +++- setup.cfg | 21 ------------------- 8 files changed, 18 insertions(+), 28 deletions(-) create mode 100644 .flake8 delete mode 100644 setup.cfg diff --git a/.flake8 b/.flake8 new file mode 100644 index 0000000..1cb3836 --- /dev/null +++ b/.flake8 @@ -0,0 +1,13 @@ +# Copyright (c) 2024, NVIDIA CORPORATION. + +[flake8] +exclude = __init__.py, *.egg, build, docs, .git +filename = *.py, *.pyx, *.pxd, *.pxi +ignore = + # whitespace before : + E203, + # do not compare types, for exact checks us 'is' / 'is not' + E721, + # line break before binary operator + W503 +max-line-length = 88 diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 982caef..07f4028 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -23,6 +23,7 @@ repos: rev: 7.1.1 hooks: - id: flake8 + types_or: [python, cython] - repo: https://github.com/codespell-project/codespell rev: v2.3.0 hooks: diff --git a/CMakeLists.txt b/CMakeLists.txt index fad5a3f..6212ab7 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -13,7 +13,7 @@ set(RAPIDS_VERSION "24.10") -cmake_minimum_required(VERSION 3.23.1 FATAL_ERROR) +cmake_minimum_required(VERSION 3.26.4 FATAL_ERROR) # ------------- configure rapids-cmake --------------# diff --git a/conda/environments/all_cuda-125_arch-x86_64.yaml b/conda/environments/all_cuda-125_arch-x86_64.yaml index 84e2413..3da6e65 100644 --- a/conda/environments/all_cuda-125_arch-x86_64.yaml +++ b/conda/environments/all_cuda-125_arch-x86_64.yaml @@ -20,7 +20,6 @@ dependencies: - cupy>=12.0.0 - cupynumeric==25.01.*,>=0.0.0.dev0 - cxx-compiler -- cython>=3.0.3 - gcc_linux-64=11.* - gitpython - hypothesis>=6 @@ -32,7 +31,6 @@ dependencies: - librmm==24.10.*,>=0.0.0a0 - libucxx - make -- matplotlib - mpi4py - myst-parser>=4.0 - ninja diff --git a/conda/recipes/legate-raft/meta.yaml b/conda/recipes/legate-raft/meta.yaml index 48c9dcb..3eb6dae 100644 --- a/conda/recipes/legate-raft/meta.yaml +++ b/conda/recipes/legate-raft/meta.yaml @@ -62,7 +62,6 @@ requirements: - libcublas-dev - python - pip - - cython >=3.0.3 - rapids-build-backend >=0.3.0,<0.4.0.dev0 - scikit-build-core >=0.10.0 - libraft {{ rapids_version }} diff --git a/dependencies.yaml b/dependencies.yaml index da5cf51..e51c41f 100644 --- a/dependencies.yaml +++ b/dependencies.yaml @@ -85,7 +85,6 @@ dependencies: - output_types: [conda, requirements, pyproject] packages: - cmake>=3.26.4,!=3.30.0 - - cython>=3.0.3 - ninja - output_types: [conda] packages: @@ -171,7 +170,6 @@ dependencies: packages: - jupyter - gitpython - - matplotlib - pandas checks: diff --git a/pyproject.toml b/pyproject.toml index 91d47ad..ccb19e0 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -56,7 +56,6 @@ dependencies-file = "dependencies.yaml" matrix-entry = "cuda_suffixed=true" requires = [ "cmake>=3.26.4,!=3.30.0", - "cython>=3.0.3", "legate-dataframe==25.01.*,>=0.0.0.dev0", "legate==25.01.*,>=0.0.0.dev0", "libraft==24.10.*,>=0.0.0a0", @@ -82,3 +81,6 @@ wheel.packages = ["legate_raft"] [tool.codespell] ignore-words-list = "coo,indext,thirdparty" + +[tool.isort] +profile = "black" diff --git a/setup.cfg b/setup.cfg deleted file mode 100644 index f226ec8..0000000 --- a/setup.cfg +++ /dev/null @@ -1,21 +0,0 @@ -# Copyright (c) 2023, NVIDIA CORPORATION. -# SPDX-License-Identifier: Apache-2.0 - -[versioneer] -VCS = git -style = pep440 -tag_prefix = v - -[flake8] -max-line-length = 88 -extend-ignore = E203,E721 - -[isort] -profile = black - -[options] -packages = find: -install_requires = - numpy>=1.22 - # TODO: Add rest of install dependencies -python_requires = >=3.9,!=3.9.7