From fd4200244977b30c1f6f7b1fec964a2b64a01bfc Mon Sep 17 00:00:00 2001 From: Ray Douglass Date: Thu, 23 Jan 2025 15:12:45 -0500 Subject: [PATCH 1/4] DOC v25.04 Updates [skip ci] --- .github/workflows/build.yaml | 2 +- .github/workflows/pr.yaml | 6 +++--- VERSION | 2 +- conda/environments/all_cuda-125_arch-x86_64.yaml | 14 +++++++------- dependencies.yaml | 14 +++++++------- 5 files changed, 19 insertions(+), 19 deletions(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 2ccc928..741845a 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -29,7 +29,7 @@ jobs: docs-build: if: github.ref_type == 'branch' secrets: inherit - uses: rapidsai/shared-workflows/.github/workflows/custom-job.yaml@branch-25.02 + uses: rapidsai/shared-workflows/.github/workflows/custom-job.yaml@branch-25.04 with: arch: "amd64" branch: ${{ inputs.branch }} diff --git a/.github/workflows/pr.yaml b/.github/workflows/pr.yaml index 9849064..74f3991 100644 --- a/.github/workflows/pr.yaml +++ b/.github/workflows/pr.yaml @@ -16,7 +16,7 @@ jobs: - checks - docs-build secrets: inherit - uses: rapidsai/shared-workflows/.github/workflows/pr-builder.yaml@branch-25.02 + uses: rapidsai/shared-workflows/.github/workflows/pr-builder.yaml@branch-25.04 if: always() with: needs: ${{ toJSON(needs) }} @@ -31,14 +31,14 @@ jobs: checks: secrets: inherit needs: telemetry-setup - uses: rapidsai/shared-workflows/.github/workflows/checks.yaml@branch-25.02 + uses: rapidsai/shared-workflows/.github/workflows/checks.yaml@branch-25.04 with: enable_check_generated_files: false ignored_pr_jobs: "telemetry-summarize" docs-build: needs: checks secrets: inherit - uses: rapidsai/shared-workflows/.github/workflows/custom-job.yaml@branch-25.02 + uses: rapidsai/shared-workflows/.github/workflows/custom-job.yaml@branch-25.04 with: build_type: pull-request node_type: "gpu-v100-latest-1" diff --git a/VERSION b/VERSION index 72eefaf..b922658 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -25.02.00 +25.04.00 diff --git a/conda/environments/all_cuda-125_arch-x86_64.yaml b/conda/environments/all_cuda-125_arch-x86_64.yaml index bf7fb60..ed7f121 100644 --- a/conda/environments/all_cuda-125_arch-x86_64.yaml +++ b/conda/environments/all_cuda-125_arch-x86_64.yaml @@ -10,21 +10,21 @@ channels: dependencies: - breathe>=4.35 - cuda-version=12.5 -- cugraph-dgl==25.2.*,>=0.0.0a0 -- cugraph-pyg==25.2.*,>=0.0.0a0 -- cugraph==25.2.*,>=0.0.0a0 +- cugraph-dgl==25.4.*,>=0.0.0a0 +- cugraph-pyg==25.4.*,>=0.0.0a0 +- cugraph==25.4.*,>=0.0.0a0 - dglteam/label/th23_cu121::dgl - doxygen - graphviz - ipython -- libcugraph==25.2.*,>=0.0.0a0 -- libcugraph_etl==25.2.*,>=0.0.0a0 +- libcugraph==25.4.*,>=0.0.0a0 +- libcugraph_etl==25.4.*,>=0.0.0a0 - nbsphinx - numpydoc - pre-commit - pydata-sphinx-theme -- pylibcugraph==25.2.*,>=0.0.0a0 -- pylibwholegraph==25.2.*,>=0.0.0a0 +- pylibcugraph==25.4.*,>=0.0.0a0 +- pylibwholegraph==25.4.*,>=0.0.0a0 - recommonmark - sphinx-copybutton - sphinx-markdown-tables diff --git a/dependencies.yaml b/dependencies.yaml index 34d78f2..1f4646e 100644 --- a/dependencies.yaml +++ b/dependencies.yaml @@ -75,11 +75,11 @@ dependencies: common: - output_types: [conda] packages: - - cugraph==25.2.*,>=0.0.0a0 - - cugraph-dgl==25.2.*,>=0.0.0a0 - - cugraph-pyg==25.2.*,>=0.0.0a0 + - cugraph==25.4.*,>=0.0.0a0 + - cugraph-dgl==25.4.*,>=0.0.0a0 + - cugraph-pyg==25.4.*,>=0.0.0a0 - 'dglteam/label/th23_cu121::dgl' - - libcugraph==25.2.*,>=0.0.0a0 - - libcugraph_etl==25.2.*,>=0.0.0a0 - - pylibcugraph==25.2.*,>=0.0.0a0 - - pylibwholegraph==25.2.*,>=0.0.0a0 + - libcugraph==25.4.*,>=0.0.0a0 + - libcugraph_etl==25.4.*,>=0.0.0a0 + - pylibcugraph==25.4.*,>=0.0.0a0 + - pylibwholegraph==25.4.*,>=0.0.0a0 From deacf6621d14454e510297ff9b683447f20c3994 Mon Sep 17 00:00:00 2001 From: James Lamb Date: Fri, 21 Feb 2025 13:18:13 -0600 Subject: [PATCH 2/4] require sphinx<8.2.0, update CODEOWNERS (#100) Contributes to https://github.com/rapidsai/build-planning/issues/155 Fixes docs builds by temporarily putting a ceiling on `sphinx`. Authors: - James Lamb (https://github.com/jameslamb) Approvers: - Bradley Dice (https://github.com/bdice) - Don Acosta (https://github.com/acostadon) URL: https://github.com/rapidsai/cugraph-docs/pull/100 --- .github/CODEOWNERS | 7 ++++++- .pre-commit-config.yaml | 2 +- conda/environments/all_cuda-128_arch-x86_64.yaml | 2 +- dependencies.yaml | 3 ++- 4 files changed, 10 insertions(+), 4 deletions(-) diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index fcd8260..75299b7 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -11,4 +11,9 @@ docs/ @rapidsai/cugraph-doc-codeowners # CI code owners /.github/ @rapidsai/ci-codeowners /ci/ @rapidsai/ci-codeowners -/.pre-commit-config.yaml @rapidsai/ci-codeowners + +# packaging code owners +/.pre-commit-config.yaml @rapidsai/packaging-codeowners +/conda/ @rapidsai/packaging-codeowners +dependencies.yaml @rapidsai/packaging-codeowners +/build.sh @rapidsai/packaging-codeowners diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 6274f43..9f1a766 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -2,7 +2,7 @@ repos: - repo: https://github.com/rapidsai/pre-commit-hooks - rev: v0.4.0 + rev: v0.6.0 hooks: - id: verify-alpha-spec - id: verify-copyright diff --git a/conda/environments/all_cuda-128_arch-x86_64.yaml b/conda/environments/all_cuda-128_arch-x86_64.yaml index 9ac7e24..55f7aa5 100644 --- a/conda/environments/all_cuda-128_arch-x86_64.yaml +++ b/conda/environments/all_cuda-128_arch-x86_64.yaml @@ -28,6 +28,6 @@ dependencies: - recommonmark - sphinx-copybutton - sphinx-markdown-tables -- sphinx>=8 +- sphinx>=8,<8.2.0 - sphinxcontrib-websupport name: all_cuda-128_arch-x86_64 diff --git a/dependencies.yaml b/dependencies.yaml index 64b9243..a146b07 100644 --- a/dependencies.yaml +++ b/dependencies.yaml @@ -70,7 +70,8 @@ dependencies: - recommonmark - sphinx-copybutton - sphinx-markdown-tables - - sphinx>=8 + # the ceiling on sphinx can be removed when https://github.com/spatialaudio/nbsphinx/issues/825 is resolved + - sphinx>=8,<8.2.0 - sphinxcontrib-websupport # this repo only uses conda and 1 major version of CUDA, so From ed71f7546f0521c6b30c9e3abf134ad33c8e8cf2 Mon Sep 17 00:00:00 2001 From: Don Acosta <97529984+acostadon@users.noreply.github.com> Date: Thu, 3 Apr 2025 17:07:03 -0400 Subject: [PATCH 3/4] Merge pull request #103 from acostadon/docs_2504_fix_build changed the version of dgl dependency --- .github/workflows/build.yaml | 2 +- .github/workflows/pr.yaml | 2 +- conda/environments/all_cuda-128_arch-x86_64.yaml | 2 +- dependencies.yaml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 741845a..349cdd6 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -36,6 +36,6 @@ jobs: build_type: ${{ inputs.build_type || 'branch' }} container_image: "rapidsai/ci-conda:latest" date: ${{ inputs.date }} - node_type: "gpu-v100-latest-1" + node_type: "gpu-l4-latest-1" run_script: "ci/build_docs.sh" sha: ${{ inputs.sha }} diff --git a/.github/workflows/pr.yaml b/.github/workflows/pr.yaml index 74f3991..15e75a2 100644 --- a/.github/workflows/pr.yaml +++ b/.github/workflows/pr.yaml @@ -41,7 +41,7 @@ jobs: uses: rapidsai/shared-workflows/.github/workflows/custom-job.yaml@branch-25.04 with: build_type: pull-request - node_type: "gpu-v100-latest-1" + node_type: "gpu-l4-latest-1" arch: "amd64" container_image: "rapidsai/ci-conda:latest" run_script: "ci/build_docs.sh" diff --git a/conda/environments/all_cuda-128_arch-x86_64.yaml b/conda/environments/all_cuda-128_arch-x86_64.yaml index 55f7aa5..4b4d01d 100644 --- a/conda/environments/all_cuda-128_arch-x86_64.yaml +++ b/conda/environments/all_cuda-128_arch-x86_64.yaml @@ -13,7 +13,7 @@ dependencies: - cugraph-dgl==25.4.*,>=0.0.0a0 - cugraph-pyg==25.4.*,>=0.0.0a0 - cugraph==25.4.*,>=0.0.0a0 -- dglteam/label/th23_cu121::dgl +- dglteam/label/th24_cu124::dgl - doxygen - graphviz - ipython diff --git a/dependencies.yaml b/dependencies.yaml index a146b07..3f9fe35 100644 --- a/dependencies.yaml +++ b/dependencies.yaml @@ -83,7 +83,7 @@ dependencies: - cugraph==25.4.*,>=0.0.0a0 - cugraph-dgl==25.4.*,>=0.0.0a0 - cugraph-pyg==25.4.*,>=0.0.0a0 - - 'dglteam/label/th23_cu121::dgl' + - 'dglteam/label/th24_cu124::dgl' - libcugraph==25.4.*,>=0.0.0a0 - libcugraph_etl==25.4.*,>=0.0.0a0 - pylibcugraph==25.4.*,>=0.0.0a0 From c8335538a57b03bc790b8f485cfbba117a03fa49 Mon Sep 17 00:00:00 2001 From: Jake Awe Date: Wed, 9 Apr 2025 09:10:40 -0700 Subject: [PATCH 4/4] Update Changelog [skip ci] --- CHANGELOG.md | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index c7995cb..221cb84 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,14 @@ +# cugraph-docs 25.04.00 (9 Apr 2025) + +## 🐛 Bug Fixes + +- changed the version of dgl dependency ([#103](https://github.com/rapidsai/cugraph-docs/pull/103)) [@acostadon](https://github.com/acostadon) + +## 🛠️ Improvements + +- require sphinx<8.2.0, update CODEOWNERS ([#100](https://github.com/rapidsai/cugraph-docs/pull/100)) [@jameslamb](https://github.com/jameslamb) +- merge branch-25.02 into branch-25.04 ([#99](https://github.com/rapidsai/cugraph-docs/pull/99)) [@jameslamb](https://github.com/jameslamb) + # cugraph-docs 25.02.00 (13 Feb 2025) ## 📖 Documentation