Skip to content

Commit 5387fa6

Browse files
authored
Merge branch 'main' into test-older-ctk
2 parents 58a7c3e + 0eea7d4 commit 5387fa6

16 files changed

Lines changed: 66 additions & 66 deletions

.github/workflows/build.yaml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ concurrency:
3535
jobs:
3636
python-build:
3737
secrets: inherit
38-
uses: rapidsai/shared-workflows/.github/workflows/conda-python-build.yaml@release/26.04
38+
uses: rapidsai/shared-workflows/.github/workflows/conda-python-build.yaml@main
3939
with:
4040
build_type: ${{ inputs.build_type || 'branch' }}
4141
branch: ${{ inputs.branch }}
@@ -46,7 +46,7 @@ jobs:
4646
upload-conda:
4747
needs: [python-build]
4848
secrets: inherit
49-
uses: rapidsai/shared-workflows/.github/workflows/conda-upload-packages.yaml@release/26.04
49+
uses: rapidsai/shared-workflows/.github/workflows/conda-upload-packages.yaml@main
5050
with:
5151
build_type: ${{ inputs.build_type || 'branch' }}
5252
branch: ${{ inputs.branch }}
@@ -56,19 +56,19 @@ jobs:
5656
if: github.ref_type == 'branch'
5757
needs: python-build
5858
secrets: inherit
59-
uses: rapidsai/shared-workflows/.github/workflows/custom-job.yaml@release/26.04
59+
uses: rapidsai/shared-workflows/.github/workflows/custom-job.yaml@main
6060
with:
6161
arch: "amd64"
6262
branch: ${{ inputs.branch }}
6363
build_type: ${{ inputs.build_type || 'branch' }}
64-
container_image: "rapidsai/ci-conda:26.04-latest"
64+
container_image: "rapidsai/ci-conda:26.06-latest"
6565
date: ${{ inputs.date }}
6666
node_type: "gpu-l4-latest-1"
6767
script: "ci/build_docs.sh"
6868
sha: ${{ inputs.sha }}
6969
wheel-build:
7070
secrets: inherit
71-
uses: rapidsai/shared-workflows/.github/workflows/wheels-build.yaml@release/26.04
71+
uses: rapidsai/shared-workflows/.github/workflows/wheels-build.yaml@main
7272
with:
7373
build_type: ${{ inputs.build_type || 'branch' }}
7474
branch: ${{ inputs.branch }}
@@ -81,7 +81,7 @@ jobs:
8181
wheel-publish:
8282
needs: wheel-build
8383
secrets: inherit
84-
uses: rapidsai/shared-workflows/.github/workflows/wheels-publish.yaml@release/26.04
84+
uses: rapidsai/shared-workflows/.github/workflows/wheels-publish.yaml@main
8585
with:
8686
build_type: ${{ inputs.build_type || 'branch' }}
8787
branch: ${{ inputs.branch }}

