diff --git a/conda/environments/rmm_dev_cuda10.1.yml b/conda/environments/rmm_dev_cuda10.1.yml index fc8be856e..be0bbbccf 100644 --- a/conda/environments/rmm_dev_cuda10.1.yml +++ b/conda/environments/rmm_dev_cuda10.1.yml @@ -10,7 +10,7 @@ dependencies: - flake8=3.8.3 - black=19.10 - isort=5.0.7 -- python>=3.6,<3.8 +- python>=3.7,<3.9 - numba>=0.49 - numpy - cffi>=1.10.0 diff --git a/conda/environments/rmm_dev_cuda10.2.yml b/conda/environments/rmm_dev_cuda10.2.yml index 6bf142338..42c5e3273 100644 --- a/conda/environments/rmm_dev_cuda10.2.yml +++ b/conda/environments/rmm_dev_cuda10.2.yml @@ -10,7 +10,7 @@ dependencies: - flake8=3.8.3 - black=19.10 - isort=5.0.7 -- python>=3.6,<3.8 +- python>=3.7,<3.9 - numba>=0.49 - numpy - cffi>=1.10.0 diff --git a/conda/environments/rmm_dev_cuda11.0.yml b/conda/environments/rmm_dev_cuda11.0.yml index ef2d5b6c7..8a37c5b96 100644 --- a/conda/environments/rmm_dev_cuda11.0.yml +++ b/conda/environments/rmm_dev_cuda11.0.yml @@ -10,7 +10,7 @@ dependencies: - flake8=3.8.3 - black=19.10 - isort=5.0.7 -- python>=3.6,<3.8 +- python>=3.7,<3.9 - numba>=0.49 - numpy - cffi>=1.10.0 diff --git a/python/dev_requirements.txt b/python/dev_requirements.txt new file mode 100644 index 000000000..675ba0538 --- /dev/null +++ b/python/dev_requirements.txt @@ -0,0 +1,14 @@ +# Copyright (c) 2021, NVIDIA CORPORATION. + +clang==8.0.1 +flake8==3.8.3 +black==19.10b0 +isort==5.0.7 +cmake-format==0.6.11 +numpy +numba>=0.49 +pytest +pytest-xdist +cython>=0.29,<0.30 +wheel +setuptools \ No newline at end of file diff --git a/pyproject.toml b/python/pyproject.toml similarity index 64% rename from pyproject.toml rename to python/pyproject.toml index 89dc1cb22..f10a40c81 100644 --- a/pyproject.toml +++ b/python/pyproject.toml @@ -1,3 +1,13 @@ +# Copyright (c) 2021, NVIDIA CORPORATION. + +[build-system] + +requires = [ + "wheel", + "setuptools", + "Cython>=0.29,<0.30", +] + [tool.black] line-length = 79 target-version = ["py36"] diff --git a/python/rmm/tests/__init__.py b/python/rmm/tests/__init__.py deleted file mode 100644 index e69de29bb..000000000 diff --git a/python/setup.cfg b/python/setup.cfg index 8dd6b9b5a..e3834bdf2 100644 --- a/python/setup.cfg +++ b/python/setup.cfg @@ -1,9 +1,10 @@ -# Copyright (c) 2018, NVIDIA CORPORATION. +# Copyright (c) 2018-2021, NVIDIA CORPORATION. # See the docstring in versioneer.py for instructions. Note that you must # re-run 'versioneer.py setup' after changing this section, and commit the # resulting files. + [versioneer] VCS = git style = pep440 @@ -48,3 +49,11 @@ skip= build dist __init__.py + + +[options] +packages = find: +install_requires = + numpy + numba>=0.49 +python_requires = >=3.7,<3.9 diff --git a/python/setup.py b/python/setup.py index 7de5e0513..e9f5b671e 100644 --- a/python/setup.py +++ b/python/setup.py @@ -201,11 +201,12 @@ def get_cuda_version_from_header(cuda_include_dir): "Topic :: Scientific/Engineering", "License :: OSI Approved :: Apache Software License", "Programming Language :: Python", - "Programming Language :: Python :: 3.6", "Programming Language :: Python :: 3.7", + "Programming Language :: Python :: 3.8", ], # Include the separately-compiled shared library - setup_requires=["cython"], + setup_requires=["Cython>=0.29,<0.30"], + extras_requires={"test": ["pytest", "pytest-xdist"]}, ext_modules=extensions, packages=find_packages(include=["rmm", "rmm.*"]), package_data=dict.fromkeys(