Migrate as much as possible to pyproject.toml

.pre-commit-config.yaml

@@ -9,7 +9,7 @@ repos:
       rev: 5.12.0
       hooks:
           - id: isort
-            args: ["--config-root=python/", "--resolve-all-configs"]
+            args: ["--settings-path=python/pyproject.toml"]
             files: python/.*
             types_or: [python, cython, pyi]
     - repo: https://github.com/ambv/black
@@ -21,7 +21,7 @@ repos:
       rev: 5.0.4
       hooks:
           - id: flake8
-            args: ["--config=python/setup.cfg"]
+            args: ["--config=python/.flake8"]
             files: python/.*$
             types: [file]
             types_or: [python, cython]

ci/release/apply_wheel_modifications.sh

@@ -1,12 +1,12 @@
 #!/bin/bash
 # Copyright (c) 2023, NVIDIA CORPORATION.
 #
-# Usage: bash apply_wheel_modifications.sh <new_version>
+# Usage: bash apply_wheel_modifications.sh <new_version> <cuda_suffix>
 
 VERSION=${1}
 CUDA_SUFFIX=${2}
 
 sed -i "s/__version__ = .*/__version__ = \"${VERSION}\"/g" python/rmm/__init__.py
-sed -i "s/version=.*,/version=\"${VERSION}\",/g" python/setup.py
+sed -i "s/^version = .*/version = \"${VERSION}\"/g" python/pyproject.toml
 
-sed -i "s/name=\"rmm\",/name=\"rmm${CUDA_SUFFIX}\",/g" python/setup.py
+sed -i "s/^name = \"rmm\"/name = \"rmm${CUDA_SUFFIX}\"/g" python/pyproject.toml

conda/environments/all_cuda-118_arch-x86_64.yaml

@@ -19,4 +19,5 @@ dependencies:
 - python>=3.8,<3.11
 - scikit-build>=0.13.1
 - spdlog>=1.11.0,<1.12
+- tomli
 name: all_cuda-118_arch-x86_64

conda/recipes/rmm/meta.yaml

@@ -46,7 +46,8 @@ requirements:
     - librmm ={{ version }}
     - python
     - scikit-build >=0.13.1
-    - setuptools
+    - setuptools >=61.0.0
+    - tomli  # [py<311]
   run:
     - cuda-python >=11.7.1,<12.0
     - numba >=0.49

dependencies.yaml

@@ -47,6 +47,7 @@ dependencies:
           - ninja
           - python>=3.8,<3.11
           - scikit-build>=0.13.1
+          - tomli
       - output_types: conda
         packages:
           - fmt>=9.1.0,<10

python/setup.cfg → python/.flake8

@@ -1,5 +1,4 @@
-# Copyright (c) 2018-2021, NVIDIA CORPORATION.
-
+# Copyright (c) 2023, NVIDIA CORPORATION.
 
 [flake8]
 filename = *.py, *.pyx, *.pxd, *.pxi
@@ -23,38 +22,3 @@ per-file-ignores =
     *.pyx: E211, E225, E226, E227, E275, E402, E999, W504
     *.pxd: E211, E225, E226, E227, E275, E402, E999, W504
     *.pxi: E211, E225, E226, E227, E275, E402, E999, W504
-
-[isort]
-line_length=79
-multi_line_output=3
-include_trailing_comma=True
-force_grid_wrap=0
-combine_as_imports=True
-order_by_type=True
-known_dask=
-    dask
-    distributed
-    dask_cuda
-known_rapids=
-    nvtext
-    cudf
-    cuml
-    cugraph
-    dask_cudf
-known_first_party=
-    rmm
-default_section=THIRDPARTY
-sections=FUTURE,STDLIB,THIRDPARTY,DASK,RAPIDS,FIRSTPARTY,LOCALFOLDER
-skip=
-    thirdparty
-    .eggs
-    .git
-    .hg
-    .mypy_cache
-    .tox
-    .venv
-    _build
-    buck-out
-    build
-    dist
-    __init__.py

python/MANIFEST.in

@@ -0,0 +1,13 @@
+# Cython files
+recursive-include rmm *.pxd
+recursive-include rmm *.pyx
+
+# Build files. Don't use a recursive include on '.' in case the repo is dirty
+include . CMakeLists.txt
+recursive-include rmm CMakeLists.txt
+
+# License
+include LICENSE
+
+# README
+include README