.github/workflows/pr.yaml

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ jobs:
2020
- wheel-tests
2121
- telemetry-setup
2222
secrets: inherit
23-
uses: rapidsai/shared-workflows/.github/workflows/pr-builder.yaml@release/26.04
23+
uses: rapidsai/shared-workflows/.github/workflows/pr-builder.yaml@main
2424
if: always()
2525
with:
2626
needs: ${{ toJSON(needs) }}
@@ -38,7 +38,7 @@ jobs:
3838
changed-files:
3939
secrets: inherit
4040
needs: telemetry-setup
41-
uses: rapidsai/shared-workflows/.github/workflows/changed-files.yaml@release/26.04
41+
uses: rapidsai/shared-workflows/.github/workflows/changed-files.yaml@main
4242
with:
4343
files_yaml: |
4444
build_docs:
@@ -129,7 +129,7 @@ jobs:
129129
checks:
130130
secrets: inherit
131131
needs: telemetry-setup
132-
uses: rapidsai/shared-workflows/.github/workflows/checks.yaml@release/26.04
132+
uses: rapidsai/shared-workflows/.github/workflows/checks.yaml@main
133133
with:
134134
ignored_pr_jobs: telemetry-summarize
135135
check-nightly-ci:
@@ -151,15 +151,15 @@ jobs:
151151
conda-python-build:
152152
needs: checks
153153
secrets: inherit
154-
uses: rapidsai/shared-workflows/.github/workflows/conda-python-build.yaml@release/26.04
154+
uses: rapidsai/shared-workflows/.github/workflows/conda-python-build.yaml@main
155155
with:
156156
build_type: pull-request
157157
script: ci/build_python.sh
158158
pure-conda: cuda_major
159159
conda-python-tests:
160160
needs: [conda-python-build, changed-files]
161161
secrets: inherit
162-
uses: rapidsai/shared-workflows/.github/workflows/conda-python-tests.yaml@release/26.04
162+
uses: rapidsai/shared-workflows/.github/workflows/conda-python-tests.yaml@main
163163
if: fromJSON(needs.changed-files.outputs.changed_file_groups).test_python_conda
164164
with:
165165
build_type: pull-request
@@ -168,29 +168,29 @@ jobs:
168168
conda-notebook-tests:
169169
needs: [conda-python-build, changed-files]
170170
secrets: inherit
171-
uses: rapidsai/shared-workflows/.github/workflows/custom-job.yaml@release/26.04
171+
uses: rapidsai/shared-workflows/.github/workflows/custom-job.yaml@main
172172
if: fromJSON(needs.changed-files.outputs.changed_file_groups).test_notebooks
173173
with:
174174
build_type: pull-request
175175
node_type: "gpu-l4-latest-1"
176176
arch: "amd64"
177-
container_image: "rapidsai/ci-conda:26.04-latest"
177+
container_image: "rapidsai/ci-conda:26.06-latest"
178178
script: "ci/test_notebooks.sh"
179179
docs-build:
180180
needs: [conda-python-build, changed-files]
181181
secrets: inherit
182-
uses: rapidsai/shared-workflows/.github/workflows/custom-job.yaml@release/26.04
182+
uses: rapidsai/shared-workflows/.github/workflows/custom-job.yaml@main
183183
if: fromJSON(needs.changed-files.outputs.changed_file_groups).build_docs
184184
with:
185185
build_type: pull-request
186186
node_type: "gpu-l4-latest-1"
187187
arch: "amd64"
188-
container_image: "rapidsai/ci-conda:26.04-latest"
188+
container_image: "rapidsai/ci-conda:26.06-latest"
189189
script: "ci/build_docs.sh"
190190
wheel-build:
191191
needs: checks
192192
secrets: inherit
193-
uses: rapidsai/shared-workflows/.github/workflows/wheels-build.yaml@release/26.04
193+
uses: rapidsai/shared-workflows/.github/workflows/wheels-build.yaml@main
194194
with:
195195
build_type: pull-request
196196
script: ci/build_wheel.sh
@@ -200,7 +200,7 @@ jobs:
200200
wheel-tests:
201201
needs: [wheel-build, changed-files]
202202
secrets: inherit
203-
uses: rapidsai/shared-workflows/.github/workflows/wheels-test.yaml@release/26.04
203+
uses: rapidsai/shared-workflows/.github/workflows/wheels-test.yaml@main
204204
if: fromJSON(needs.changed-files.outputs.changed_file_groups).test_python_wheels
205205
with:
206206
build_type: pull-request

.github/workflows/test-external.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,10 @@ on:
2323
jobs:
2424
test-external:
2525
secrets: inherit
26-
uses: rapidsai/shared-workflows/.github/workflows/custom-job.yaml@release/26.04
26+
uses: rapidsai/shared-workflows/.github/workflows/custom-job.yaml@main
2727
with:
2828
build_type: branch
2929
node_type: "gpu-l4-latest-1"
3030
arch: "amd64"
31-
container_image: "rapidsai/ci-conda:26.04-latest"
31+
container_image: "rapidsai/ci-conda:26.06-latest"
3232
script: "./ci/test_external.sh ${{ inputs.external-project || 'all' }} ${{ inputs.pr_number }}"

