Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Generate pyproject.toml dependencies using dfg #1219

Merged
merged 11 commits into from
Mar 21, 2023
Merged

Generate pyproject.toml dependencies using dfg #1219

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
b5e6c50
First pass of generating pyproject.toml dependencies using dfg.
vyasr Feb 23, 2023
76f7415
Fix cuda-python and setuptools dependencies.
vyasr Feb 23, 2023
863ae94
Use the new approach for output-specific optional information.
vyasr Feb 28, 2023
57c7193
Rework names of new keys.
vyasr Feb 28, 2023
1276f2b
Update hook.
vyasr Mar 8, 2023
e668179
Remove now invalid keys.
vyasr Mar 8, 2023
baec011
Merge branch 'branch-23.04' into feat/pyproject_dependencies_yaml
vyasr Mar 9, 2023
5e9c374
Remove cuda-python section in favor a simple YAML alias for duplication.
vyasr Mar 15, 2023
20836c7
Merge remote-tracking branch 'origin/branch-23.04' into feat/pyprojec…
vyasr Mar 15, 2023
b12c778
Merge cov requirements.
vyasr Mar 15, 2023
cd1fe0e
Merge remote-tracking branch 'origin/branch-23.04' into feat/pyprojec…
vyasr Mar 21, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .pre-commit-config.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ repos:
- id: trailing-whitespace
- id: end-of-file-fixer
- repo: https://github.com/rapidsai/dependency-file-generator
rev: v1.4.0
rev: v1.5.1
hooks:
- id: rapids-dependency-file-generator
args: ["--clean"]
Expand Down
34 changes: 29 additions & 5 deletions dependencies.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,25 +34,48 @@ files:
- cudatoolkit
- docs
- py_version
py_build:
output: pyproject
extras:
table: build-system
includes:
- build
py_run:
output: pyproject
extras:
table: project
includes:
- run
py_optional_test:
output: pyproject
extras:
table: project.optional-dependencies
key: test
includes:
- test_python
channels:
- rapidsai
- conda-forge
dependencies:
build:
common:
- output_types: [conda, requirements]
- output_types: [conda, requirements, pyproject]
packages:
- &cmake_ver cmake>=3.23.1,!=3.25.0
- cuda-python>=11.7.1,<12.0
- &cuda_python cuda-python>=11.7.1,<12.0
- cython>=0.29,<0.30
- ninja
- python>=3.8,<3.11
- scikit-build>=0.13.1
- tomli
- output_types: conda
packages:
- fmt>=9.1.0,<10
- spdlog>=1.11.0,<1.12
- python>=3.8,<3.11
- output_types: pyproject
packages:
jakirkham marked this conversation as resolved.
Show resolved Hide resolved
- wheel
- setuptools>=61.0.0
checks:
common:
- output_types: [conda, requirements]
Expand Down Expand Up @@ -118,18 +141,19 @@ dependencies:
- python=3.10
run:
common:
- output_types: [conda, requirements]
- output_types: [conda, requirements, pyproject]
packages:
- numba>=0.49
- numpy>=1.19
- *cuda_python
test_cpp:
common:
- output_types: conda
packages:
- *cmake_ver
test_python:
common:
- output_types: [conda, requirements]
- output_types: [conda, requirements, pyproject]
packages:
- pytest
vyasr marked this conversation as resolved.
Show resolved Hide resolved
- pytest-cov
22 changes: 11 additions & 11 deletions python/pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,15 +15,15 @@
[build-system]
build-backend = "setuptools.build_meta"
requires = [
"wheel",
"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",
vyasr marked this conversation as resolved.
Show resolved Hide resolved
"tomli; python_version < '3.11'",
]
"cython>=0.29,<0.30",
"ninja",
"scikit-build>=0.13.1",
"setuptools>=61.0.0",
"tomli",
vyasr marked this conversation as resolved.
Show resolved Hide resolved
"wheel",
] # This list was generated by `rapids-dependency-file-generator`. To make changes, edit ../dependencies.yaml and run `rapids-dependency-file-generator`.

[project]
name = "rmm"
Expand All @@ -37,9 +37,9 @@ license = { text = "Apache 2.0" }
requires-python = ">=3.8"
dependencies = [
"cuda-python>=11.7.1,<12.0",
"numpy>=1.19",
"numba>=0.49",
]
"numpy>=1.19",
] # This list was generated by `rapids-dependency-file-generator`. To make changes, edit ../dependencies.yaml and run `rapids-dependency-file-generator`.
classifiers = [
"Intended Audience :: Developers",
"Topic :: Database",
Expand All @@ -53,8 +53,8 @@ classifiers = [
[project.optional-dependencies]
test = [
"pytest",
"pytest-xdist",
jakirkham marked this conversation as resolved.
Show resolved Hide resolved
]
"pytest-cov",
] # This list was generated by `rapids-dependency-file-generator`. To make changes, edit ../dependencies.yaml and run `rapids-dependency-file-generator`.

[project.urls]
Homepage = "https://github.com/rapidsai/rmm"
Expand Down