From de8059cb5bd1bfef516c29e3f6914d0b4ea54d22 Mon Sep 17 00:00:00 2001 From: galipremsagar Date: Tue, 30 Mar 2021 18:26:37 -0700 Subject: [PATCH 1/9] add requirements for rmm --- python/dev_requirements.txt | 5 +++++ python/pyproject.toml | 11 +++++++++++ python/rmm/tests/__init__.py | 0 python/setup.cfg | 10 +++++++++- python/setup.py | 2 +- python/test_requirements.txt | 4 ++++ 6 files changed, 30 insertions(+), 2 deletions(-) create mode 100644 python/dev_requirements.txt create mode 100644 python/pyproject.toml delete mode 100644 python/rmm/tests/__init__.py create mode 100644 python/test_requirements.txt diff --git a/python/dev_requirements.txt b/python/dev_requirements.txt new file mode 100644 index 000000000..5eb623911 --- /dev/null +++ b/python/dev_requirements.txt @@ -0,0 +1,5 @@ +clang==8.0.1 +flake8==3.8.3 +black==19.10b0 +isort==5.0.7 +cmake-format==0.6.11 \ No newline at end of file diff --git a/python/pyproject.toml b/python/pyproject.toml new file mode 100644 index 000000000..12e843e2a --- /dev/null +++ b/python/pyproject.toml @@ -0,0 +1,11 @@ +# Copyright (c) 2021, NVIDIA CORPORATION. + +[build-system] + +requires = [ + "wheel", + "setuptools", + "numba>=0.49", + "Cython>=0.29,<0.30", + "numpy", +] 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..d4fdcec5d 100644 --- a/python/setup.cfg +++ b/python/setup.cfg @@ -1,4 +1,4 @@ -# 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 @@ -48,3 +48,11 @@ skip= build dist __init__.py + +[options] +packages = find: +install_requires = + numpy + numba>=0.49 +python_requires = >=3.6 + diff --git a/python/setup.py b/python/setup.py index 7de5e0513..4bb9513cb 100644 --- a/python/setup.py +++ b/python/setup.py @@ -205,7 +205,7 @@ def get_cuda_version_from_header(cuda_include_dir): "Programming Language :: Python :: 3.7", ], # Include the separately-compiled shared library - setup_requires=["cython"], + setup_requires=["Cython>=0.29,<0.30"], ext_modules=extensions, packages=find_packages(include=["rmm", "rmm.*"]), package_data=dict.fromkeys( diff --git a/python/test_requirements.txt b/python/test_requirements.txt new file mode 100644 index 000000000..dd5b3fdad --- /dev/null +++ b/python/test_requirements.txt @@ -0,0 +1,4 @@ +# Copyright (c) 2021, NVIDIA CORPORATION. + +pytest +pytest-xdist \ No newline at end of file From 43e762db2c4bf516cf71256d8c503cc2088d12bd Mon Sep 17 00:00:00 2001 From: galipremsagar Date: Tue, 30 Mar 2021 18:28:32 -0700 Subject: [PATCH 2/9] copyright --- python/dev_requirements.txt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/python/dev_requirements.txt b/python/dev_requirements.txt index 5eb623911..e696ff5ca 100644 --- a/python/dev_requirements.txt +++ b/python/dev_requirements.txt @@ -1,3 +1,5 @@ +# Copyright (c) 2021, NVIDIA CORPORATION. + clang==8.0.1 flake8==3.8.3 black==19.10b0 From 764990a97f9b62b38953c87766ceb5620d2f84ee Mon Sep 17 00:00:00 2001 From: galipremsagar Date: Tue, 30 Mar 2021 18:46:06 -0700 Subject: [PATCH 3/9] remove root level pyproject.toml --- pyproject.toml | 19 ------------------- python/pyproject.toml | 20 ++++++++++++++++++++ python/setup.cfg | 3 ++- 3 files changed, 22 insertions(+), 20 deletions(-) delete mode 100644 pyproject.toml diff --git a/pyproject.toml b/pyproject.toml deleted file mode 100644 index 89dc1cb22..000000000 --- a/pyproject.toml +++ /dev/null @@ -1,19 +0,0 @@ -[tool.black] -line-length = 79 -target-version = ["py36"] -include = '\.py?$' -exclude = ''' -/( - thirdparty | - \.eggs | - \.git | - \.hg | - \.mypy_cache | - \.tox | - \.venv | - _build | - buck-out | - build | - dist -)/ -''' diff --git a/python/pyproject.toml b/python/pyproject.toml index 12e843e2a..b41ff2669 100644 --- a/python/pyproject.toml +++ b/python/pyproject.toml @@ -9,3 +9,23 @@ requires = [ "Cython>=0.29,<0.30", "numpy", ] + +[tool.black] +line-length = 79 +target-version = ["py36"] +include = '\.py?$' +exclude = ''' +/( + thirdparty | + \.eggs | + \.git | + \.hg | + \.mypy_cache | + \.tox | + \.venv | + _build | + buck-out | + build | + dist +)/ +''' \ No newline at end of file diff --git a/python/setup.cfg b/python/setup.cfg index d4fdcec5d..43f540e38 100644 --- a/python/setup.cfg +++ b/python/setup.cfg @@ -4,6 +4,7 @@ # re-run 'versioneer.py setup' after changing this section, and commit the # resulting files. + [versioneer] VCS = git style = pep440 @@ -49,10 +50,10 @@ skip= dist __init__.py + [options] packages = find: install_requires = numpy numba>=0.49 python_requires = >=3.6 - From ccabbae76be32b28c2e2c6f2633b298595afbd8a Mon Sep 17 00:00:00 2001 From: galipremsagar Date: Tue, 30 Mar 2021 18:47:33 -0700 Subject: [PATCH 4/9] newline --- python/pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/python/pyproject.toml b/python/pyproject.toml index b41ff2669..6fbb06498 100644 --- a/python/pyproject.toml +++ b/python/pyproject.toml @@ -28,4 +28,4 @@ exclude = ''' build | dist )/ -''' \ No newline at end of file +''' From 9b560c83bfd93baf20d5f00aa74abe01612204b4 Mon Sep 17 00:00:00 2001 From: galipremsagar Date: Tue, 30 Mar 2021 20:16:10 -0700 Subject: [PATCH 5/9] add extra_requires --- python/setup.cfg | 1 + python/setup.py | 1 + python/test_requirements.txt | 4 ---- 3 files changed, 2 insertions(+), 4 deletions(-) delete mode 100644 python/test_requirements.txt diff --git a/python/setup.cfg b/python/setup.cfg index 43f540e38..7912a8170 100644 --- a/python/setup.cfg +++ b/python/setup.cfg @@ -56,4 +56,5 @@ packages = find: install_requires = numpy numba>=0.49 + Cython>=0.29,<0.30 python_requires = >=3.6 diff --git a/python/setup.py b/python/setup.py index 4bb9513cb..64c724d1e 100644 --- a/python/setup.py +++ b/python/setup.py @@ -206,6 +206,7 @@ def get_cuda_version_from_header(cuda_include_dir): ], # Include the separately-compiled shared library setup_requires=["Cython>=0.29,<0.30"], + extra_requires=["pytest", "pytest-xdist"], ext_modules=extensions, packages=find_packages(include=["rmm", "rmm.*"]), package_data=dict.fromkeys( diff --git a/python/test_requirements.txt b/python/test_requirements.txt deleted file mode 100644 index dd5b3fdad..000000000 --- a/python/test_requirements.txt +++ /dev/null @@ -1,4 +0,0 @@ -# Copyright (c) 2021, NVIDIA CORPORATION. - -pytest -pytest-xdist \ No newline at end of file From 129aa7eff9679dd9be404efa58153b0f294066c7 Mon Sep 17 00:00:00 2001 From: galipremsagar Date: Wed, 31 Mar 2021 07:21:58 -0700 Subject: [PATCH 6/9] fix extras_require --- python/setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/python/setup.py b/python/setup.py index 64c724d1e..152c0b6d0 100644 --- a/python/setup.py +++ b/python/setup.py @@ -206,7 +206,7 @@ def get_cuda_version_from_header(cuda_include_dir): ], # Include the separately-compiled shared library setup_requires=["Cython>=0.29,<0.30"], - extra_requires=["pytest", "pytest-xdist"], + extras_requires={"test": ["pytest", "pytest-xdist"]}, ext_modules=extensions, packages=find_packages(include=["rmm", "rmm.*"]), package_data=dict.fromkeys( From 5537b85b955e90236f872aee3cdfbf37e334e3e1 Mon Sep 17 00:00:00 2001 From: galipremsagar Date: Wed, 31 Mar 2021 09:04:19 -0700 Subject: [PATCH 7/9] address reviews --- python/pyproject.toml | 2 -- python/setup.cfg | 3 +-- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/python/pyproject.toml b/python/pyproject.toml index 6fbb06498..f10a40c81 100644 --- a/python/pyproject.toml +++ b/python/pyproject.toml @@ -5,9 +5,7 @@ requires = [ "wheel", "setuptools", - "numba>=0.49", "Cython>=0.29,<0.30", - "numpy", ] [tool.black] diff --git a/python/setup.cfg b/python/setup.cfg index 7912a8170..be9d3b3f9 100644 --- a/python/setup.cfg +++ b/python/setup.cfg @@ -56,5 +56,4 @@ packages = find: install_requires = numpy numba>=0.49 - Cython>=0.29,<0.30 -python_requires = >=3.6 +python_requires = >=3.6,<3.8 From f8e9050d7e12b75c816c494bf0ea4d94482f7fdb Mon Sep 17 00:00:00 2001 From: galipremsagar Date: Wed, 31 Mar 2021 09:22:12 -0700 Subject: [PATCH 8/9] correct the python pinnings --- conda/environments/rmm_dev_cuda10.1.yml | 2 +- conda/environments/rmm_dev_cuda10.2.yml | 2 +- conda/environments/rmm_dev_cuda11.0.yml | 2 +- python/setup.cfg | 2 +- python/setup.py | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) 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/setup.cfg b/python/setup.cfg index be9d3b3f9..e3834bdf2 100644 --- a/python/setup.cfg +++ b/python/setup.cfg @@ -56,4 +56,4 @@ packages = find: install_requires = numpy numba>=0.49 -python_requires = >=3.6,<3.8 +python_requires = >=3.7,<3.9 diff --git a/python/setup.py b/python/setup.py index 152c0b6d0..e9f5b671e 100644 --- a/python/setup.py +++ b/python/setup.py @@ -201,8 +201,8 @@ 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>=0.29,<0.30"], From e0e4bddd47c8a01e1d32222afc6a358cc0d8d2dd Mon Sep 17 00:00:00 2001 From: galipremsagar Date: Wed, 31 Mar 2021 09:26:15 -0700 Subject: [PATCH 9/9] dev --- python/dev_requirements.txt | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/python/dev_requirements.txt b/python/dev_requirements.txt index e696ff5ca..675ba0538 100644 --- a/python/dev_requirements.txt +++ b/python/dev_requirements.txt @@ -4,4 +4,11 @@ clang==8.0.1 flake8==3.8.3 black==19.10b0 isort==5.0.7 -cmake-format==0.6.11 \ No newline at end of file +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