.github/workflows/test.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ on:
2525
jobs:
2626
conda-python-tests:
2727
secrets: inherit
28-
uses: rapidsai/shared-workflows/.github/workflows/conda-python-tests.yaml@release/26.04
28+
uses: rapidsai/shared-workflows/.github/workflows/conda-python-tests.yaml@main
2929
with:
3030
build_type: ${{ inputs.build_type }}
3131
branch: ${{ inputs.branch }}
@@ -34,7 +34,7 @@ jobs:
3434
sha: ${{ inputs.sha }}
3535
wheel-tests:
3636
secrets: inherit
37-
uses: rapidsai/shared-workflows/.github/workflows/wheels-test.yaml@release/26.04
37+
uses: rapidsai/shared-workflows/.github/workflows/wheels-test.yaml@main
3838
with:
3939
build_type: ${{ inputs.build_type }}
4040
branch: ${{ inputs.branch }}

.github/workflows/trigger-breaking-change-alert.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ jobs:
1212
trigger-notifier:
1313
if: contains(github.event.pull_request.labels.*.name, 'breaking')
1414
secrets: inherit
15-
uses: rapidsai/shared-workflows/.github/workflows/breaking-change-alert.yaml@release/26.04
15+
uses: rapidsai/shared-workflows/.github/workflows/breaking-change-alert.yaml@main
1616
with:
1717
sender_login: ${{ github.event.sender.login }}
1818
sender_avatar: ${{ github.event.sender.avatar_url }}

RAPIDS_BRANCH

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
release/26.04
1+
main

README.md

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -36,9 +36,9 @@ The original version (0.2) of cuxfilter, most known for the backend powering the
3636

3737
### Example 1
3838