python/README.md

@@ -0,0 +1 @@
+../README.md

python/pyproject.toml

@@ -13,17 +13,52 @@
 # limitations under the License.
 
 [build-system]
-
+build-backend = "setuptools.build_meta"
 requires = [
     "wheel",
-    "setuptools",
+    "setuptools>=61.0.0",
     "cython>=0.29,<0.30",
     "scikit-build>=0.13.1",
     "cmake>=3.23.1,!=3.25.0",
     "ninja",
-    "cuda-python>=11.7.1,<12.0"
+    "cuda-python>=11.7.1,<12.0",
+    "tomli; python_version < '3.11'",
+]
+
+[project]
+name = "rmm"
+version = "23.04.00"
+description = "rmm - RAPIDS Memory Manager"
+readme = { file = "README.md", content-type = "text/markdown" }
+authors = [
+    { name = "NVIDIA Corporation" },
+]
+license = { text = "Apache 2.0" }
+requires-python = ">=3.8"
+dependencies = [
+    "cuda-python>=11.7.1,<12.0",
+    "numpy>=1.19",
+    "numba>=0.49",
+]
+classifiers = [
+    "Intended Audience :: Developers",
+    "Topic :: Database",
+    "Topic :: Scientific/Engineering",
+    "License :: OSI Approved :: Apache Software License",
+    "Programming Language :: Python",
+    "Programming Language :: Python :: 3.8",
+    "Programming Language :: Python :: 3.10",
+]
+
+[project.optional-dependencies]
+test = [
+    "pytest",
+    "pytest-xdist",
 ]
 
+[project.urls]
+Homepage = "https://github.com/rapidsai/rmm"
+
 [tool.black]
 line-length = 79
 target-version = ["py38"]
@@ -43,3 +78,40 @@ exclude = '''
     dist
 )/
 '''
+
+[tool.isort]
+line_length = 79
+multi_line_output = 3
+include_trailing_comma = true
+force_grid_wrap = 0
+combine_as_imports = true
+order_by_type = true
+known_first_party = [
+    "rmm",
+]
+default_section = "THIRDPARTY"
+sections = [
+    "FUTURE",
+    "STDLIB",
+    "THIRDPARTY",
+    "FIRSTPARTY",
+    "LOCALFOLDER",
+]
+skip = [
+    "thirdparty",
+    ".eggs",
+    ".git",
+    ".hg",
+    ".mypy_cache",
+    ".tox",
+    ".venv",
+    "_build",
+    "buck-out",
+    "build",
+    "dist",
+    "__init__.py",
+]
+
+[tool.setuptools]
+license-files = ["LICENSE"]
+zip-safe = false

python/setup.py

@@ -4,40 +4,5 @@
 from skbuild import setup
 
 setup(
-    name="rmm",
-    version="23.04.00",
-    description="rmm - RAPIDS Memory Manager",
-    url="https://github.com/rapidsai/rmm",
-    author="NVIDIA Corporation",
-    license="Apache 2.0",
-    classifiers=[
-        "Intended Audience :: Developers",
-        "Topic :: Database",
-        "Topic :: Scientific/Engineering",
-        "License :: OSI Approved :: Apache Software License",
-        "Programming Language :: Python",
-        "Programming Language :: Python :: 3.8",
-        "Programming Language :: Python :: 3.9",
-        "Programming Language :: Python :: 3.10",
-    ],
-    # Include the separately-compiled shared library
-    extras_require={"test": ["pytest"]},
     packages=find_packages(include=["rmm", "rmm.*"]),
-    include_package_data=True,
-    python_requires=">=3.8",
-    package_data={
-        # Note: A dict comprehension with an explicit copy is necessary (rather
-        # than something simpler like a dict.fromkeys) because otherwise every
-        # package will refer to the same list and skbuild modifies it in place.
-        key: ["*.hpp", "*.pxd"]
-        for key in find_packages(
-            include=["rmm._lib", "rmm._lib.includes", "rmm._cuda*"]
-        )
-    },
-    install_requires=[
-        "cuda-python>=11.7.1,<12.0",
-        "numpy>=1.19",
-        "numba>=0.49",
-    ],
-    zip_safe=False,
 )