From aea7b247ddc6161bb4892a8f70b64b7d0e193176 Mon Sep 17 00:00:00 2001 From: Peter Sobolewski <76622105+psobolewskiPhD@users.noreply.github.com> Date: Sat, 15 Oct 2022 11:33:59 +0200 Subject: [PATCH 1/6] Try to fix examples build --- docs/conf.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/conf.py b/docs/conf.py index e8e3454e3..986f8bd7d 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -191,7 +191,7 @@ def reset_napari_theme(gallery_conf, fname): sphinx_gallery_conf = { - 'examples_dirs': '../../napari/examples', # path to your example scripts + 'examples_dirs': 'napari/examples', # path to your example scripts 'gallery_dirs': 'gallery', # path to where to save gallery generated output 'filename_pattern': '/*.py', 'ignore_pattern': 'README.rst|/*_.py', From 6eec1c7e3cfec8f73064b47325f16b230c50a004 Mon Sep 17 00:00:00 2001 From: Peter Sobolewski <76622105+psobolewskiPhD@users.noreply.github.com> Date: Sat, 15 Oct 2022 11:54:01 +0200 Subject: [PATCH 2/6] Try to fix build take 2 --- .github/workflows/build_docs.yml | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build_docs.yml b/.github/workflows/build_docs.yml index e385f2527..e505dc709 100644 --- a/.github/workflows/build_docs.yml +++ b/.github/workflows/build_docs.yml @@ -13,14 +13,16 @@ jobs: steps: - name: Clone docs repo uses: actions/checkout@v3 - with: - path: docs - + - name: Clone main repo uses: actions/checkout@v3 with: path: napari repository: napari/napari + + - name: Copy examples to docs folder + run: | + cp -R napari/examples .. - uses: actions/setup-python@v2 with: From c78aaa7465ae33e79a9e65062d69359db85c5071 Mon Sep 17 00:00:00 2001 From: Peter Sobolewski <76622105+psobolewskiPhD@users.noreply.github.com> Date: Sat, 15 Oct 2022 11:56:01 +0200 Subject: [PATCH 3/6] Update conf.py --- docs/conf.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/conf.py b/docs/conf.py index 986f8bd7d..47c885c4b 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -191,7 +191,7 @@ def reset_napari_theme(gallery_conf, fname): sphinx_gallery_conf = { - 'examples_dirs': 'napari/examples', # path to your example scripts + 'examples_dirs': '../examples', # path to your example scripts 'gallery_dirs': 'gallery', # path to where to save gallery generated output 'filename_pattern': '/*.py', 'ignore_pattern': 'README.rst|/*_.py', From 1417fb555c6ee83feb5de36a281d138cf6cd3c25 Mon Sep 17 00:00:00 2001 From: Peter Sobolewski <76622105+psobolewskiPhD@users.noreply.github.com> Date: Sat, 15 Oct 2022 12:03:38 +0200 Subject: [PATCH 4/6] fix paths take 3? --- .github/workflows/build_docs.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build_docs.yml b/.github/workflows/build_docs.yml index e505dc709..858978385 100644 --- a/.github/workflows/build_docs.yml +++ b/.github/workflows/build_docs.yml @@ -22,7 +22,7 @@ jobs: - name: Copy examples to docs folder run: | - cp -R napari/examples .. + cp -R napari/examples . - uses: actions/setup-python@v2 with: @@ -46,7 +46,7 @@ jobs: GOOGLE_CALENDAR_ID: ${{ secrets.GOOGLE_CALENDAR_ID }} GOOGLE_CALENDAR_API_KEY: ${{ secrets.GOOGLE_CALENDAR_API_KEY }} with: - run: make -C docs/ docs + run: make -C docs - name: Upload artifact uses: actions/upload-artifact@v2 From d5c243e787fb375be80acc38aae6c190ca2a30b4 Mon Sep 17 00:00:00 2001 From: Peter Sobolewski <76622105+psobolewskiPhD@users.noreply.github.com> Date: Sat, 15 Oct 2022 12:11:33 +0200 Subject: [PATCH 5/6] try make docs --- .github/workflows/build_docs.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build_docs.yml b/.github/workflows/build_docs.yml index 858978385..2f7eaf81b 100644 --- a/.github/workflows/build_docs.yml +++ b/.github/workflows/build_docs.yml @@ -46,7 +46,7 @@ jobs: GOOGLE_CALENDAR_ID: ${{ secrets.GOOGLE_CALENDAR_ID }} GOOGLE_CALENDAR_API_KEY: ${{ secrets.GOOGLE_CALENDAR_API_KEY }} with: - run: make -C docs + run: make docs - name: Upload artifact uses: actions/upload-artifact@v2 From eb218804aaa075161564d52f458eca447d3d1548 Mon Sep 17 00:00:00 2001 From: Peter Sobolewski <76622105+psobolewskiPhD@users.noreply.github.com> Date: Sat, 15 Oct 2022 12:27:34 +0200 Subject: [PATCH 6/6] fix upload path --- .github/workflows/build_docs.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build_docs.yml b/.github/workflows/build_docs.yml index 2f7eaf81b..0e8aca55b 100644 --- a/.github/workflows/build_docs.yml +++ b/.github/workflows/build_docs.yml @@ -52,4 +52,4 @@ jobs: uses: actions/upload-artifact@v2 with: name: docs - path: docs/docs/_build + path: docs/_build