From d02891795f7090d0c79513fb0c64e191bab81506 Mon Sep 17 00:00:00 2001 From: Serge Koudoro Date: Thu, 14 Sep 2023 22:29:33 -0400 Subject: [PATCH 01/21] Update requirements.txt --- requirements.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/requirements.txt b/requirements.txt index e768fbe2..685cbea8 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,6 +1,6 @@ numpydoc sphinx!=4.4 tomli>=2.0.1 -grg-sphinx-theme>=0.1.0 +grg-sphinx-theme>=0.2.0 Jinja2 -ablog==0.11.5 \ No newline at end of file +ablog==0.11.5 From 75f8a9ad929350a649d51a80ca439e8f6a355d7c Mon Sep 17 00:00:00 2001 From: Serge Koudoro Date: Fri, 15 Sep 2023 14:17:42 -0400 Subject: [PATCH 02/21] remove duplication --- posts/2023/2023_08_21_vara_week_12_13.rst | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/posts/2023/2023_08_21_vara_week_12_13.rst b/posts/2023/2023_08_21_vara_week_12_13.rst index ee8dee4a..b79f5798 100644 --- a/posts/2023/2023_08_21_vara_week_12_13.rst +++ b/posts/2023/2023_08_21_vara_week_12_13.rst @@ -15,7 +15,7 @@ Monai's VQVAE results on T1-weighted NFBS dataset, 125 samples, for batch size o 2. dipy's ``resize`` & scipy's ``affine_transform`` scale the volume to (128,128,128,1) shape & (1,1,1) voxel size 3. MinMax normalization to limit the range of intensities to (0,1) -Using existing training parameters, carried out two experiments, one on CC359 alone & another on both datasets combined. Additionally, I made a slight modification in the loss definition by attributing different weights of 0.5 & 1 to background & foreground pixels compared to equal weights from previous experiments. This resulted in faster convergence as shown in the red, blue & purple lines in the combined plot shown below. (Naming convention for each each training curve is ``B-``, where CC=CC359, NFBS=NFBS, both=[NFBS,CC359]) +Using existing training parameters, carried out two experiments, one on CC359 alone & another on both datasets combined. Additionally, I made a slight modification in the loss definition by attributing different weights of 0.5 & 1 to background & foreground pixels compared to equal weights from previous experiments. This resulted in faster convergence as shown in the red, blue & purple lines in the combined plot shown below. (Naming convention for each training curve is ``B-``, where CC=CC359, NFBS=NFBS, both=[NFBS,CC359]) .. image:: /_static/images/vqvae3d-monai-training-plots.png :alt: Combined trainings plots for all experiments @@ -27,13 +27,13 @@ Inference results on the best performing model, B12-both, is shown below, where :alt: VQVAE-Monai-B12-both reconstructions & originals showing equally spaced 5 slices for 2 different test samples :width: 800 -Here's a similar visualization of the inference on the next best performing model, B12-CC. +Here's a similar visualization of the inference on the next best performing model, B12-CC. .. image:: /_static/images/vqvae-monai-B12-CC.png :alt: VQVAE-Monai-B12-CC reconstructions & originals showing equally spaced 5 slices for 2 different test samples :width: 800 -This shows that our training not only converged quickly but also improved visually. Here's a comparison of our current best performing model i.e., VQVAE-Monai-B12-both & the previous one on NFBS i.e., VQVAE-Monai-B5-NFBS. The test reconstruction loss is 0.0013 & 0.0015 respectively. +This shows that our training not only converged quickly but also improved visually. Here's a comparison of our current best performing model i.e., VQVAE-Monai-B12-both & the previous one on NFBS i.e., VQVAE-Monai-B5-NFBS. The test reconstruction loss is 0.0013 & 0.0015 respectively. .. image:: /_static/images/vqvae-reconstructions-comparison.png :alt: VQVAE reconstruction comparison for B12-both & B5-NFBS From 4c64e888d5c43dd01208f956b0b443b5d8b4ce77 Mon Sep 17 00:00:00 2001 From: Serge Koudoro Date: Wed, 20 Sep 2023 15:39:03 -0400 Subject: [PATCH 03/21] add new action pr-comment --- .github/workflows/pr-comment.yml | 48 ++++++++++++++++++++++++++++++++ .github/workflows/publish.yml | 34 ++++------------------ 2 files changed, 54 insertions(+), 28 deletions(-) create mode 100644 .github/workflows/pr-comment.yml diff --git a/.github/workflows/pr-comment.yml b/.github/workflows/pr-comment.yml new file mode 100644 index 00000000..966ab968 --- /dev/null +++ b/.github/workflows/pr-comment.yml @@ -0,0 +1,48 @@ +name: Comment on the pull request. + +on: + workflow_run: + workflows: ["Github Pages"] + types: [in_progress, completed] + +jobs: + in-progress: + runs-on: ubuntu-latest + if: ${{ github.event.workflow_run.event == 'pull_request' && github.event.workflow_run.status == 'in_progress' }} + steps: + - name: 'Comment on PR - Waiting for deployment' + uses: hasura/comment-progress@v2.3.0 + with: + github-token: ${{ secrets.GITHUB_TOKEN }} + repository: ${{ github.repository }} + number: ${{ github.event.workflow_run.pull_requests.number }} + id: deploy-preview + message: "Starting deployment of preview ⏳..." + on-failure: + runs-on: ubuntu-latest + if: ${{ github.event.workflow_run.event == 'pull_request' && github.event.workflow_run.conclusion == 'failure' }} + steps: + - name: 'Comment on PR - Waiting for deployment' + uses: hasura/comment-progress@v2.3.0 + with: + github-token: ${{ secrets.GITHUB_TOKEN }} + repository: ${{ github.repository }} + number: ${{ github.event.workflow_run.pull_requests.number }} + id: deploy-preview + message: "⚠️⚠️⚠️ Build Failed: No preview available." + on-success: + runs-on: ubuntu-latest + if: ${{ github.event.workflow_run.event == 'pull_request' && github.event.workflow_run.conclusion == 'success' }} + env: + PR_PATH: dipy.org/pull/${{github.event.workflow_run.pull_requests.number}} + BASE_URL: https://dipy.github.io/dipy-preview + steps: + - name: Update comment + uses: hasura/comment-progress@v2.3.0 + with: + github-token: ${{ secrets.GITHUB_TOKEN }} + repository: ${{ github.repository }} + number: ${{ github.event.workflow_run.pull_requests.number }} + id: deploy-preview + message: "A preview of ${{ github.event.workflow_run.head_commit }} is uploaded and can be seen here:\n\n ✨ ${{ env.BASE_URL }}/${{ env.PR_PATH }} ✨\n\nChanges may take a few minutes to propagate. The source is here: https://github.com/${{ github.repository }}/tree/gh-pages/${{ env.PR_PATH }}/" + diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 7b7ee436..0d479062 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -1,10 +1,10 @@ -name: github pages +name: Github Pages on: push: branches: - master - pull_request_target: + pull_request: branches: - master schedule: @@ -13,12 +13,8 @@ on: jobs: deploy: runs-on: ubuntu-latest - permissions: - contents: write - pull-requests: write - issues: write env: - PR_PATH: pull/${{github.event.number}} + PR_PATH: dipy.org/pull/${{github.event.number}} BASE_URL: https://dipy.github.io/dipy.org HEAD: ${{ github.event.pull_request.head.repo.full_name }} BASE: ${{ github.repository }} @@ -26,16 +22,6 @@ jobs: REF: ${{github.ref}} STATUS: ${{github.event.pull_request.head.repo.full_name != github.repository}} steps: - - name: Comment on PR - uses: hasura/comment-progress@v2.3.0 - if: ${{ github.event.pull_request.head.repo.full_name != '' && github.event.pull_request.head.repo.full_name != github.repository }} - with: - github-token: ${{ secrets.GITHUB_TOKEN }} - repository: ${{ github.repository }} - number: ${{ github.event.number }} - id: deploy-preview - message: "Starting deployment of preview ⏳..." - - name: Checkout website repo uses: actions/checkout@v4 @@ -74,21 +60,13 @@ jobs: uses: peaceiris/actions-gh-pages@v3 if: ${{ github.event.pull_request.head.repo.full_name != '' && github.event.pull_request.head.repo.full_name != github.repository }} with: - github_token: ${{ secrets.GITHUB_TOKEN }} + deploy_key: ${{ secrets.ACTIONS_DEPLOY_TOKEN }} + external_repository: dipy/preview-html publish_dir: ./_build/html + publish_branch: main destination_dir: ${{ env.PR_PATH }} keep_files: true user_name: 'github-actions[bot]' user_email: 'github-actions[bot]@users.noreply.github.com' commit_message: ${{ github.event.head_commit.message }} - - name: Update comment - uses: hasura/comment-progress@v2.3.0 - if: ${{ github.event.pull_request.head.repo.full_name != '' && github.event.pull_request.head.repo.full_name != github.repository }} - with: - github-token: ${{ secrets.GITHUB_TOKEN }} - repository: ${{ github.repository }} - number: ${{ github.event.number }} - id: deploy-preview - message: "A preview of ${{ github.event.after }} is uploaded and can be seen here:\n\n ✨ ${{ env.BASE_URL }}/${{ env.PR_PATH }} ✨\n\nChanges may take a few minutes to propagate. The source is here: https://github.com/${{ github.repository }}/tree/gh-pages/${{ env.PR_PATH }}/" - From bcc28bcb7db0f1e9e5332187fc280d5b6903e9e8 Mon Sep 17 00:00:00 2001 From: Serge Koudoro Date: Wed, 20 Sep 2023 16:13:49 -0400 Subject: [PATCH 04/21] use inherit --- .github/workflows/publish.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 0d479062..5a5a1511 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -59,6 +59,7 @@ jobs: - name: Deploy to PR preview uses: peaceiris/actions-gh-pages@v3 if: ${{ github.event.pull_request.head.repo.full_name != '' && github.event.pull_request.head.repo.full_name != github.repository }} + secrets: inherit with: deploy_key: ${{ secrets.ACTIONS_DEPLOY_TOKEN }} external_repository: dipy/preview-html From a943ce694826acd9f0c89be7ac84161442b53049 Mon Sep 17 00:00:00 2001 From: Serge Koudoro Date: Wed, 20 Sep 2023 23:49:13 -0400 Subject: [PATCH 05/21] implement preview html action --- .github/workflows/pr-close.yml | 30 -------- .github/workflows/pr-comment.yml | 48 ------------- .github/workflows/preview-html.yml | 111 +++++++++++++++++++++++++++++ .github/workflows/publish.yml | 30 ++++---- 4 files changed, 124 insertions(+), 95 deletions(-) delete mode 100644 .github/workflows/pr-close.yml delete mode 100644 .github/workflows/pr-comment.yml create mode 100644 .github/workflows/preview-html.yml diff --git a/.github/workflows/pr-close.yml b/.github/workflows/pr-close.yml deleted file mode 100644 index d8833f18..00000000 --- a/.github/workflows/pr-close.yml +++ /dev/null @@ -1,30 +0,0 @@ -name: delete preview on PR close -on: - pull_request_target: - types: [closed] - -jobs: - delete_preview: - runs-on: ubuntu-latest - env: - PR_PATH: pull/${{github.event.number}} - steps: - - name: Checkout website repo - uses: actions/checkout@v4 - with: - ref: gh-pages - - - name: Delete preview - run: | - git rm -r ${{ env.PR_PATH }} - git commit -m "Delete preview for PR #${{ github.event.number }}" - git push origin gh-pages - - - name: Comment on PR - uses: hasura/comment-progress@v2.2.0 - with: - github-token: ${{ secrets.GITHUB_TOKEN }} - repository: ${{ github.repository }} - number: ${{ github.event.number }} - id: deploy-preview - message: "🪓 PR closed, deleted preview at https://github.com/${{ github.repository }}/tree/gh-pages/${{ env.PR_PATH }}/" \ No newline at end of file diff --git a/.github/workflows/pr-comment.yml b/.github/workflows/pr-comment.yml deleted file mode 100644 index 966ab968..00000000 --- a/.github/workflows/pr-comment.yml +++ /dev/null @@ -1,48 +0,0 @@ -name: Comment on the pull request. - -on: - workflow_run: - workflows: ["Github Pages"] - types: [in_progress, completed] - -jobs: - in-progress: - runs-on: ubuntu-latest - if: ${{ github.event.workflow_run.event == 'pull_request' && github.event.workflow_run.status == 'in_progress' }} - steps: - - name: 'Comment on PR - Waiting for deployment' - uses: hasura/comment-progress@v2.3.0 - with: - github-token: ${{ secrets.GITHUB_TOKEN }} - repository: ${{ github.repository }} - number: ${{ github.event.workflow_run.pull_requests.number }} - id: deploy-preview - message: "Starting deployment of preview ⏳..." - on-failure: - runs-on: ubuntu-latest - if: ${{ github.event.workflow_run.event == 'pull_request' && github.event.workflow_run.conclusion == 'failure' }} - steps: - - name: 'Comment on PR - Waiting for deployment' - uses: hasura/comment-progress@v2.3.0 - with: - github-token: ${{ secrets.GITHUB_TOKEN }} - repository: ${{ github.repository }} - number: ${{ github.event.workflow_run.pull_requests.number }} - id: deploy-preview - message: "⚠️⚠️⚠️ Build Failed: No preview available." - on-success: - runs-on: ubuntu-latest - if: ${{ github.event.workflow_run.event == 'pull_request' && github.event.workflow_run.conclusion == 'success' }} - env: - PR_PATH: dipy.org/pull/${{github.event.workflow_run.pull_requests.number}} - BASE_URL: https://dipy.github.io/dipy-preview - steps: - - name: Update comment - uses: hasura/comment-progress@v2.3.0 - with: - github-token: ${{ secrets.GITHUB_TOKEN }} - repository: ${{ github.repository }} - number: ${{ github.event.workflow_run.pull_requests.number }} - id: deploy-preview - message: "A preview of ${{ github.event.workflow_run.head_commit }} is uploaded and can be seen here:\n\n ✨ ${{ env.BASE_URL }}/${{ env.PR_PATH }} ✨\n\nChanges may take a few minutes to propagate. The source is here: https://github.com/${{ github.repository }}/tree/gh-pages/${{ env.PR_PATH }}/" - diff --git a/.github/workflows/preview-html.yml b/.github/workflows/preview-html.yml new file mode 100644 index 00000000..7e6bbda8 --- /dev/null +++ b/.github/workflows/preview-html.yml @@ -0,0 +1,111 @@ +name: Comment on the pull request. + +on: + workflow_run: + workflows: ["Github Pages"] + types: [in_progress, completed] + pull_request_target: + types: [closed] + +jobs: + get-pr-number: + runs-on: ubuntu-latest + if: ${{ github.event.workflow_run.event == 'pull_request' }} + outputs: + output1: ${{ steps.echo_pr_nb.outputs.pr_number }} + steps: + - name: Download workflow artifact + uses: dawidd6/action-download-artifact@v2.11.0 + with: + github_token: ${{ secrets.GITHUB_TOKEN }} + workflow: publish.yml + run_id: ${{ github.event.workflow_run.id }} + - name: Read the pull_request_number.txt file + id: pull_request_number_reader + uses: juliangruber/read-file-action@v1.0.0 + with: + path: ./pull_request_number/pull_request_number.txt + - name: Echo pull_request_number + id: echo_pr_nb + run: echo "pr_number=${{ steps.pull_request_number_reader.outputs.content }}" >> $GITHUB_OUTPUT + + in-progress: + runs-on: ubuntu-latest + needs: get-pr-number + if: ${{ github.event.workflow_run.event == 'pull_request' && github.event.workflow_run.status == 'in_progress' }} + steps: + - name: 'Comment on PR - Waiting for deployment' + uses: hasura/comment-progress@v2.3.0 + with: + github-token: ${{ secrets.GITHUB_TOKEN }} + repository: ${{ github.repository }} + number: ${{ needs.get-pr-number.outputs.output1 }} + id: deploy-preview + message: "Starting deployment of preview ⏳..." + on-failure: + runs-on: ubuntu-latest + needs: get-pr-number + if: ${{ github.event.workflow_run.event == 'pull_request' && github.event.workflow_run.conclusion == 'failure' }} + steps: + - name: 'Comment on PR - Waiting for deployment' + uses: hasura/comment-progress@v2.3.0 + with: + github-token: ${{ secrets.GITHUB_TOKEN }} + repository: ${{ github.repository }} + number: ${{ needs.get-pr-number.outputs.output1 }} + id: deploy-preview + message: "⚠️⚠️⚠️ Build Failed: No preview available." + on-success: + runs-on: ubuntu-latest + needs: get-pr-number + if: ${{ github.event.workflow_run.event == 'pull_request' && github.event.workflow_run.conclusion == 'success' }} + env: + PR_PATH: dipy.org/pull/${{needs.get-pr-number.outputs.output1}} + BASE_URL: https://dipy.github.io/dipy-preview + steps: + - name: Deploy to PR preview + uses: peaceiris/actions-gh-pages@v3 + with: + deploy_key: ${{ secrets.ACTIONS_DEPLOY_TOKEN }} + external_repository: dipy/preview-html + publish_dir: ./_build/html + publish_branch: main + destination_dir: ${{ env.PR_PATH }} + keep_files: true + user_name: 'github-actions[bot]' + user_email: 'github-actions[bot]@users.noreply.github.com' + commit_message: ${{ github.event.head_commit.message }} + - name: Update comment + uses: hasura/comment-progress@v2.3.0 + with: + github-token: ${{ secrets.GITHUB_TOKEN }} + repository: ${{ github.repository }} + number: ${{ needs.get-pr-number.outputs.output1 }} + id: deploy-preview + message: "A preview of ${{ github.event.workflow_run.head_commit }} is uploaded and can be seen here:\n\n ✨ ${{ env.BASE_URL }}/${{ env.PR_PATH }} ✨\n\nChanges may take a few minutes to propagate. The source is here: https://github.com/${{ github.repository }}/tree/gh-pages/${{ env.PR_PATH }}/" + on-closed: + runs-on: ubuntu-latest + if: ${{ github.event.action == 'pull_request_target' }} + env: + PR_PATH: pull/${{github.event.number}} + steps: + - name: Checkout website repo + uses: actions/checkout@v4 + with: + ref: gh-pages + + - name: Delete preview + run: | + git rm -r ${{ env.PR_PATH }} + git commit -m "Delete preview for PR #${{ github.event.number }}" + git push origin gh-pages + + - name: Comment on PR + uses: hasura/comment-progress@v2.2.0 + with: + github-token: ${{ secrets.GITHUB_TOKEN }} + repository: ${{ github.repository }} + number: ${{ github.event.number }} + id: deploy-preview + message: "🪓 PR closed, deleted preview at https://github.com/${{ github.repository }}/tree/gh-pages/${{ env.PR_PATH }}/" + diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 5a5a1511..c27d3578 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -22,6 +22,18 @@ jobs: REF: ${{github.ref}} STATUS: ${{github.event.pull_request.head.repo.full_name != github.repository}} steps: + - name: Save the PR number in an artifact + shell: bash + env: + PULL_REQUEST_NUMBER: ${{ github.event.number }} + run: echo $PULL_REQUEST_NUMBER > pull_request_number.txt + + - name: Upload the PULL REQUEST number + uses: actions/upload-artifact@v2 + with: + name: pull_request_number + path: ./pull_request_number.txt + - name: Checkout website repo uses: actions/checkout@v4 @@ -40,7 +52,7 @@ jobs: make -C . html - name: Upload HTML - uses: actions/upload-artifact@v1 + uses: actions/upload-artifact@v2 with: name: DocumentationHTML path: _build/html/ @@ -55,19 +67,3 @@ jobs: user_email: 'github-actions[bot]@users.noreply.github.com' commit_message: ${{ github.event.head_commit.message }} # cname: ${{ env.DOMAIN # TODO: set this if you're using a custom domain. - - - name: Deploy to PR preview - uses: peaceiris/actions-gh-pages@v3 - if: ${{ github.event.pull_request.head.repo.full_name != '' && github.event.pull_request.head.repo.full_name != github.repository }} - secrets: inherit - with: - deploy_key: ${{ secrets.ACTIONS_DEPLOY_TOKEN }} - external_repository: dipy/preview-html - publish_dir: ./_build/html - publish_branch: main - destination_dir: ${{ env.PR_PATH }} - keep_files: true - user_name: 'github-actions[bot]' - user_email: 'github-actions[bot]@users.noreply.github.com' - commit_message: ${{ github.event.head_commit.message }} - From 1331563895b78797e5bf9ec2a7340eb976957d99 Mon Sep 17 00:00:00 2001 From: Serge Koudoro Date: Thu, 21 Sep 2023 00:33:53 -0400 Subject: [PATCH 06/21] update some preview path --- .github/workflows/preview-html.yml | 45 +++++++++++++++++++----------- 1 file changed, 29 insertions(+), 16 deletions(-) diff --git a/.github/workflows/preview-html.yml b/.github/workflows/preview-html.yml index 7e6bbda8..7eb0f615 100644 --- a/.github/workflows/preview-html.yml +++ b/.github/workflows/preview-html.yml @@ -1,4 +1,4 @@ -name: Comment on the pull request. +name: HTML Preview on: workflow_run: @@ -61,14 +61,23 @@ jobs: if: ${{ github.event.workflow_run.event == 'pull_request' && github.event.workflow_run.conclusion == 'success' }} env: PR_PATH: dipy.org/pull/${{needs.get-pr-number.outputs.output1}} - BASE_URL: https://dipy.github.io/dipy-preview + BASE_URL: https://dipy.github.io/preview-html steps: + - name: Download workflow artifact + uses: dawidd6/action-download-artifact@v2.11.0 + with: + github_token: ${{ secrets.GITHUB_TOKEN }} + workflow: publish.yml + run_id: ${{ github.event.workflow_run.id }} + name: DocumentationHTML + - name: Unzip artifact + run: unzip DocumentationHTML.zip - name: Deploy to PR preview uses: peaceiris/actions-gh-pages@v3 with: deploy_key: ${{ secrets.ACTIONS_DEPLOY_TOKEN }} external_repository: dipy/preview-html - publish_dir: ./_build/html + publish_dir: ./DocumentationHTML publish_branch: main destination_dir: ${{ env.PR_PATH }} keep_files: true @@ -82,30 +91,34 @@ jobs: repository: ${{ github.repository }} number: ${{ needs.get-pr-number.outputs.output1 }} id: deploy-preview - message: "A preview of ${{ github.event.workflow_run.head_commit }} is uploaded and can be seen here:\n\n ✨ ${{ env.BASE_URL }}/${{ env.PR_PATH }} ✨\n\nChanges may take a few minutes to propagate. The source is here: https://github.com/${{ github.repository }}/tree/gh-pages/${{ env.PR_PATH }}/" + message: "A preview of ${{ github.event.workflow_run.head_commit.message }} is uploaded and can be seen here:\n\n ✨ ${{ env.BASE_URL }}/${{ env.PR_PATH }} ✨\n\nChanges may take a few minutes to propagate. The source is here: https://github.com/dipy/preview-html/tree/main/${{ env.PR_PATH }}/" on-closed: runs-on: ubuntu-latest if: ${{ github.event.action == 'pull_request_target' }} env: - PR_PATH: pull/${{github.event.number}} + PR_PATH: dipy.org/pull/${{github.event.number}} steps: - - name: Checkout website repo - uses: actions/checkout@v4 - with: - ref: gh-pages + - name: make empty dir + run: mkdir public - - name: Delete preview - run: | - git rm -r ${{ env.PR_PATH }} - git commit -m "Delete preview for PR #${{ github.event.number }}" - git push origin gh-pages + - name: delete folder + uses: peaceiris/actions-gh-pages@v3 + with: + deploy_key: ${{ secrets.ACTIONS_DEPLOY_TOKEN }} + publish_dir: ./public + publish_branch: main + destination_dir: ${{ env.PR_PATH }} + keep_files: true + user_name: 'github-actions[bot]' + user_email: 'github-actions[bot]@users.noreply.github.com' + commit_message: ${{ github.event.head_commit.message }} - - name: Comment on PR + - name: Update PR Comment uses: hasura/comment-progress@v2.2.0 with: github-token: ${{ secrets.GITHUB_TOKEN }} repository: ${{ github.repository }} number: ${{ github.event.number }} id: deploy-preview - message: "🪓 PR closed, deleted preview at https://github.com/${{ github.repository }}/tree/gh-pages/${{ env.PR_PATH }}/" + message: "🪓 PR closed, deleted preview at https://github.com/dipy/preview-html/tree/main/${{ env.PR_PATH }}/" From 3a064203f09835b5d0d3045c095c0617c6392a89 Mon Sep 17 00:00:00 2001 From: Serge Koudoro Date: Thu, 21 Sep 2023 01:03:44 -0400 Subject: [PATCH 07/21] unzip path --- .github/workflows/preview-html.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/preview-html.yml b/.github/workflows/preview-html.yml index 7eb0f615..5a77e29f 100644 --- a/.github/workflows/preview-html.yml +++ b/.github/workflows/preview-html.yml @@ -70,8 +70,9 @@ jobs: workflow: publish.yml run_id: ${{ github.event.workflow_run.id }} name: DocumentationHTML - - name: Unzip artifact - run: unzip DocumentationHTML.zip + path: ./DocumentationHTML + # - name: Unzip artifact + # run: unzip DocumentationHTML.zip - name: Deploy to PR preview uses: peaceiris/actions-gh-pages@v3 with: From 38f70a9bebf2a5f226e1f1ac98cea41d61dac5ad Mon Sep 17 00:00:00 2001 From: Serge Koudoro Date: Mon, 11 Sep 2023 22:07:19 -0400 Subject: [PATCH 08/21] rm announcement --- index.rst | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/index.rst b/index.rst index 26a989e8..71db6304 100644 --- a/index.rst +++ b/index.rst @@ -31,19 +31,6 @@ Highlights - Large documentation update. Integration of Sphinx-Gallery. - Closed 53 issues and merged 34 pull requests. -See :ref:`Older Highlights `. - -************* -Announcements -************* -- :doc:`DIPY 1.7.0 ` released April 23, 2023. -- :doc:`DIPY 1.6.0 ` released January 16, 2023. -- :doc:`DIPY 1.5.0 ` released March 11, 2022. - - - - - See some of our :ref:`Past Announcements ` From 64c0c366bdd6b1f0c82877c20f0a4e3200d65c0f Mon Sep 17 00:00:00 2001 From: Serge Koudoro Date: Wed, 20 Sep 2023 15:53:30 -0400 Subject: [PATCH 09/21] update url --- conf.py | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/conf.py b/conf.py index b3293b7f..810f9db0 100644 --- a/conf.py +++ b/conf.py @@ -205,7 +205,7 @@ "children": [ { "name": "Newsletters", - "url": "", + "url": "https://mail.python.org/mailman3/lists/dipy.python.org/", "external": True }, { @@ -214,7 +214,7 @@ }, { "name": "Youtube", - "url": "blog", + "url": "https://www.youtube.com/c/diffusionimaginginpython", "external": True } ] @@ -224,11 +224,11 @@ "children": [ { "name": "Live Chat (Gitter)", - "url": "" + "url": "https://app.gitter.im/#/room/%23dipy_dipy:gitter.im" }, { "name": "Github Discussions", - "url": "", + "url": "https://github.com/dipy/dipy/discussions", "external": True } ] @@ -305,15 +305,15 @@ "links": [ { "name": "Developers", - "link": "https://dipy.org/contributors/" + "link": "team" }, { "name": "Support", - "link": "https://dipy.org/contributors/" + "link": "https://github.com/dipy/dipy/discussions" }, { "name": "Download", - "link": "https://dipy.org/contributors/" + "link": "installation" }, { "name": "Get Started", @@ -321,11 +321,11 @@ }, { "name": "Tutorials", - "link": "https://dipy.org/contributors/" + "link": "https://docs.dipy.org/tutorials/" }, { "name": "Videos", - "link": "https://dipy.org/contributors/" + "link": "https://www.youtube.com/c/diffusionimaginginpython" }, ] }, { @@ -333,22 +333,22 @@ "links": [ { "name": "Nipy Projects", - "link": "", + "link": "http://nipy.org/", "external": True }, { "name": "FURY", - "link": "", + "link": "http://fury.gl/", "external": True }, { "name": "Nibabel", - "link": "", + "link": "http://nipy.org/nibabel", "external": True }, { "name": "Tortoise", - "link": "", + "link": "https://tortoise.nibib.nih.gov/", "external": True }, ] @@ -357,22 +357,22 @@ "links": [ { "name": "The department of Intelligent Systems Engineering of Indiana University", - "link": "", + "link": "https://engineering.indiana.edu/", "external": True }, { "name": "The National Institute of Biomedical Imaging and Bioengineering, NIH", - "link": "", + "link": "https://www.nibib.nih.gov/", "external": True }, { "name": "The Gordon and Betty Moore Foundation and the Alfred P. Sloan Foundation, through the University of Washington eScience Institute Data Science Environment", - "link": "", + "link": "https://escience.washington.edu/tag/alfred-p-sloan-foundation/", "external": True }, { "name": "Google supported DIPY through the Google Summer of Code Program during Summer 2015, 2016, 2018", - "link": "", + "link": "https://summerofcode.withgoogle.com/", "external": True }, ] From 39e7b6fc1c8ac1c65ae993fad6d5279a366f38c5 Mon Sep 17 00:00:00 2001 From: Serge Koudoro Date: Wed, 20 Sep 2023 16:16:33 -0400 Subject: [PATCH 10/21] trigger build From 1227d7a85c2147ceb627cbf7dc1fd03b8ba325ab Mon Sep 17 00:00:00 2001 From: Serge Koudoro Date: Thu, 21 Sep 2023 01:21:51 -0400 Subject: [PATCH 11/21] add external info --- conf.py | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/conf.py b/conf.py index 810f9db0..063e6249 100644 --- a/conf.py +++ b/conf.py @@ -309,7 +309,8 @@ }, { "name": "Support", - "link": "https://github.com/dipy/dipy/discussions" + "link": "https://github.com/dipy/dipy/discussions", + "external": True }, { "name": "Download", @@ -321,11 +322,13 @@ }, { "name": "Tutorials", - "link": "https://docs.dipy.org/tutorials/" + "link": "https://docs.dipy.org/tutorials/", + "external": True }, { "name": "Videos", - "link": "https://www.youtube.com/c/diffusionimaginginpython" + "link": "https://www.youtube.com/c/diffusionimaginginpython", + "external": True }, ] }, { From cdf3e8a71aaccc0022c60c7e823a24ff1fc6e0fa Mon Sep 17 00:00:00 2001 From: Serge Koudoro Date: Thu, 21 Sep 2023 09:36:01 -0400 Subject: [PATCH 12/21] update close pr condition --- .github/workflows/preview-html.yml | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/.github/workflows/preview-html.yml b/.github/workflows/preview-html.yml index 5a77e29f..7ab76782 100644 --- a/.github/workflows/preview-html.yml +++ b/.github/workflows/preview-html.yml @@ -4,7 +4,7 @@ on: workflow_run: workflows: ["Github Pages"] types: [in_progress, completed] - pull_request_target: + pull_request: types: [closed] jobs: @@ -71,8 +71,6 @@ jobs: run_id: ${{ github.event.workflow_run.id }} name: DocumentationHTML path: ./DocumentationHTML - # - name: Unzip artifact - # run: unzip DocumentationHTML.zip - name: Deploy to PR preview uses: peaceiris/actions-gh-pages@v3 with: @@ -81,7 +79,6 @@ jobs: publish_dir: ./DocumentationHTML publish_branch: main destination_dir: ${{ env.PR_PATH }} - keep_files: true user_name: 'github-actions[bot]' user_email: 'github-actions[bot]@users.noreply.github.com' commit_message: ${{ github.event.head_commit.message }} @@ -95,7 +92,7 @@ jobs: message: "A preview of ${{ github.event.workflow_run.head_commit.message }} is uploaded and can be seen here:\n\n ✨ ${{ env.BASE_URL }}/${{ env.PR_PATH }} ✨\n\nChanges may take a few minutes to propagate. The source is here: https://github.com/dipy/preview-html/tree/main/${{ env.PR_PATH }}/" on-closed: runs-on: ubuntu-latest - if: ${{ github.event.action == 'pull_request_target' }} + if: ${{ github.event_name == 'pull_request' && github.event.action == 'closed' }} env: PR_PATH: dipy.org/pull/${{github.event.number}} steps: @@ -109,7 +106,6 @@ jobs: publish_dir: ./public publish_branch: main destination_dir: ${{ env.PR_PATH }} - keep_files: true user_name: 'github-actions[bot]' user_email: 'github-actions[bot]@users.noreply.github.com' commit_message: ${{ github.event.head_commit.message }} From 324c08cf93a815af4aca9186cb9cb288d562ad0e Mon Sep 17 00:00:00 2001 From: Serge Koudoro Date: Thu, 21 Sep 2023 12:33:33 -0400 Subject: [PATCH 13/21] let's try with pull request target --- .github/workflows/preview-html.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/preview-html.yml b/.github/workflows/preview-html.yml index 7ab76782..a51e0db5 100644 --- a/.github/workflows/preview-html.yml +++ b/.github/workflows/preview-html.yml @@ -4,7 +4,7 @@ on: workflow_run: workflows: ["Github Pages"] types: [in_progress, completed] - pull_request: + pull_request_target: types: [closed] jobs: From 2ea7b60b7d8b8e9097725a64defe0e2635c1983c Mon Sep 17 00:00:00 2001 From: Serge Koudoro Date: Thu, 21 Sep 2023 12:44:52 -0400 Subject: [PATCH 14/21] remove in-progress --- .github/workflows/preview-html.yml | 26 +++++++++++--------------- 1 file changed, 11 insertions(+), 15 deletions(-) diff --git a/.github/workflows/preview-html.yml b/.github/workflows/preview-html.yml index a51e0db5..1e93fa49 100644 --- a/.github/workflows/preview-html.yml +++ b/.github/workflows/preview-html.yml @@ -3,7 +3,7 @@ name: HTML Preview on: workflow_run: workflows: ["Github Pages"] - types: [in_progress, completed] + types: [completed] pull_request_target: types: [closed] @@ -29,19 +29,6 @@ jobs: id: echo_pr_nb run: echo "pr_number=${{ steps.pull_request_number_reader.outputs.content }}" >> $GITHUB_OUTPUT - in-progress: - runs-on: ubuntu-latest - needs: get-pr-number - if: ${{ github.event.workflow_run.event == 'pull_request' && github.event.workflow_run.status == 'in_progress' }} - steps: - - name: 'Comment on PR - Waiting for deployment' - uses: hasura/comment-progress@v2.3.0 - with: - github-token: ${{ secrets.GITHUB_TOKEN }} - repository: ${{ github.repository }} - number: ${{ needs.get-pr-number.outputs.output1 }} - id: deploy-preview - message: "Starting deployment of preview ⏳..." on-failure: runs-on: ubuntu-latest needs: get-pr-number @@ -55,6 +42,7 @@ jobs: number: ${{ needs.get-pr-number.outputs.output1 }} id: deploy-preview message: "⚠️⚠️⚠️ Build Failed: No preview available." + on-success: runs-on: ubuntu-latest needs: get-pr-number @@ -63,6 +51,14 @@ jobs: PR_PATH: dipy.org/pull/${{needs.get-pr-number.outputs.output1}} BASE_URL: https://dipy.github.io/preview-html steps: + - name: 'Comment on PR - Waiting for deployment' + uses: hasura/comment-progress@v2.3.0 + with: + github-token: ${{ secrets.GITHUB_TOKEN }} + repository: ${{ github.repository }} + number: ${{ needs.get-pr-number.outputs.output1 }} + id: deploy-preview + message: "Starting deployment of preview ⏳..." - name: Download workflow artifact uses: dawidd6/action-download-artifact@v2.11.0 with: @@ -92,7 +88,7 @@ jobs: message: "A preview of ${{ github.event.workflow_run.head_commit.message }} is uploaded and can be seen here:\n\n ✨ ${{ env.BASE_URL }}/${{ env.PR_PATH }} ✨\n\nChanges may take a few minutes to propagate. The source is here: https://github.com/dipy/preview-html/tree/main/${{ env.PR_PATH }}/" on-closed: runs-on: ubuntu-latest - if: ${{ github.event_name == 'pull_request' && github.event.action == 'closed' }} + if: ${{ github.event.action == 'closed' }} env: PR_PATH: dipy.org/pull/${{github.event.number}} steps: From 947b372536c8af33c90389926db3c2bd02a279ef Mon Sep 17 00:00:00 2001 From: Serge Koudoro Date: Thu, 21 Sep 2023 12:57:54 -0400 Subject: [PATCH 15/21] run deploy only under dipy organization --- .github/workflows/publish.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index c27d3578..1ea98d08 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -59,7 +59,7 @@ jobs: - name: Deploy to GitHub Pages uses: peaceiris/actions-gh-pages@v3 - if: ${{ github.event.pull_request.head.repo.full_name == '' || github.event.pull_request.head.repo.full_name == github.repository }} + if: ${{ github.event.pull_request.head.repo.full_name == '' || github.event.pull_request.head.repo.full_name == github.repository && github.repository_owner == 'dipy'}} with: github_token: ${{ secrets.GITHUB_TOKEN }} publish_dir: ./_build/html From a80800fcbf0b1cc1e7135c214e3121bcf1552f59 Mon Sep 17 00:00:00 2001 From: Serge Koudoro Date: Thu, 21 Sep 2023 13:01:53 -0400 Subject: [PATCH 16/21] logical grouping --- .github/workflows/publish.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 1ea98d08..fcb7dbd7 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -59,7 +59,7 @@ jobs: - name: Deploy to GitHub Pages uses: peaceiris/actions-gh-pages@v3 - if: ${{ github.event.pull_request.head.repo.full_name == '' || github.event.pull_request.head.repo.full_name == github.repository && github.repository_owner == 'dipy'}} + if: ${{ (github.event.pull_request.head.repo.full_name == '' || github.event.pull_request.head.repo.full_name == github.repository) && github.repository_owner == 'dipy'}} with: github_token: ${{ secrets.GITHUB_TOKEN }} publish_dir: ./_build/html From 27e38dfb7293c8298c9a0faf799782ca0a8cf530 Mon Sep 17 00:00:00 2001 From: Serge Koudoro Date: Thu, 21 Sep 2023 13:39:06 -0400 Subject: [PATCH 17/21] new strqtegy for close PR --- .github/workflows/preview-html.yml | 31 ------------------------- .github/workflows/publish.yml | 36 ++++++++++++++++++++++++++++++ 2 files changed, 36 insertions(+), 31 deletions(-) diff --git a/.github/workflows/preview-html.yml b/.github/workflows/preview-html.yml index 1e93fa49..1c0996b6 100644 --- a/.github/workflows/preview-html.yml +++ b/.github/workflows/preview-html.yml @@ -4,8 +4,6 @@ on: workflow_run: workflows: ["Github Pages"] types: [completed] - pull_request_target: - types: [closed] jobs: get-pr-number: @@ -86,32 +84,3 @@ jobs: number: ${{ needs.get-pr-number.outputs.output1 }} id: deploy-preview message: "A preview of ${{ github.event.workflow_run.head_commit.message }} is uploaded and can be seen here:\n\n ✨ ${{ env.BASE_URL }}/${{ env.PR_PATH }} ✨\n\nChanges may take a few minutes to propagate. The source is here: https://github.com/dipy/preview-html/tree/main/${{ env.PR_PATH }}/" - on-closed: - runs-on: ubuntu-latest - if: ${{ github.event.action == 'closed' }} - env: - PR_PATH: dipy.org/pull/${{github.event.number}} - steps: - - name: make empty dir - run: mkdir public - - - name: delete folder - uses: peaceiris/actions-gh-pages@v3 - with: - deploy_key: ${{ secrets.ACTIONS_DEPLOY_TOKEN }} - publish_dir: ./public - publish_branch: main - destination_dir: ${{ env.PR_PATH }} - user_name: 'github-actions[bot]' - user_email: 'github-actions[bot]@users.noreply.github.com' - commit_message: ${{ github.event.head_commit.message }} - - - name: Update PR Comment - uses: hasura/comment-progress@v2.2.0 - with: - github-token: ${{ secrets.GITHUB_TOKEN }} - repository: ${{ github.repository }} - number: ${{ github.event.number }} - id: deploy-preview - message: "🪓 PR closed, deleted preview at https://github.com/dipy/preview-html/tree/main/${{ env.PR_PATH }}/" - diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index fcb7dbd7..133902ea 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -5,6 +5,11 @@ on: branches: - master pull_request: + types: [opened, synchronize, edited, reopened] + branches: + - master + pull_request_target: + types: [closed] branches: - master schedule: @@ -12,6 +17,7 @@ on: jobs: deploy: + if: ${{ github.event.action != 'closed' }} runs-on: ubuntu-latest env: PR_PATH: dipy.org/pull/${{github.event.number}} @@ -23,12 +29,14 @@ jobs: STATUS: ${{github.event.pull_request.head.repo.full_name != github.repository}} steps: - name: Save the PR number in an artifact + if: ${{ github.event == 'pull_request' }} shell: bash env: PULL_REQUEST_NUMBER: ${{ github.event.number }} run: echo $PULL_REQUEST_NUMBER > pull_request_number.txt - name: Upload the PULL REQUEST number + if: ${{ github.event == 'pull_request' }} uses: actions/upload-artifact@v2 with: name: pull_request_number @@ -67,3 +75,31 @@ jobs: user_email: 'github-actions[bot]@users.noreply.github.com' commit_message: ${{ github.event.head_commit.message }} # cname: ${{ env.DOMAIN # TODO: set this if you're using a custom domain. + on-closed: + runs-on: ubuntu-latest + if: ${{ github.event.action == 'closed' }} + env: + PR_PATH: dipy.org/pull/${{github.event.number}} + steps: + - name: make empty dir + run: mkdir public + + - name: delete folder + uses: peaceiris/actions-gh-pages@v3 + with: + deploy_key: ${{ secrets.ACTIONS_DEPLOY_TOKEN }} + publish_dir: ./public + publish_branch: main + destination_dir: ${{ env.PR_PATH }} + user_name: 'github-actions[bot]' + user_email: 'github-actions[bot]@users.noreply.github.com' + commit_message: ${{ github.event.head_commit.message }} + + - name: Update PR Comment + uses: hasura/comment-progress@v2.2.0 + with: + github-token: ${{ secrets.GITHUB_TOKEN }} + repository: ${{ github.repository }} + number: ${{ github.event.number }} + id: deploy-preview + message: "🪓 PR closed, deleted preview at https://github.com/dipy/preview-html/tree/main/${{ env.PR_PATH }}/" From 022415656fed7847b8c9a69561eecb39647d3ea0 Mon Sep 17 00:00:00 2001 From: Serge Koudoro Date: Thu, 21 Sep 2023 13:47:11 -0400 Subject: [PATCH 18/21] typo --- .github/workflows/publish.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 133902ea..462f340e 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -29,14 +29,14 @@ jobs: STATUS: ${{github.event.pull_request.head.repo.full_name != github.repository}} steps: - name: Save the PR number in an artifact - if: ${{ github.event == 'pull_request' }} + if: ${{ github.event_name == 'pull_request' }} shell: bash env: PULL_REQUEST_NUMBER: ${{ github.event.number }} run: echo $PULL_REQUEST_NUMBER > pull_request_number.txt - name: Upload the PULL REQUEST number - if: ${{ github.event == 'pull_request' }} + if: ${{ github.event_name == 'pull_request' }} uses: actions/upload-artifact@v2 with: name: pull_request_number From 84a25669716c9ab9b90706017480b3bbd47b1650 Mon Sep 17 00:00:00 2001 From: Serge Koudoro Date: Thu, 21 Sep 2023 14:02:02 -0400 Subject: [PATCH 19/21] add external repo --- .github/workflows/publish.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 462f340e..4986c201 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -88,6 +88,7 @@ jobs: uses: peaceiris/actions-gh-pages@v3 with: deploy_key: ${{ secrets.ACTIONS_DEPLOY_TOKEN }} + external_repository: dipy/preview-html publish_dir: ./public publish_branch: main destination_dir: ${{ env.PR_PATH }} From ffce39820e32dca9ab2070f0ccb83a8a5f124d76 Mon Sep 17 00:00:00 2001 From: Serge Koudoro Date: Thu, 21 Sep 2023 10:51:45 -0400 Subject: [PATCH 20/21] fix some link --- conf.py | 79 +++++++++++++++++++++++++++++++++++---------------------- 1 file changed, 48 insertions(+), 31 deletions(-) diff --git a/conf.py b/conf.py index 063e6249..8908a602 100644 --- a/conf.py +++ b/conf.py @@ -139,63 +139,79 @@ { "name": "Quick Start", "url": "https://docs.dipy.org", + "external": True }, { "name": "Tutorials", "url": "https://docs.dipy.org/tutorials", + "external": True }, { "name": "Recipes", "url": "https://docs.dipy.org/recipes", + "external": True }, { "name": "CLI / Workflows", "url": "https://docs.dipy.org/cli", + "external": True }, { "name": "API", "url": "https://docs.dipy.org/reference", + "external": True }, { "name": "CLI API", "url": "https://docs.dipy.org/cli/reference", + "external": True } ] }, { "name": "Workshops", - "children": [ - { - "name": "DIPY Workshop 2024", - "url": "https://dipy.org/workshops/dipy-workshop-2024", - "external": True - }, - { - "name": "DIPY Workshop 2023", - "url": "https://dipy.org/workshops/dipy-workshop-2023", - "external": True - }, + "section": [ { - "name": "DIPY Workshop 2022", - "url": "https://dipy.org/workshops/dipy-workshop-2022", - "external": True - }, - { - "name": "DIPY Workshop 2021", - "url": "https://dipy.org/workshops/dipy-workshop-2021", - "external": True - }, - { - "name": "DIPY Workshop 2020", - "url": "https://dipy.org/workshops/dipy-workshop-2020", - "external": True + "name": "Latest", + "children": [ + { + "name": "DIPY Workshop 2024", + "url": "https://dipy.org/workshops/dipy-workshop-2024", + "external": True + } + ] }, { - "name": "DIPY Workshop 2019", - "url": "https://dipy.org/workshops/dipy-workshop-2019", - "external": True - }, - ] + "name": "Past", + "children": [ + { + "name": "DIPY Workshop 2023", + "url": "https://dipy.org/workshops/dipy-workshop-2023", + "external": True + }, + { + "name": "DIPY Workshop 2022", + "url": "https://dipy.org/workshops/dipy-workshop-2022", + "external": True + }, + { + "name": "DIPY Workshop 2021", + "url": "https://dipy.org/workshops/dipy-workshop-2021", + "external": True + }, + { + "name": "DIPY Workshop 2020", + "url": "https://dipy.org/workshops/dipy-workshop-2020", + "external": True + }, + { + "name": "DIPY Workshop 2019", + "url": "https://dipy.org/workshops/dipy-workshop-2019", + "external": True + }, + ] + } + ], }, { "name": "Community", @@ -224,7 +240,8 @@ "children": [ { "name": "Live Chat (Gitter)", - "url": "https://app.gitter.im/#/room/%23dipy_dipy:gitter.im" + "url": "https://app.gitter.im/#/room/%23dipy_dipy:gitter.im", + "external": True }, { "name": "Github Discussions", @@ -233,7 +250,7 @@ } ] } - ] + ] }, { "name": "About", From 4ef058b3d741771db6c411fbcbebacdafc31fe7f Mon Sep 17 00:00:00 2001 From: Serge Koudoro Date: Thu, 21 Sep 2023 12:17:18 -0400 Subject: [PATCH 21/21] fix typo --- conf.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conf.py b/conf.py index 8908a602..5e2efa07 100644 --- a/conf.py +++ b/conf.py @@ -170,7 +170,7 @@ }, { "name": "Workshops", - "section": [ + "sections": [ { "name": "Latest", "children": [