Skip to content

Commit 189e5c5

Browse files
authored
fix conda uploads, use more rapids-dependency-file-generator (#101)
Follow-up to #99 Fixes the failing conda builds: > The workflow is not valid. .github/workflows/build.yaml (Line: 18, Col: 13): Job 'conda-python-build' depends on unknown job 'checks'. .github/workflows/build.yaml (Line: 25, Col: 13): Job 'upload-conda' depends on job 'conda-python-build' which creates a cycle in the dependency graph. ([build link](https://github.com/rapidsai/rapids-cli/actions/runs/15326288414)) Adds more use of `rapids-dependency-file-generator` for managing dependencies. Also bumps the version to 0.1.2, to pick up the slight change to wheel metadata (`importlib-metadata`, not `importlib_metadata`: https://pypi.org/project/importlib-metadata/) Authors: - James Lamb (https://github.com/jameslamb) Approvers: - Naty Clementi (https://github.com/ncclementi) URL: #101
1 parent 4a846b9 commit 189e5c5

4 files changed

Lines changed: 35 additions & 5 deletions

File tree

.github/workflows/build.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@ concurrency:
1515

1616
jobs:
1717
conda-python-build:
18-
needs: [checks]
1918
secrets: inherit
2019
uses: rapidsai/shared-workflows/.github/workflows/conda-python-build.yaml@branch-25.08
2120
with:

VERSION

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
0.1.1
1+
0.1.2

dependencies.yaml

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,20 @@
11
# Dependency list for https://github.com/rapidsai/dependency-file-generator
22
files:
3+
py_run_rapids_cli:
4+
output: pyproject
5+
pyproject_dir: .
6+
extras:
7+
table: project
8+
includes:
9+
- run_python
10+
py_test_rapids_cli:
11+
output: pyproject
12+
pyproject_dir: .
13+
extras:
14+
table: project.optional-dependencies
15+
key: test
16+
includes:
17+
- test_python
318
test_python:
419
output: none
520
includes:
@@ -39,6 +54,22 @@ dependencies:
3954
- matrix:
4055
packages:
4156
- python>=3.10,<3.14
57+
run_python:
58+
common:
59+
- output_types: [conda, requirements, pyproject]
60+
packages:
61+
- nvidia-ml-py>=12.0
62+
- packaging
63+
- psutil
64+
- rich
65+
- rich-click
66+
- output_types: [conda]
67+
packages:
68+
- importlib-metadata >=4.13.0
69+
# "python_version" specifier is a 'pip'-specific thing, so this needs its own group
70+
- output_types: [pyproject, requirements]
71+
packages:
72+
- importlib-metadata >= 4.13.0; python_version < '3.12'
4273
test_python:
4374
common:
4475
- output_types: [conda, requirements, pyproject]

pyproject.toml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,18 +13,18 @@ license = "Apache-2.0"
1313
license-files = ["LICENSE"]
1414
requires-python = ">=3.10"
1515
dependencies = [
16-
"importlib_metadata >= 4.13.0; python_version < '3.12' ",
16+
"importlib-metadata >= 4.13.0; python_version < '3.12'",
1717
"nvidia-ml-py>=12.0",
1818
"packaging",
1919
"psutil",
2020
"rich",
2121
"rich-click",
22-
]
22+
] # This list was generated by `rapids-dependency-file-generator`. To make changes, edit dependencies.yaml and run `rapids-dependency-file-generator`.
2323

2424
[project.optional-dependencies]
2525
test = [
2626
"pytest",
27-
]
27+
] # This list was generated by `rapids-dependency-file-generator`. To make changes, edit dependencies.yaml and run `rapids-dependency-file-generator`.
2828

2929
[project.scripts]
3030
rapids = "rapids_cli.cli:rapids"

0 commit comments

Comments
 (0)