-
Notifications
You must be signed in to change notification settings - Fork 47
refactored update-version.sh to handle new branching strategy #548
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.
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
refactored update-version.sh to handle new branching strategy #548
Conversation
|
Auto-sync is disabled for draft pull requests in this repository. Workflows must be run manually. Contributors can view more details about this message here. |
|
command: ./ci/release/update-version.sh --run-context=main 0.48.00
Using run-context from CLI: main
Next tag is 26.2
Preparing development branch update => 0.48.00 (targeting main branch)17 files changed
git status
On branch ops-4339-update-version-sh-support-main-branching-strategy
Your branch is up to date with 'origin/ops-4339-update-version-sh-support-main-branching-strategy'.
Changes not staged for commit:
(use "git add <file>..." to update what will be committed)
(use "git restore <file>..." to discard changes in working directory)
modified: .devcontainer/cuda12.9-conda/devcontainer.json
modified: .devcontainer/cuda12.9-pip/devcontainer.json
modified: .devcontainer/cuda13.0-conda/devcontainer.json
modified: .devcontainer/cuda13.0-pip/devcontainer.json
modified: .github/workflows/build.yaml
modified: .github/workflows/pr.yaml
modified: RAPIDS_VERSION
modified: VERSION
modified: conda/environments/all_cuda-129_arch-aarch64.yaml
modified: conda/environments/all_cuda-129_arch-x86_64.yaml
modified: conda/environments/all_cuda-130_arch-aarch64.yaml
modified: conda/environments/all_cuda-130_arch-x86_64.yaml
modified: conda/recipes/ucxx/conda_build_config.yaml
modified: dependencies.yaml
modified: python/distributed-ucxx/pyproject.toml
modified: python/libucxx/pyproject.toml
modified: python/ucxx/pyproject.tomldiff for just
git diff | grep 0.48
+0.48.00
+ - distributed-ucxx==0.48.*,>=0.0.0a0
+ - &libucxx_unsuffixed libucxx==0.48.*,>=0.0.0a0
+ - libucxx-cu12==0.48.*,>=0.0.0a0
+ - libucxx-cu13==0.48.*,>=0.0.0a0
+ - libucxx-examples==0.48.*,>=0.0.0a0
+ - libucxx-tests==0.48.*,>=0.0.0a0
+ - &ucxx_unsuffixed ucxx==0.48.*,>=0.0.0a0
+ - ucxx-cu12==0.48.*,>=0.0.0a0
+ - ucxx-cu13==0.48.*,>=0.0.0a0
+ - ucxx-tests==0.48.*,>=0.0.0a0
+ "ucxx==0.48.*,>=0.0.0a0",
+ "libucxx==0.48.*,>=0.0.0a0",
+ "libucxx==0.48.*,>=0.0.0a0",full diff git diff | cat
diff --git a/.devcontainer/cuda12.9-conda/devcontainer.json b/.devcontainer/cuda12.9-conda/devcontainer.json
index 914fc2b..2bb108a 100644
--- a/.devcontainer/cuda12.9-conda/devcontainer.json
+++ b/.devcontainer/cuda12.9-conda/devcontainer.json
@@ -5,19 +5,19 @@
"args": {
"CUDA": "12.9",
"PYTHON_PACKAGE_MANAGER": "conda",
- "BASE": "rapidsai/devcontainers:25.12-cpp-mambaforge"
+ "BASE": "rapidsai/devcontainers:26.02-cpp-mambaforge"
}
},
"runArgs": [
"--rm",
"--name",
- "${localEnv:USER:anon}-rapids-${localWorkspaceFolderBasename}-25.12-cuda12.9-conda",
+ "${localEnv:USER:anon}-rapids-${localWorkspaceFolderBasename}-26.02-cuda12.9-conda",
"--ulimit",
"nofile=500000"
],
"hostRequirements": {"gpu": "optional"},
"features": {
- "ghcr.io/rapidsai/devcontainers/features/rapids-build-utils:25.12": {}
+ "ghcr.io/rapidsai/devcontainers/features/rapids-build-utils:26.2": {}
},
"overrideFeatureInstallOrder": [
"ghcr.io/rapidsai/devcontainers/features/rapids-build-utils"
diff --git a/.devcontainer/cuda12.9-pip/devcontainer.json b/.devcontainer/cuda12.9-pip/devcontainer.json
index abaee29..807f1e1 100644
--- a/.devcontainer/cuda12.9-pip/devcontainer.json
+++ b/.devcontainer/cuda12.9-pip/devcontainer.json
@@ -5,19 +5,19 @@
"args": {
"CUDA": "12.9",
"PYTHON_PACKAGE_MANAGER": "pip",
- "BASE": "rapidsai/devcontainers:25.12-cpp-cuda12.9-ucx1.19.0-openmpi5.0.7"
+ "BASE": "rapidsai/devcontainers:26.02-cpp-cuda12.9-ucx1.19.0-openmpi5.0.7"
}
},
"runArgs": [
"--rm",
"--name",
- "${localEnv:USER:anon}-rapids-${localWorkspaceFolderBasename}-25.12-cuda12.9-pip",
+ "${localEnv:USER:anon}-rapids-${localWorkspaceFolderBasename}-26.02-cuda12.9-pip",
"--ulimit",
"nofile=500000"
],
"hostRequirements": {"gpu": "optional"},
"features": {
- "ghcr.io/rapidsai/devcontainers/features/rapids-build-utils:25.12": {}
+ "ghcr.io/rapidsai/devcontainers/features/rapids-build-utils:26.2": {}
},
"overrideFeatureInstallOrder": [
"ghcr.io/rapidsai/devcontainers/features/rapids-build-utils"
diff --git a/.devcontainer/cuda13.0-conda/devcontainer.json b/.devcontainer/cuda13.0-conda/devcontainer.json
index a477a77..d06e5a3 100644
--- a/.devcontainer/cuda13.0-conda/devcontainer.json
+++ b/.devcontainer/cuda13.0-conda/devcontainer.json
@@ -5,19 +5,19 @@
"args": {
"CUDA": "13.0",
"PYTHON_PACKAGE_MANAGER": "conda",
- "BASE": "rapidsai/devcontainers:25.12-cpp-mambaforge"
+ "BASE": "rapidsai/devcontainers:26.02-cpp-mambaforge"
}
},
"runArgs": [
"--rm",
"--name",
- "${localEnv:USER:anon}-rapids-${localWorkspaceFolderBasename}-25.12-cuda13.0-conda",
+ "${localEnv:USER:anon}-rapids-${localWorkspaceFolderBasename}-26.02-cuda13.0-conda",
"--ulimit",
"nofile=500000"
],
"hostRequirements": {"gpu": "optional"},
"features": {
- "ghcr.io/rapidsai/devcontainers/features/rapids-build-utils:25.12": {}
+ "ghcr.io/rapidsai/devcontainers/features/rapids-build-utils:26.2": {}
},
"overrideFeatureInstallOrder": [
"ghcr.io/rapidsai/devcontainers/features/rapids-build-utils"
diff --git a/.devcontainer/cuda13.0-pip/devcontainer.json b/.devcontainer/cuda13.0-pip/devcontainer.json
index b7b5487..ec25de0 100644
--- a/.devcontainer/cuda13.0-pip/devcontainer.json
+++ b/.devcontainer/cuda13.0-pip/devcontainer.json
@@ -5,19 +5,19 @@
"args": {
"CUDA": "13.0",
"PYTHON_PACKAGE_MANAGER": "pip",
- "BASE": "rapidsai/devcontainers:25.12-cpp-cuda13.0-ucx1.19.0-openmpi5.0.7"
+ "BASE": "rapidsai/devcontainers:26.02-cpp-cuda13.0-ucx1.19.0-openmpi5.0.7"
}
},
"runArgs": [
"--rm",
"--name",
- "${localEnv:USER:anon}-rapids-${localWorkspaceFolderBasename}-25.12-cuda13.0-pip",
+ "${localEnv:USER:anon}-rapids-${localWorkspaceFolderBasename}-26.02-cuda13.0-pip",
"--ulimit",
"nofile=500000"
],
"hostRequirements": {"gpu": "optional"},
"features": {
- "ghcr.io/rapidsai/devcontainers/features/rapids-build-utils:25.12": {}
+ "ghcr.io/rapidsai/devcontainers/features/rapids-build-utils:26.2": {}
},
"overrideFeatureInstallOrder": [
"ghcr.io/rapidsai/devcontainers/features/rapids-build-utils"
diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index 266da24..01fe8fe 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -50,7 +50,7 @@ jobs:
arch: "amd64"
branch: ${{ inputs.branch }}
build_type: ${{ inputs.build_type || 'branch' }}
- container_image: "rapidsai/ci-conda:25.12-latest"
+ container_image: "rapidsai/ci-conda:26.02-latest"
date: ${{ inputs.date }}
node_type: "gpu-l4-latest-1"
script: "ci/build_docs.sh"
diff --git a/.github/workflows/pr.yaml b/.github/workflows/pr.yaml
index e45544d..7d7eb40 100644
--- a/.github/workflows/pr.yaml
+++ b/.github/workflows/pr.yaml
@@ -94,7 +94,7 @@ jobs:
build_type: pull-request
node_type: "gpu-l4-latest-1"
arch: "amd64"
- container_image: "rapidsai/ci-conda:25.12-latest"
+ container_image: "rapidsai/ci-conda:26.02-latest"
script: "ci/build_docs.sh"
conda-cpp-tests:
needs: [conda-cpp-build, changed-files]
diff --git a/RAPIDS_VERSION b/RAPIDS_VERSION
index 7924af6..5c33046 100644
--- a/RAPIDS_VERSION
+++ b/RAPIDS_VERSION
@@ -1 +1 @@
-25.12.00
+26.02.00
diff --git a/VERSION b/VERSION
index 65b5480..3bb402c 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-0.47.00
+0.48.00
diff --git a/conda/environments/all_cuda-129_arch-aarch64.yaml b/conda/environments/all_cuda-129_arch-aarch64.yaml
index 89274ed..c13d2f5 100644
--- a/conda/environments/all_cuda-129_arch-aarch64.yaml
+++ b/conda/environments/all_cuda-129_arch-aarch64.yaml
@@ -13,14 +13,14 @@ dependencies:
- cuda-cudart-dev
- cuda-nvcc
- cuda-version=12.9
-- cudf==25.12.*,>=0.0.0a0
+- cudf==26.2.*,>=0.0.0a0
- cupy>=13.6.0
- cxx-compiler
- cython>=3.0.0,<3.2.0a0
-- dask-cuda==25.12.*,>=0.0.0a0
-- dask-cudf==25.12.*,>=0.0.0a0
+- dask-cuda==26.2.*,>=0.0.0a0
+- dask-cudf==26.2.*,>=0.0.0a0
- doxygen=1.9.1
-- librmm==25.12.*,>=0.0.0a0
+- librmm==26.2.*,>=0.0.0a0
- libtool
- make
- ninja
@@ -37,8 +37,8 @@ dependencies:
- python>=3.10,<3.14
- pyyaml>=6
- rapids-build-backend>=0.4.0,<0.5.0.dev0
-- rapids-dask-dependency==25.12.*,>=0.0.0a0
-- rmm==25.12.*,>=0.0.0a0
+- rapids-dask-dependency==26.2.*,>=0.0.0a0
+- rmm==26.2.*,>=0.0.0a0
- scikit-build-core>=0.10.0
- setuptools>=64.0.0
- sphinx>=8.1.0
diff --git a/conda/environments/all_cuda-129_arch-x86_64.yaml b/conda/environments/all_cuda-129_arch-x86_64.yaml
index 4d56a54..e857a5a 100644
--- a/conda/environments/all_cuda-129_arch-x86_64.yaml
+++ b/conda/environments/all_cuda-129_arch-x86_64.yaml
@@ -13,14 +13,14 @@ dependencies:
- cuda-cudart-dev
- cuda-nvcc
- cuda-version=12.9
-- cudf==25.12.*,>=0.0.0a0
+- cudf==26.2.*,>=0.0.0a0
- cupy>=13.6.0
- cxx-compiler
- cython>=3.0.0,<3.2.0a0
-- dask-cuda==25.12.*,>=0.0.0a0
-- dask-cudf==25.12.*,>=0.0.0a0
+- dask-cuda==26.2.*,>=0.0.0a0
+- dask-cudf==26.2.*,>=0.0.0a0
- doxygen=1.9.1
-- librmm==25.12.*,>=0.0.0a0
+- librmm==26.2.*,>=0.0.0a0
- libtool
- make
- ninja
@@ -37,8 +37,8 @@ dependencies:
- python>=3.10,<3.14
- pyyaml>=6
- rapids-build-backend>=0.4.0,<0.5.0.dev0
-- rapids-dask-dependency==25.12.*,>=0.0.0a0
-- rmm==25.12.*,>=0.0.0a0
+- rapids-dask-dependency==26.2.*,>=0.0.0a0
+- rmm==26.2.*,>=0.0.0a0
- scikit-build-core>=0.10.0
- setuptools>=64.0.0
- sphinx>=8.1.0
diff --git a/conda/environments/all_cuda-130_arch-aarch64.yaml b/conda/environments/all_cuda-130_arch-aarch64.yaml
index 525b2aa..5528cb7 100644
--- a/conda/environments/all_cuda-130_arch-aarch64.yaml
+++ b/conda/environments/all_cuda-130_arch-aarch64.yaml
@@ -13,14 +13,14 @@ dependencies:
- cuda-cudart-dev
- cuda-nvcc
- cuda-version=13.0
-- cudf==25.12.*,>=0.0.0a0
+- cudf==26.2.*,>=0.0.0a0
- cupy>=13.6.0
- cxx-compiler
- cython>=3.0.0,<3.2.0a0
-- dask-cuda==25.12.*,>=0.0.0a0
-- dask-cudf==25.12.*,>=0.0.0a0
+- dask-cuda==26.2.*,>=0.0.0a0
+- dask-cudf==26.2.*,>=0.0.0a0
- doxygen=1.9.1
-- librmm==25.12.*,>=0.0.0a0
+- librmm==26.2.*,>=0.0.0a0
- libtool
- make
- ninja
@@ -37,8 +37,8 @@ dependencies:
- python>=3.10,<3.14
- pyyaml>=6
- rapids-build-backend>=0.4.0,<0.5.0.dev0
-- rapids-dask-dependency==25.12.*,>=0.0.0a0
-- rmm==25.12.*,>=0.0.0a0
+- rapids-dask-dependency==26.2.*,>=0.0.0a0
+- rmm==26.2.*,>=0.0.0a0
- scikit-build-core>=0.10.0
- setuptools>=64.0.0
- sphinx>=8.1.0
diff --git a/conda/environments/all_cuda-130_arch-x86_64.yaml b/conda/environments/all_cuda-130_arch-x86_64.yaml
index 4533732..e16d7a8 100644
--- a/conda/environments/all_cuda-130_arch-x86_64.yaml
+++ b/conda/environments/all_cuda-130_arch-x86_64.yaml
@@ -13,14 +13,14 @@ dependencies:
- cuda-cudart-dev
- cuda-nvcc
- cuda-version=13.0
-- cudf==25.12.*,>=0.0.0a0
+- cudf==26.2.*,>=0.0.0a0
- cupy>=13.6.0
- cxx-compiler
- cython>=3.0.0,<3.2.0a0
-- dask-cuda==25.12.*,>=0.0.0a0
-- dask-cudf==25.12.*,>=0.0.0a0
+- dask-cuda==26.2.*,>=0.0.0a0
+- dask-cudf==26.2.*,>=0.0.0a0
- doxygen=1.9.1
-- librmm==25.12.*,>=0.0.0a0
+- librmm==26.2.*,>=0.0.0a0
- libtool
- make
- ninja
@@ -37,8 +37,8 @@ dependencies:
- python>=3.10,<3.14
- pyyaml>=6
- rapids-build-backend>=0.4.0,<0.5.0.dev0
-- rapids-dask-dependency==25.12.*,>=0.0.0a0
-- rmm==25.12.*,>=0.0.0a0
+- rapids-dask-dependency==26.2.*,>=0.0.0a0
+- rmm==26.2.*,>=0.0.0a0
- scikit-build-core>=0.10.0
- setuptools>=64.0.0
- sphinx>=8.1.0
diff --git a/conda/recipes/ucxx/conda_build_config.yaml b/conda/recipes/ucxx/conda_build_config.yaml
index 90a791b..ef5ddf0 100644
--- a/conda/recipes/ucxx/conda_build_config.yaml
+++ b/conda/recipes/ucxx/conda_build_config.yaml
@@ -33,4 +33,4 @@ gtest:
- ">=1.13.0"
rapids_version:
- - "25.12.*"
+ - "26.2.*"
diff --git a/dependencies.yaml b/dependencies.yaml
index 2fca986..af1c22b 100644
--- a/dependencies.yaml
+++ b/dependencies.yaml
@@ -170,7 +170,7 @@ dependencies:
- c-compiler
- cxx-compiler
- &cmake_ver cmake>=3.26.4,!=3.30.0
- - librmm==25.12.*,>=0.0.0a0
+ - librmm==26.2.*,>=0.0.0a0
- ninja
- output_types: [requirements, pyproject]
packages:
@@ -242,8 +242,8 @@ dependencies:
# These packages are useful for development but not otherwise required to build/run
# RAPIDS
- pip
- - dask-cuda==25.12.*,>=0.0.0a0
- - dask-cudf==25.12.*,>=0.0.0a0
+ - dask-cuda==26.2.*,>=0.0.0a0
+ - dask-cudf==26.2.*,>=0.0.0a0
# UCX Build
- libtool
- automake
@@ -315,7 +315,7 @@ dependencies:
common:
- output_types: [conda, requirements, pyproject]
packages:
- - rapids-dask-dependency==25.12.*,>=0.0.0a0
+ - rapids-dask-dependency==26.2.*,>=0.0.0a0
- pyyaml>=6
- output_types: [conda]
packages:
@@ -344,7 +344,7 @@ dependencies:
- pytest<9.0.0a0
- pytest-asyncio>=1.0.0
- pytest-rerunfailures!=16.0.0 # See https://github.com/pytest-dev/pytest-rerunfailures/issues/302
- - rapids-dask-dependency==25.12.*,>=0.0.0a0
+ - rapids-dask-dependency==26.2.*,>=0.0.0a0
test_python_distributed_ucxx:
common:
- output_types: [conda, requirements, pyproject]
@@ -372,7 +372,7 @@ dependencies:
common:
- output_types: conda
packages:
- - &librmm_unsuffixed librmm==25.12.*,>=0.0.0a0
+ - &librmm_unsuffixed librmm==26.2.*,>=0.0.0a0
- output_types: requirements
packages:
# pip recognizes the index as a global option for the requirements.txt file
@@ -385,18 +385,18 @@ dependencies:
cuda: "12.*"
cuda_suffixed: "true"
packages:
- - librmm-cu12==25.12.*,>=0.0.0a0
+ - librmm-cu12==26.2.*,>=0.0.0a0
- matrix:
cuda: "13.*"
cuda_suffixed: "true"
packages:
- - librmm-cu13==25.12.*,>=0.0.0a0
+ - librmm-cu13==26.2.*,>=0.0.0a0
- {matrix: null, packages: [*librmm_unsuffixed]}
depends_on_rmm:
common:
- output_types: conda
packages:
- - &rmm_unsuffixed rmm==25.12.*,>=0.0.0a0
+ - &rmm_unsuffixed rmm==26.2.*,>=0.0.0a0
- output_types: requirements
packages:
# pip recognizes the index as a global option for the requirements.txt file
@@ -409,18 +409,18 @@ dependencies:
cuda: "12.*"
cuda_suffixed: "true"
packages:
- - rmm-cu12==25.12.*,>=0.0.0a0
+ - rmm-cu12==26.2.*,>=0.0.0a0
- matrix:
cuda: "13.*"
cuda_suffixed: "true"
pack
ages:
- - rmm-cu13==25.12.*,>=0.0.0a0
+ - rmm-cu13==26.2.*,>=0.0.0a0
- {matrix: null, packages: [*rmm_unsuffixed]}
depends_on_cudf:
common:
- output_types: [conda]
packages:
- - &cudf_unsuffixed cudf==25.12.*,>=0.0.0a0
+ - &cudf_unsuffixed cudf==26.2.*,>=0.0.0a0
- output_types: requirements
packages:
# pip recognizes the index as a global option for the requirements.txt file
@@ -433,23 +433,23 @@ dependencies:
cuda: "12.*"
cuda_suffixed: "true"
packages:
- - cudf-cu12==25.12.*,>=0.0.0a0
+ - cudf-cu12==26.2.*,>=0.0.0a0
- matrix:
cuda: "13.*"
cuda_suffixed: "true"
packages:
- - cudf-cu13==25.12.*,>=0.0.0a0
+ - cudf-cu13==26.2.*,>=0.0.0a0
- {matrix: null, packages: [*cudf_unsuffixed]}
depends_on_distributed_ucxx:
common:
- output_types: conda
packages:
- - distributed-ucxx==0.47.*,>=0.0.0a0
+ - distributed-ucxx==0.48.*,>=0.0.0a0
depends_on_libucxx:
common:
- output_types: conda
packages:
- - &libucxx_unsuffixed libucxx==0.47.*,>=0.0.0a0
+ - &libucxx_unsuffixed libucxx==0.48.*,>=0.0.0a0
specific:
- output_types: [requirements, pyproject]
matrices:
@@ -457,12 +457,12 @@ dependencies:
cuda: "12.*"
cuda_suffixed: "true"
packages:
- - libucxx-cu12==0.47.*,>=0.0.0a0
+ - libucxx-cu12==0.48.*,>=0.0.0a0
- matrix:
cuda: "13.*"
cuda_suffixed: "true"
packages:
- - libucxx-cu13==0.47.*,>=0.0.0a0
+ - libucxx-cu13==0.48.*,>=0.0.0a0
- matrix:
packages:
- *libucxx_unsuffixed
@@ -470,17 +470,17 @@ dependencies:
common:
- output_types: conda
packages:
- - libucxx-examples==0.47.*,>=0.0.0a0
+ - libucxx-examples==0.48.*,>=0.0.0a0
depends_on_libucxx_tests:
common:
- output_types: conda
packages:
- - libucxx-tests==0.47.*,>=0.0.0a0
+ - libucxx-tests==0.48.*,>=0.0.0a0
depends_on_ucxx:
common:
- output_types: conda
packages:
- - &ucxx_unsuffixed ucxx==0.47.*,>=0.0.0a0
+ - &ucxx_unsuffixed ucxx==0.48.*,>=0.0.0a0
- output_types: requirements
packages:
# pip recognizes the index as a global option for the requirements.txt file
@@ -493,18 +493,18 @@ dependencies:
cuda: "12.*"
cuda_suffixed: "true"
packages:
- - ucxx-cu12==0.47.*,>=0.0.0a0
+ - ucxx-cu12==0.48.*,>=0.0.0a0
- matrix:
cuda: "13.*"
cuda_suffixed: "true"
packages:
- - ucxx-cu13==0.47.*,>=0.0.0a0
+ - ucxx-cu13==0.48.*,>=0.0.0a0
- {matrix: null, packages: [*ucxx_unsuffixed]}
depends_on_ucxx_tests:
common:
- output_types: conda
packages:
- - ucxx-tests==0.47.*,>=0.0.0a0
+ - ucxx-tests==0.48.*,>=0.0.0a0
depends_on_ucx_build:
common:
- output_types: requirements
diff --git a/python/distributed-ucxx/pyproject.toml b/python/distributed-ucxx/pyproject.toml
index b42cea0..bce9139 100644
--- a/python/distributed-ucxx/pyproject.toml
+++ b/python/distributed-ucxx/pyproject.toml
@@ -21,8 +21,8 @@ requires-python = ">=3.10"
dependencies = [
"numba-cuda[cu13]>=0.19.1,<0.20.0a0",
"pyyaml>=6",
- "rapids-dask-dependency==25.12.*,>=0.0.0a0",
- "ucxx==0.47.*,>=0.0.0a0",
+ "rapids-dask-dependency==26.2.*,>=0.0.0a0",
+ "ucxx==0.48.*,>=0.0.0a0",
] # 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",
@@ -45,7 +45,7 @@ docs = [
"sphinx-rtd-theme>=0.5.1",
]
test = [
- "cudf==25.12.*,>=0.0.0a0",
+ "cudf==26.2.*,>=0.0.0a0",
"cupy-cuda13x>=13.6.0",
"numpy>=1.23,<3.0a0",
"pytest-rerunfailures!=16.0.0",
diff --git a/python/libucxx/pyproject.toml b/python/libucxx/pyproject.toml
index fb63eb5..27ef3ff 100644
--- a/python/libucxx/pyproject.toml
+++ b/python/libucxx/pyproject.toml
@@ -29,7 +29,7 @@ classifiers = [
"Programming Language :: Python :: 3",
]
dependencies = [
- "librmm==25.12.*,>=0.0.0a0",
+ "librmm==26.2.*,>=0.0.0a0",
"libucx>=1.19.0,<1.20",
] # This list was generated by `rapids-dependency-file-generator`. To make changes, edit ../../dependencies.yaml and run `rapids-dependency-file-generator`.
@@ -62,7 +62,7 @@ dependencies-file = "../../dependencies.yaml"
matrix-entry = "cuda_suffixed=true"
requires = [
"cmake>=3.26.4,!=3.30.0",
- "librmm==25.12.*,>=0.0.0a0",
+ "librmm==26.2.*,>=0.0.0a0",
"libucx>=1.19.0,<1.19.1a0",
"ninja",
] # This list was generated by `rapids-dependency-file-generator`. To make changes, edit ../../dependencies.yaml and run `rapids-dependency-file-generator`.
diff --git a/python/ucxx/pyproject.toml b/python/ucxx/pyproject.toml
index 395b4be..f859456 100644
--- a/python/ucxx/pyproject.toml
+++ b/python/ucxx/pyproject.toml
@@ -19,11 +19,11 @@ authors = [
license = { text = "BSD-3-Clause" }
requires-python = ">=3.10"
dependencies = [
- "libucxx==0.47.*,>=0.0.0a0",
+ "libucxx==0.48.*,>=0.0.0a0",
"numba-cuda[cu13]>=0.19.1,<0.20.0a0",
"numpy>=1.23,<3.0a0",
"nvidia-ml-py>=12",
- "rmm==25.12.*,>=0.0.0a0",
+ "rmm==26.2.*,>=0.0.0a0",
] # 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",
@@ -40,12 +40,12 @@ classifiers = [
[project.optional-dependencies]
test = [
"cloudpickle",
- "cudf==25.12.*,>=0.0.0a0",
+ "cudf==26.2.*,>=0.0.0a0",
"cupy-cuda13x>=13.6.0",
"pytest-asyncio>=1.0.0",
"pytest-rerunfailures!=16.0.0",
"pytest<9.0.0a0",
- "rapids-dask-dependency==25.12.*,>=0.0.0a0",
+ "rapids-dask-dependency==26.2.*,>=0.0.0a0",
] # This list was generated by `rapids-dependency-file-generator`. To make changes, edit ../../dependencies.yaml and run `rapids-dependency-file-generator`.
[project.urls]
@@ -58,10 +58,10 @@ matrix-entry = "cuda_suffixed=true"
requires = [
"cmake>=3.26.4,!=3.30.0",
"cython>=3.0.0,<3.2.0a0",
- "librmm==25.12.*,>=0.0.0a0",
- "libucxx==0.47.*,>=0.0.0a0",
+ "librmm==26.2.*,>=0.0.0a0",
+ "libucxx==0.48.*,>=0.0.0a0",
"ninja",
- "rmm==25.12.*,>=0.0.0a0",
+ "rmm==26.2.*,>=0.0.0a0",
] # This list was generated by `rapids-dependency-file-generator`. To make changes, edit ../../dependencies.yaml and run `rapids-dependency-file-generator`.
[tool.scikit-build] |
|
command ./ci/release/update-version.sh --run-context=release 0.47.00
Using run-context from CLI: release
Next tag is 25.12
Preparing release branch update => 0.47.00 (targeting release/25.12 branch)7 files changed git status
On branch ops-4339-update-version-sh-support-main-branching-strategy
Your branch is up to date with 'origin/ops-4339-update-version-sh-support-main-branching-strategy'.
Changes not staged for commit:
(use "git add <file>..." to update what will be committed)
(use "git restore <file>..." to discard changes in working directory)
modified: .github/workflows/build.yaml
modified: .github/workflows/pr.yaml
modified: .github/workflows/test.yaml
modified: .github/workflows/trigger-breaking-change-alert.yaml
modified: RAPIDS_BRANCH
modified: cmake/RAPIDS.cmake
modified: docs/ucxx/source/send_recv.rst--- a/cmake/RAPIDS.cmake
+++ b/cmake/RAPIDS.cmake
@@ -26,7 +26,7 @@ endif()
# Allow users to control which branch is fetched
if(NOT rapids-cmake-branch)
# Define a default branch if the user doesn't set one
- set(rapids-cmake-branch "main")
+ set(rapids-cmake-branch "release/${rapids-cmake-version}")
endif()full diff git diff | cat ✔ base 16:00:59
diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index 266da24..b8f47c6 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -34,7 +34,7 @@ concurrency:
jobs:
conda-cpp-build:
secrets: inherit
- uses: rapidsai/shared-workflows/.github/workflows/conda-cpp-build.yaml@main
+ uses: rapidsai/shared-workflows/.github/workflows/conda-cpp-build.yaml@release/25.12
with:
build_type: ${{ inputs.build_type || 'branch' }}
branch: ${{ inputs.branch }}
@@ -45,7 +45,7 @@ jobs:
if: github.ref_type == 'branch'
needs: conda-cpp-build
secrets: inherit
- uses: rapidsai/shared-workflows/.github/workflows/custom-job.yaml@main
+ uses: rapidsai/shared-workflows/.github/workflows/custom-job.yaml@release/25.12
with:
arch: "amd64"
branch: ${{ inputs.branch }}
@@ -58,7 +58,7 @@ jobs:
upload-conda:
needs: [conda-cpp-build]
secrets: inherit
- uses: rapidsai/shared-workflows/.github/workflows/conda-upload-packages.yaml@main
+ uses: rapidsai/shared-workflows/.github/workflows/conda-upload-packages.yaml@release/25.12
with:
build_type: ${{ inputs.build_type || 'branch' }}
branch: ${{ inputs.branch }}
@@ -66,7 +66,7 @@ jobs:
sha: ${{ inputs.sha }}
wheel-build-libucxx:
secrets: inherit
- uses: rapidsai/shared-workflows/.github/workflows/wheels-build.yaml@main
+ uses: rapidsai/shared-workflows/.github/workflows/wheels-build.yaml@release/25.12
with:
build_type: ${{ inputs.build_type || 'branch' }}
branch: ${{ inputs.branch }}
@@ -80,7 +80,7 @@ jobs:
wheel-publish-libucxx:
needs: wheel-build-libucxx
secrets: inherit
- uses: rapidsai/shared-workflows/.github/workflows/wheels-publish.yaml@main
+ uses: rapidsai/shared-workflows/.github/workflows/wheels-publish.yaml@release/25.12
with:
build_type: ${{ inputs.build_type || 'branch' }}
branch: ${{ inputs.branch }}
@@ -91,7 +91,7 @@ jobs:
wheel-build-ucxx:
needs: wheel-build-libucxx
secrets: inherit
- uses: rapidsai/shared-workflows/.github/workflows/wheels-build.yaml@main
+ uses: rapidsai/shared-workflows/.github/workflows/wheels-build.yaml@release/25.12
with:
build_type: ${{ inputs.build_type || 'branch' }}
branch: ${{ inputs.branch }}
@@ -103,7 +103,7 @@ jobs:
wheel-publish-ucxx:
needs: wheel-build-ucxx
secrets: inherit
- uses: rapidsai/shared-workflows/.github/workflows/wheels-publish.yaml@main
+ uses: rapidsai/shared-workflows/.github/workflows/wheels-publish.yaml@release/25.12
with:
build_type: ${{ inputs.build_type || 'branch' }}
branch: ${{ inputs.branch }}
@@ -113,7 +113,7 @@ jobs:
package-type: python
wheel-build-distributed-ucxx:
secrets: inherit
- uses: rapidsai/shared-workflows/.github/workflows/wheels-build.yaml@main
+ uses: rapidsai/shared-workflows/.github/workflows/wheels-build.yaml@release/25.12
with:
build_type: ${{ inputs.build_type || 'branch' }}
branch: ${{ inputs.branch }}
@@ -125,7 +125,7 @@ jobs:
wheel-publish-distributed-ucxx:
needs: [wheel-build-ucxx, wheel-build-distributed-ucxx]
secrets: inherit
- uses: rapidsai/shared-workflows/.github/workflows/wheels-publish.yaml@main
+ uses: rapidsai/shared-workflows/.github/workflows/wheels-publish.yaml@release/25.12
with:
build_type: ${{ inputs.build_type || 'branch' }}
branch: ${{ inputs.branch }}
diff --git a/.github/workflows/pr.yaml b/.github/workflows/pr.yaml
index e45544d..f8ed249 100644
--- a/.github/workflows/pr.yaml
+++ b/.github/workflows/pr.yaml
@@ -25,7 +25,7 @@ jobs:
- wheel-tests-distributed-ucxx
- telemetry-setup
secrets: inherit
- uses: rapidsai/shared-workflows/.github/workflows/pr-builder.yaml@main
+ uses: rapidsai/shared-workflows/.github/workflows/pr-builder.yaml@release/25.12
if: always()
with:
needs: ${{ toJSON(needs) }}
@@ -52,7 +52,7 @@ jobs:
changed-files:
secrets: inherit
needs: telemetry-setup
- uses: rapidsai/shared-workflows/.github/workflows/changed-files.yaml@main
+ uses: rapidsai/shared-workflows/.github/workflows/changed-files.yaml@release/25.12
with:
files_yaml: |
test_cpp:
@@ -74,7 +74,7 @@ jobs:
- '!docs/**'
checks:
secrets: inherit
- uses: rapidsai/shared-workflows/.github/workflows/checks.yaml@main
+ uses: rapidsai/shared-workflows/.github/workflows/checks.yaml@release/25.12
needs: telemetry-setup
with:
enable_check_generated_files: false
@@ -82,14 +82,14 @@ jobs:
conda-cpp-build:
needs: checks
secrets: inherit
- uses: rapidsai/shared-workflows/.github/workflows/conda-cpp-build.yaml@main
+ uses: rapidsai/shared-workflows/.github/workflows/conda-cpp-build.yaml@release/25.12
with:
build_type: pull-request
script: ci/build_cpp.sh
docs-build:
needs: conda-cpp-build
secrets: inherit
- uses: rapidsai/shared-workflows/.github/workflows/custom-job.yaml@main
+ uses: rapidsai/shared-workflows/.github/workflows/custom-job.yaml@release/25.12
with:
build_type: pull-request
node_type: "gpu-l4-latest-1"
@@ -99,7 +99,7 @@ jobs:
conda-cpp-tests:
needs: [conda-cpp-build, changed-files]
secrets: inherit
- uses: rapidsai/shared-workflows/.github/workflows/conda-cpp-tests.yaml@main
+ uses: rapidsai/shared-workflows/.github/workflows/conda-cpp-tests.yaml@release/25.12
if: fromJSON(needs.changed-files.outputs.changed_file_groups).test_cpp
with:
build_type: pull-request
@@ -108,7 +108,7 @@ jobs:
conda-python-tests:
needs: [conda-cpp-build, changed-files]
secrets: inherit
- uses: rapidsai/shared-workflows/.github/workflows/conda-python-tests.yaml@main
+ uses: rapidsai/shared-workflows/.github/workflows/conda-python-tests.yaml@release/25.12
if: fromJSON(needs.changed-files.outputs.changed_file_groups).test_python
with:
build_type: pull-request
@@ -117,7 +117,7 @@ jobs:
conda-python-distributed-tests:
needs: [conda-cpp-build, changed-files]
secrets: inherit
- uses: rapidsai/shared-workflows/.github/workflows/conda-python-tests.yaml@main
+ uses: rapidsai/shared-workflows/.github/workflows/conda-python-tests.yaml@release/25.12
if: fromJSON(needs.changed-files.outputs.changed_file_groups).test_python
with:
build_type: pull-request
@@ -126,7 +126,7 @@ jobs:
wheel-build-libucxx:
needs: checks
secrets: inherit
- uses: rapidsai/shared-workflows/.github/workflows/wheels-build.yaml@main
+ uses: rapidsai/shared-workflows/.github/workflows/wheels-build.yaml@release/25.12
with:
build_type: pull-request
script: ci/build_wheel_libucxx.sh
@@ -137,7 +137,7 @@ jobs:
wheel-build-ucxx:
needs: wheel-build-libucxx
secrets: inherit
- uses: rapidsai/shared-workflows/.github/workflows/wheels-build.yaml@main
+ uses: rapidsai/shared-workflows/.github/workflows/wheels-build.yaml@release/25.12
with:
build_type: pull-request
script: ci/build_wheel_ucxx.sh
@@ -146,7 +146,7 @@ jobs:
wheel-tests-ucxx:
needs: [wheel-build-ucxx, changed-files]
secrets: inherit
- uses: rapidsai/shared-workflows/.github/workflows/wheels-test.yaml@main
+ uses: rapidsai/shared-workflows/.github/workflows/wheels-test.yaml@release/25.12
if: fromJSON(needs.changed-files.outputs.changed_file_groups).test_python
with:
build_type: pull-request
@@ -155,7 +155,7 @@ jobs:
wheel-build-distributed-ucxx:
needs: checks
secrets: inherit
- uses: rapidsai/shared-workflows/.github/workflows/wheels-build.yaml@main
+ uses: rapidsai/shared-workflows/.github/workflows/wheels-build.yaml@release/25.12
with:
build_type: pull-request
script: ci/build_wheel_distributed_ucxx.sh
@@ -164,7 +164,7 @@ jobs:
wheel-tests-distributed-ucxx:
needs: [wheel-build-ucxx, wheel-build-distributed-ucxx, changed-files]
secrets: inherit
- uses: rapidsai/shared-workflows/.github/workflows/wheels-test.yaml@main
+ uses: rapidsai/shared-workflows/.github/workflows/wheels-test.yaml@release/25.12
if: fromJSON(needs.changed-files.outputs.changed_file_groups).test_python
with:
build_type: pull-request
@@ -173,7 +173,7 @@ jobs:
devcontainer:
secrets: inherit
needs: [checks, telemetry-setup]
- uses: rapidsai/shared-workflows/.github/workflows/build-in-devcontainer.yaml@main
+ uses: rapidsai/shared-workflows/.github/workflows/build-in-devcontainer.yaml@release/25.12
with:
arch: '["amd64", "arm64"]'
cuda: '["13.0"]'
diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml
index 2017bab..2ce941f 100644
--- a/.github/workflows/test.yaml
+++ b/.github/workflows/test.yaml
@@ -25,7 +25,7 @@ on:
jobs:
conda-cpp-tests:
secrets: inherit
- uses: rapidsai/shared-workflows/.github/workflows/conda-cpp-tests.yaml@main
+ uses: rapidsai/shared-workflows/.github/workflows/conda-cpp-tests.yaml@release/25.12
with:
build_type: ${{ inputs.build_type }}
branch: ${{ inputs.branch }}
@@ -35,7 +35,7 @@ jobs:
container-options: "--cap-add CAP_SYS_PTRACE --shm-size=8g --ulimit=nofile=1000000:1000000"
conda-python-tests:
secrets: inherit
- uses: rapidsai/shared-workflows/.github/workflows/conda-python-tests.yaml@main
+ uses: rapidsai/shared-workflows/.github/workflows/conda-python-tests.yaml@release/25.12
with:
build_type: ${{ inputs.build_type }}
branch: ${{ inputs.branch }}
@@ -45,7 +45,7 @@ jobs:
container-options: "--cap-add CAP_SYS_PTRACE --shm-size=8g --ulimit=nofile=1000000:1000000"
conda-python-distributed-tests:
secrets: inherit
- uses: rapidsai/shared-workflows/.github/workflows/conda-python-tests.yaml@main
+ uses: rapidsai/shared-workflows/.github/workflows/conda-python-tests.yaml@release/25.12
with:
build_type: ${{ inputs.build_type }}
script: "ci/test_python_distributed.sh"
@@ -55,7 +55,7 @@ jobs:
container-options: "--cap-add CAP_SYS_PTRACE --shm-size=8g --ulimit=nofile=1000000:1000000"
wheel-tests-ucxx:
secrets: inherit
- uses: rapidsai/shared-workflows/.github/workflows/wheels-test.yaml@main
+ uses: rapidsai/shared-workflows/.github/workflows/wheels-test.yaml@release/25.12
with:
build_type: ${{ inputs.build_type }}
branch: ${{ inputs.branch }}
@@ -65,7 +65,7 @@ jobs:
script: ci/test_wheel_ucxx.sh
wheel-tests-distributed-ucxx:
secrets: inherit
- uses: rapidsai/shared-workflows/.github/workflows/wheels-test.yaml@main
+ uses: rapidsai/shared-workflows/.github/workflows/wheels-test.yaml@release/25.12
with:
build_type: ${{ inputs.build_type }}
branch: ${{ inputs.branch }}
diff --git a/.github/workflows/trigger-breaking-change-alert.yaml b/.github/workflows/trigger-breaking-change-alert.yaml
index c471e2a..0b88554 100644
--- a/.github/workflows/trigger-breaking-change-alert.yaml
+++ b/.github/workflows/trigger-breaking-change-alert.yaml
@@ -12,7 +12,7 @@ jobs:
trigger-notifier:
if: contains(github.event.pull_request.labels.*.name, 'breaking')
secrets: inherit
- uses: rapidsai/shared-workflows/.github/workflows/breaking-change-alert.yaml@main
+ uses: rapidsai/shared-workflows/.github/workflows/breaking-change-alert.yaml@release/25.12
with:
sender_login: ${{ github.event.sender.login }}
sender_avatar: ${{ github.event.sender.avatar_url }}
diff --git a/RAPIDS_BRANCH b/RAPIDS_BRANCH
index ba2906d..26b8437 100644
--- a/RAPIDS_BRANCH
+++ b/RAPIDS_BRANCH
@@ -1 +1 @@
-main
+release/25.12
diff --git a/cmake/RAPIDS.cmake b/cmake/RAPIDS.cmake
index 620d9cb..f97dbf0 100644
--- a/cmake/RAPIDS.cmake
+++ b/cmake/RAPIDS.cmake
@@ -26,7 +26,7 @@ endif()
# Allow users to control which branch is fetched
if(NOT rapids-cmake-branch)
# Define a default branch if the user doesn't set one
- set(rapids-cmake-branch "main")
+ set(rapids-cmake-branch "release/${rapids-cmake-version}")
endif()
# Allow users to control the exact URL passed to FetchContent
diff --git a/docs/ucxx/source/send_recv.rst b/docs/ucxx/source/send_recv.rst
index 0859d5e..0714a83 100644
--- a/docs/ucxx/source/send_recv.rst
+++ b/docs/ucxx/source/send_recv.rst
@@ -93,6 +93,6 @@ Most users will not care about these details but developers and interested netwo
[1757536870.872600] [dgx13:1377244] UCXPY DEBUG [Recv #001] ep: 0x7f5a161a8080, tag: 0xdf227087928e03f6, nbytes: 12, type: <class 'bytearray'>
-We can see from the above that when the ``Endpoint`` is created, 4 tags are generated: ``msg-tag-send``, ``msg-tag-recv``, ``ctrl-tag-send``, and ``ctrl-tag-recv``. This data is transmitted to the server via a `stream <https://openucx.github.io/ucx/api/latest/html/group___u_c_p___c_o_m_m.html#gae9fe6efe6b05e4e78f58bee68c68b252>`_ communication in an `exchange peer info <https://github.com/rapidsai/ucxx/blob/main/python/ucxx/ucxx/_lib_async/exchange_peer_info.py>`_ convenience function.
+We can see from the above that when the ``Endpoint`` is created, 4 tags are generated: ``msg-tag-send``, ``msg-tag-recv``, ``ctrl-tag-send``, and ``ctrl-tag-recv``. This data is transmitted to the server via a `stream <https://openucx.github.io/ucx/api/latest/html/group___u_c_p___c_o_m_m.html#gae9fe6efe6b05e4e78f58bee68c68b252>`_ communication in an `exchange peer info <https://github.com/rapidsai/ucxx/blob/release/25.12/python/ucxx/ucxx/_lib_async/exchange_peer_info.py>`_ convenience function.
Next, the client sends data on the ``msg-tag-send`` tag. Two messages are sent, the size of the data ``8 bytes`` and data itself. The server receives the data and immediately echos the data back. The client then receives two messages the size of the data and the data itself. |
| if(NOT rapids-cmake-branch) | ||
| # Define a default branch if the user doesn't set one | ||
| set(rapids-cmake-branch "branch-${rapids-cmake-version}") | ||
| set(rapids-cmake-branch "main") |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This doesn't change in main context.
This gets sets to the following value when in release mode:
diff --git a/cmake/RAPIDS.cmake b/cmake/RAPIDS.cmake
index 620d9cb..f97dbf0 100644
--- a/cmake/RAPIDS.cmake
+++ b/cmake/RAPIDS.cmake
@@ -26,7 +26,7 @@ endif()
# Allow users to control which branch is fetched
if(NOT rapids-cmake-branch)
# Define a default branch if the user doesn't set one
- set(rapids-cmake-branch "main")
+ set(rapids-cmake-branch "release/${rapids-cmake-version}")
endif()This effectively preserves the old value translated from branch- to release/, but would love someone who knows more about this specific set of configuration to 👀 + 👍🏼
Co-authored-by: Bradley Dice <[email protected]>
|
/merge |
Description
This PR supports handling the new main branch strategy outlined below:
The
update-version.shscript should now supports two modes controlled viaCLIparams orENVvars:CLI arguments:
--run-context=main|releaseENV var
RAPIDS_RUN_CONTEXT=main|releasexref: rapidsai/build-planning#224