39-
[![Open In Studio Lab](https://studiolab.sagemaker.aws/studiolab.svg)](https://studiolab.sagemaker.aws/import/github/rapidsai/cuxfilter/blob/release/26.04/notebooks/auto_accidents_example.ipynb) [<img src="https://img.shields.io/badge/-Setup Studio Lab Environment-gray.svg">](./notebooks/README.md#amazon-sagemaker-studio-lab)
39+
[![Open In Studio Lab](https://studiolab.sagemaker.aws/studiolab.svg)](https://studiolab.sagemaker.aws/import/github/rapidsai/cuxfilter/blob/main/notebooks/auto_accidents_example.ipynb) [<img src="https://img.shields.io/badge/-Setup Studio Lab Environment-gray.svg">](./notebooks/README.md#amazon-sagemaker-studio-lab)
4040

41-
[![Open In Colab](https://colab.research.google.com/assets/colab-badge.svg)](https://colab.research.google.com/github/rapidsai/cuxfilter/blob/release/26.04/notebooks/auto_accidents_example.ipynb) [<img src="https://img.shields.io/badge/-Setup Colab Environment-gray.svg">](./notebooks/README.md#google-colab)
41+
[![Open In Colab](https://colab.research.google.com/assets/colab-badge.svg)](https://colab.research.google.com/github/rapidsai/cuxfilter/blob/main/notebooks/auto_accidents_example.ipynb) [<img src="https://img.shields.io/badge/-Setup Colab Environment-gray.svg">](./notebooks/README.md#google-colab)
4242

4343
```python
4444
import cuxfilter
@@ -79,9 +79,9 @@ d.app()
7979

8080
### Example 2
8181

82-
[![Open In Studio Lab](https://studiolab.sagemaker.aws/studiolab.svg)](https://studiolab.sagemaker.aws/import/github/rapidsai/cuxfilter/blob/release/26.04/notebooks/Mortgage_example.ipynb) [<img src="https://img.shields.io/badge/-Setup Studio Lab Environment-gray.svg">](./notebooks/README.md#amazon-sagemaker-studio-lab)
82+
[![Open In Studio Lab](https://studiolab.sagemaker.aws/studiolab.svg)](https://studiolab.sagemaker.aws/import/github/rapidsai/cuxfilter/blob/main/notebooks/Mortgage_example.ipynb) [<img src="https://img.shields.io/badge/-Setup Studio Lab Environment-gray.svg">](./notebooks/README.md#amazon-sagemaker-studio-lab)
8383

84-
[![Open In Colab](https://colab.research.google.com/assets/colab-badge.svg)](https://colab.research.google.com/github/rapidsai/cuxfilter/blob/release/26.04/notebooks/Mortgage_example.ipynb) [<img src="https://img.shields.io/badge/-Setup Colab Environment-gray.svg">](./notebooks/README.md#google-colab)
84+
[![Open In Colab](https://colab.research.google.com/assets/colab-badge.svg)](https://colab.research.google.com/github/rapidsai/cuxfilter/blob/main/notebooks/Mortgage_example.ipynb) [<img src="https://img.shields.io/badge/-Setup Colab Environment-gray.svg">](./notebooks/README.md#google-colab)
8585

8686
```python
8787
import cuxfilter
@@ -156,11 +156,11 @@ For the nightly version of `cuxfilter`:
156156
```bash
157157
# CUDA 13
158158
conda install -c rapidsai-nightly -c conda-forge \
159-
cuxfilter=26.04 python=3.14 cuda-version=13.1
159+
cuxfilter=26.06 python=3.14 cuda-version=13.1
160160

161161
# CUDA 12
162162
conda install -c rapidsai-nightly -c conda-forge \
163-
cuxfilter=26.04 python=3.14 cuda-version=12.9
163+
cuxfilter=26.06 python=3.14 cuda-version=12.9
164164
```
165165

166166
For the stable version of `cuxfilter`:

VERSION

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
26.04.00
1+
26.06.00

conda/environments/all_cuda-129_arch-aarch64.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,11 @@ dependencies:
99
- bokeh_sampledata
1010
- certifi>=2026.1.4
1111
- cuda-version=12.9
12-
- cudf==26.4.*,>=0.0.0a0
13-
- cugraph==26.4.*,>=0.0.0a0
12+
- cudf==26.6.*,>=0.0.0a0
13+
- cugraph==26.6.*,>=0.0.0a0
1414
- cupy>=13.6.0
15-
- dask-cuda==26.4.*,>=0.0.0a0
16-
- dask-cudf==26.4.*,>=0.0.0a0
15+
- dask-cuda==26.6.*,>=0.0.0a0
16+
- dask-cudf==26.6.*,>=0.0.0a0
1717
- datashader>=0.15
1818
- geopandas>=0.11.0
1919
- holoviews>=1.16.0,<1.21.0

conda/environments/all_cuda-129_arch-x86_64.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,11 @@ dependencies:
99
- bokeh_sampledata
1010
- certifi>=2026.1.4
1111
- cuda-version=12.9
12-
- cudf==26.4.*,>=0.0.0a0
13-
- cugraph==26.4.*,>=0.0.0a0
12+
- cudf==26.6.*,>=0.0.0a0
13+
- cugraph==26.6.*,>=0.0.0a0
1414
- cupy>=13.6.0
15-
- dask-cuda==26.4.*,>=0.0.0a0
16-
- dask-cudf==26.4.*,>=0.0.0a0
15+
- dask-cuda==26.6.*,>=0.0.0a0
16+
- dask-cudf==26.6.*,>=0.0.0a0
1717
- datashader>=0.15
1818
- geopandas>=0.11.0
1919
- holoviews>=1.16.0,<1.21.0

0 commit comments

Comments
 (0)