Skip to content

Commit 1201c79

Browse files
committed
Address migration review: simplify configuration and tooling
Signed-off-by: Ralf W. Grosse-Kunstleve <rgrossekunst@nvidia.com>
1 parent 3121b19 commit 1201c79

8 files changed

Lines changed: 18 additions & 33 deletions

File tree

‎.github/workflows/ci-pixi-source-test.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ jobs:
109109
if: ${{ matrix.cuda-env == 'cu12' }}
110110
uses: ./.github/actions/setup-hardened-python
111111
with:
112-
python-version: "3.12"
112+
python-version: "3.11"
113113

114114
- name: Bootstrap maintenance SCM in this disposable checkout
115115
if: ${{ matrix.cuda-env == 'cu12' }}
@@ -265,7 +265,7 @@ jobs:
265265
if: ${{ matrix.cuda-env == 'cu12' }}
266266
uses: ./.github/actions/setup-hardened-python
267267
with:
268-
python-version: "3.12"
268+
python-version: "3.11"
269269

270270
- name: Bootstrap maintenance SCM in this disposable checkout
271271
if: ${{ matrix.cuda-env == 'cu12' }}

‎AGENTS.md‎

Lines changed: 4 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -59,20 +59,10 @@ For each package tag namespace and target release `X.Y.Z`:
5959
existing history.
6060
- Treat pushed tags as immutable. Correct an unsuitable tagged state with a
6161
new versioned milestone rather than moving or replacing the existing tag.
62-
- Reserve a new preview target from the next globally unused release number,
63-
checking canonical tags and coordinating releases on every maintenance or
64-
stabilization branch. A release on another branch consumes that number even
65-
when its tag is not reachable from `main`. Update `scm-bootstrap-release`
66-
before another build if such a release consumes its target; do not bump the
67-
field per PR or use it to override suitable reachable tags.
68-
- Moving a package's SCM selector to a new toolkit minor also needs a matching
69-
reachable milestone. Updating the selector alone can produce an incorrect
70-
placeholder version. Validate previews with local tags in an independent
71-
disposable clone until the release history supplies the right milestone.
72-
- For a newly integrated maintenance root, create its first retained internal
73-
milestone only after the integration group has landed and been validated on
74-
`main`. Retained tag creation requires an explicit maintainer decision;
75-
preparation of a PR stack does not authorize creating or pushing it.
62+
- Before setting or changing `scm-bootstrap-release`, check canonical tags
63+
and coordinate with release maintainers. Use an unused release number,
64+
including releases tagged on other branches; keep the same target across
65+
builds until release coordination requires a change.
7666

7767
Use the package's established tag namespace, such as `vX.Y.Z...` for
7868
`cuda-bindings` and `cuda-python`, `cuda-core-vX.Y.Z...` for `cuda-core`, and

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ The list of available interfaces is:
5151
## Bindings source roots
5252

5353
Current CUDA 13 bindings live in [`cuda_bindings_13/`](cuda_bindings_13/), and
54-
CUDA 12.9 sources have a separate
54+
CUDA 12 bindings sources have a separate
5555
[developer environment](cuda_bindings_12/README.md). Both roots build the same
5656
`cuda-bindings` distribution and `cuda.bindings` namespace; develop and test
5757
them in separate environments.

‎ci/pyproject.toml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ requires-python = ">=3.11"
1515
dependencies = [
1616
"packaging==26.0",
1717
"PyYAML==6.0.3",
18-
"setuptools-scm>=8,!=10.1",
18+
"setuptools-scm[simple]>=8,!=10.1",
1919
]
2020

2121
[project.optional-dependencies]

‎cuda_bindings_12/README.md‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,8 @@ pixi run --manifest-path cuda_bindings_12 -e cu12 test
2323

2424
This builds bindings and Cython test extensions from source, then runs the
2525
GPU test suite. `pixi run -e cu12 test-bindings` selects the same package.
26-
For an existing Python environment with CUDA 12.9 headers and a compiler:
26+
For an existing Python environment with CUDA 12.9 headers, a compiler,
27+
and pip 25.1 or newer:
2728

2829
```console
2930
cd cuda_bindings_12
@@ -35,7 +36,7 @@ python -m pytest tests/ tests/cython/
3536
Use `build_tests.bat` on Windows. Free-threaded Python also needs the
3637
`test-ft` dependency group.
3738

38-
Versions follow reachable `v12.9.*` tags through standard `setuptools-scm`.
39+
Versions follow reachable `v12.*` tags through standard `setuptools-scm`.
3940
Before a retained milestone exists for the reserved preview release, CI uses
4041
`ci.tools.bindings_scm_version` in its disposable checkout to create one
4142
local ancestor tag. Never run that helper in a shared development repository
@@ -45,7 +46,8 @@ or push its synthetic tags. See the repository's
4546

4647
## Testing
4748

48-
Testing dependencies can be installed using the `[test]` optional dependency identifier. For example, `pip install -v -e .[test]`.
49+
Install the package and its `test` dependency group with
50+
`python -m pip install -v -e . --group test` (pip 25.1 or newer).
4951

5052
Multiple testing options are available:
5153

‎cuda_bindings_12/docs/source/release/12.X.Y-notes.rst‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55

66
.. module:: cuda.bindings
77

8-
``cuda-bindings`` Upcoming CUDA 12 Release Notes
9-
================================================
8+
``cuda-bindings`` 12.X.Y Release notes
9+
======================================
1010

1111
Unreleased
1212

‎cuda_bindings_12/pyproject.toml‎

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -47,14 +47,6 @@ all = [
4747
"nvidia-cufile-cu12; sys_platform == 'linux'",
4848
]
4949

50-
test = [
51-
"cython>=3.2.5,<3.3",
52-
"setuptools>=80.0.0",
53-
"numpy>=1.21.1",
54-
"pytest==9.1.0",
55-
"pytest-benchmark>=3.4.1",
56-
"pyglet>=2.1.9"
57-
]
5850

5951
[dependency-groups]
6052
# Keep build in sync with build-system.requires.
@@ -151,7 +143,7 @@ exclude = ["cuda/bindings/_version.py"]
151143
[tool.setuptools_scm]
152144
root = ".."
153145
version_file = "cuda/bindings/_version.py"
154-
git_describe_command = ["git", "describe", "--dirty", "--tags", "--long", "--match", "v12.9.*"]
146+
git_describe_command = ["git", "describe", "--dirty", "--tags", "--long", "--match", "v12.*"]
155147

156148
[tool.cuda-python]
157149
scm-bootstrap-release = "12.9.11"

‎cuda_bindings_13/README.md‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,8 @@ Debuggable builds are not supported on Windows.
2020

2121
## Testing
2222

23-
Testing dependencies can be installed using the `[test]` optional dependency identifier. For example, `pip install -v -e .[test]`.
23+
With pip 25.1 or newer, install testing dependencies using the `test`
24+
dependency group: `python -m pip install -v -e . --group test`.
2425

2526
Multiple testing options are available:
2627

0 commit comments

Comments
 (0)