From 6584d6f567bc93dfc845dcf72e5241f678cd148e Mon Sep 17 00:00:00 2001 From: Serge Koudoro Date: Fri, 8 Sep 2023 12:50:45 -0400 Subject: [PATCH 01/10] menu update --- conf.py | 138 +++++++++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 136 insertions(+), 2 deletions(-) diff --git a/conf.py b/conf.py index cbb8e485..8f1ee2d8 100644 --- a/conf.py +++ b/conf.py @@ -113,7 +113,7 @@ # The theme to use for HTML and HTML Help pages. Major themes that come with # Sphinx are currently 'default' and 'sphinxdoc'. -html_theme = "pydata_sphinx_theme" +html_theme = "grg_sphinx_theme" # The style sheet to use for HTML and HTML Help pages. A file of that name # must exist either in Sphinx' static/ path, or in one of the custom paths @@ -125,7 +125,141 @@ # documentation. html_theme_options = { "secondary_sidebar_items": ["page-toc"], - "show_toc_level": 2 + "show_toc_level": 2, + "navbar_center": ["components/navbar-links.html"], + "navbar_links": [ + { + "name": "Docs", + "children": [ + { + "name": "Quick Start", + "url": "https://docs.dipy.org", + }, + { + "name": "Tutorials", + "url": "https://docs.dipy.org/tutorials", + }, + { + "name": "Recipes", + "url": "https://docs.dipy.org/recipes", + }, + { + "name": "CLI / Workflows", + "url": "https://docs.dipy.org/cli", + }, + { + "name": "API", + "url": "https://docs.dipy.org/reference", + }, + { + "name": "CLI API", + "url": "https://docs.dipy.org/cli/reference", + } + ] + }, + { + "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 + }, + { + "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", + "sections": [ + { + "name": "News", + "children": [ + { + "name": "Newsletters", + "url": "", + "external": True + }, + { + "name": "Blog", + "url": "blog" + }, + { + "name": "Youtube", + "url": "blog", + "external": True + } + ] + }, + { + "name": "Help", + "children": [ + { + "name": "Live Chat (Gitter)", + "url": "" + }, + { + "name": "Github Discussions", + "url": "", + "external": True + } + ] + } + ] + }, + { + "name": "About", + "children": [ + { + "name": "Team", + "url": "team", + }, + { + "name": "FAQ", + "url": "faq", + }, + { + "name": "Mission Statement", + "url": "mission", + }, + { + "name": "Releases", + "url": "releases", + }, + { + "name": "Cite", + "url": "cite", + }, + { + "name": "Glossary", + "url": "glossary", + }, + ] + }, + ] } # Add any paths that contain custom themes here, relative to this directory. From b3279eed77bd9980ab9f2c0412f5e0045315ec69 Mon Sep 17 00:00:00 2001 From: Serge Koudoro Date: Fri, 8 Sep 2023 15:28:40 -0400 Subject: [PATCH 02/10] update version and secrets name --- .github/workflows/publish.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index ff170144..44c9f8b8 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -21,10 +21,10 @@ jobs: BASE_URL: https://dipy.github.io/dipy.org steps: - name: Comment on PR - uses: hasura/comment-progress@v2.2.0 + uses: hasura/comment-progress@v2.3.0 if: github.ref != 'refs/heads/master' with: - github-token: ${{ secrets.GITHUB_TOKEN }} + github-token: ${{ secrets.GH_TOKEN }} repository: ${{ github.repository }} number: ${{ github.event.number }} id: deploy-preview @@ -77,10 +77,10 @@ jobs: commit_message: ${{ github.event.head_commit.message }} - name: Update comment - uses: hasura/comment-progress@v2.2.0 + uses: hasura/comment-progress@v2.3.0 if: github.ref != 'refs/heads/master' with: - github-token: ${{ secrets.GITHUB_TOKEN }} + github-token: ${{ secrets.GH_TOKEN }} repository: ${{ github.repository }} number: ${{ github.event.number }} id: deploy-preview From 42ab7c0e628c4f2deb0c3f36478a86ca5a3e90c2 Mon Sep 17 00:00:00 2001 From: Serge Koudoro Date: Fri, 8 Sep 2023 15:33:44 -0400 Subject: [PATCH 03/10] update permissions --- .github/workflows/publish.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 44c9f8b8..665e54a7 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -12,6 +12,7 @@ on: permissions: contents: write + pull-requests: write jobs: deploy: @@ -24,7 +25,7 @@ jobs: uses: hasura/comment-progress@v2.3.0 if: github.ref != 'refs/heads/master' with: - github-token: ${{ secrets.GH_TOKEN }} + github-token: ${{ secrets.GITHUB_TOKEN }} repository: ${{ github.repository }} number: ${{ github.event.number }} id: deploy-preview @@ -80,7 +81,7 @@ jobs: uses: hasura/comment-progress@v2.3.0 if: github.ref != 'refs/heads/master' with: - github-token: ${{ secrets.GH_TOKEN }} + github-token: ${{ secrets.GITHUB_TOKEN }} repository: ${{ github.repository }} number: ${{ github.event.number }} id: deploy-preview From cc8578f9854b7de0834130532d4160b7b1ef867c Mon Sep 17 00:00:00 2001 From: Serge Koudoro Date: Fri, 8 Sep 2023 15:37:23 -0400 Subject: [PATCH 04/10] all permissions to see if it works --- .github/workflows/publish.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 665e54a7..b5d18f3d 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -10,9 +10,9 @@ on: schedule: - cron: '0 0 * * 1' -permissions: - contents: write - pull-requests: write +permissions: write-all +# contents: write +# pull-requests: write jobs: deploy: From 677b1c26b2bdabbd45ebdcc02e5f35562cc5d6d4 Mon Sep 17 00:00:00 2001 From: Serge Koudoro Date: Fri, 8 Sep 2023 16:20:52 -0400 Subject: [PATCH 05/10] update permissions --- .github/workflows/publish.yml | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index b5d18f3d..bfc317eb 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -10,13 +10,12 @@ on: schedule: - cron: '0 0 * * 1' -permissions: write-all -# contents: write -# pull-requests: write - jobs: deploy: runs-on: ubuntu-latest + permissions: + contents: write + pull-requests: write env: PR_PATH: pull/${{github.event.number}} BASE_URL: https://dipy.github.io/dipy.org From 4287b4b38379c1eb39148a930e9c8a7ac08d3a1f Mon Sep 17 00:00:00 2001 From: Serge Koudoro Date: Fri, 8 Sep 2023 21:52:16 -0400 Subject: [PATCH 06/10] new test for permissions --- .github/workflows/publish.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index bfc317eb..6177a4a0 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -13,9 +13,9 @@ on: jobs: deploy: runs-on: ubuntu-latest - permissions: - contents: write - pull-requests: write + permissions: write-all + # contents: write + # pull-requests: write env: PR_PATH: pull/${{github.event.number}} BASE_URL: https://dipy.github.io/dipy.org From e42ab24ab2bfddbc935e139abdfa5de441672537 Mon Sep 17 00:00:00 2001 From: Serge Koudoro Date: Fri, 8 Sep 2023 22:46:17 -0400 Subject: [PATCH 07/10] update permissions --- .github/workflows/publish.yml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 6177a4a0..7ea5225d 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -13,9 +13,10 @@ on: jobs: deploy: runs-on: ubuntu-latest - permissions: write-all - # contents: write - # pull-requests: write + permissions: + contents: write + pull-requests: write + issues: 'write' env: PR_PATH: pull/${{github.event.number}} BASE_URL: https://dipy.github.io/dipy.org From f4e4dcc62787777f60d2604297d50aa209b67a64 Mon Sep 17 00:00:00 2001 From: Serge Koudoro Date: Fri, 8 Sep 2023 22:47:04 -0400 Subject: [PATCH 08/10] use string --- .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 7ea5225d..61047a71 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -14,8 +14,8 @@ jobs: deploy: runs-on: ubuntu-latest permissions: - contents: write - pull-requests: write + contents: 'write' + pull-requests: 'write' issues: 'write' env: PR_PATH: pull/${{github.event.number}} From 51b26916a7efc9c57ed111fa592c202037d1e20f Mon Sep 17 00:00:00 2001 From: Serge Koudoro Date: Fri, 8 Sep 2023 22:53:05 -0400 Subject: [PATCH 09/10] change token --- .github/workflows/publish.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 61047a71..656b8387 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -17,6 +17,7 @@ jobs: contents: 'write' pull-requests: 'write' issues: 'write' + id-token: 'write' env: PR_PATH: pull/${{github.event.number}} BASE_URL: https://dipy.github.io/dipy.org @@ -25,7 +26,7 @@ jobs: uses: hasura/comment-progress@v2.3.0 if: github.ref != 'refs/heads/master' with: - github-token: ${{ secrets.GITHUB_TOKEN }} + github-token: ${{ secrets.GH_TOKEN }} repository: ${{ github.repository }} number: ${{ github.event.number }} id: deploy-preview From 7b7743c58191bd25dae92237974ea68e2f01b8b8 Mon Sep 17 00:00:00 2001 From: Serge Koudoro Date: Fri, 8 Sep 2023 23:11:17 -0400 Subject: [PATCH 10/10] back to initial test --- .github/workflows/publish.yml | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 656b8387..a72e9c64 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -10,14 +10,16 @@ on: schedule: - cron: '0 0 * * 1' +permissions: write-all + jobs: deploy: runs-on: ubuntu-latest - permissions: - contents: 'write' - pull-requests: 'write' - issues: 'write' - id-token: 'write' + permissions: write-all + # contents: 'write' + # pull-requests: 'write' + # issues: 'write' + # id-token: 'write' env: PR_PATH: pull/${{github.event.number}} BASE_URL: https://dipy.github.io/dipy.org @@ -26,7 +28,7 @@ jobs: uses: hasura/comment-progress@v2.3.0 if: github.ref != 'refs/heads/master' with: - github-token: ${{ secrets.GH_TOKEN }} + github-token: ${{ secrets.GITHUB_TOKEN }} repository: ${{ github.repository }} number: ${{ github.event.number }} id: deploy-preview