From 2b6bdb380f3c25735f2bce3921da1a0fba6632f3 Mon Sep 17 00:00:00 2001 From: maximlt Date: Tue, 7 Dec 2021 12:53:13 +0100 Subject: [PATCH 1/4] allow to trigger manual docs build of dev or main --- .github/workflows/docs.yml | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml index 1870541faf..8b4f18c064 100644 --- a/.github/workflows/docs.yml +++ b/.github/workflows/docs.yml @@ -7,7 +7,12 @@ on: - 'v[0-9]+.[0-9]+.[0-9]+b[0-9]+' - 'v[0-9]+.[0-9]+.[0-9]+rc[0-9]+' workflow_dispatch: - + inputs: + target: + description: 'dev or main' + required: true + default: 'dev' + jobs: build_docs: name: Documentation @@ -85,13 +90,13 @@ jobs: conda activate test-environment nbsite build --what=html --output=builtdocs --org holoviz --project-name holoviews - name: upload dev - if: (contains(steps.vars.outputs.tag, 'a') || contains(steps.vars.outputs.tag, 'b') || contains(steps.vars.outputs.tag, 'rc')) + if: (github.event.inputs.target == 'dev' || contains(steps.vars.outputs.tag, 'a') || contains(steps.vars.outputs.tag, 'b') || contains(steps.vars.outputs.tag, 'rc')) run: | eval "$(conda shell.bash hook)" conda activate test-environment aws s3 sync --quiet ./builtdocs s3://dev.holoviews.org/ - name: upload main - if: (!(contains(steps.vars.outputs.tag, 'a') || contains(steps.vars.outputs.tag, 'b') || contains(steps.vars.outputs.tag, 'rc'))) + if: (github.event.inputs.target == 'main' || !(contains(steps.vars.outputs.tag, 'a') || contains(steps.vars.outputs.tag, 'b') || contains(steps.vars.outputs.tag, 'rc'))) run: | eval "$(conda shell.bash hook)" conda activate test-environment From ddf0f8862e7835956ba7123e7f40514c5f67482d Mon Sep 17 00:00:00 2001 From: maximlt Date: Tue, 7 Dec 2021 12:53:40 +0100 Subject: [PATCH 2/4] update nbsite and unpin jupyter_client --- .github/workflows/docs.yml | 4 ++-- setup.py | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml index 8b4f18c064..c93b53f007 100644 --- a/.github/workflows/docs.yml +++ b/.github/workflows/docs.yml @@ -24,7 +24,8 @@ jobs: env: DESC: "Documentation build" HV_REQUIREMENTS: "doc" - CHANS_DEV: "-c pyviz/label/dev -c bokeh" + # conda-forge to install myst-nb ... + CHANS_DEV: "-c pyviz/label/dev -c bokeh -c conda-forge" CHANS: "-c pyviz" MPLBACKEND: "Agg" GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} @@ -62,7 +63,6 @@ jobs: conda activate test-environment conda list doit develop_install ${{ env.CHANS_DEV}} -o doc - conda install -c pyviz "jupyter_client<7" conda install -c conda-forge geckodriver selenium awscli - name: doit env_capture run: | diff --git a/setup.py b/setup.py index 3da1a42a09..4b3c858daf 100644 --- a/setup.py +++ b/setup.py @@ -91,7 +91,7 @@ ] extras_require['doc'] = extras_require['examples'] + [ - 'nbsite >=0.6.8a36', + 'nbsite >=0.7.1', 'sphinx', 'sphinx_holoviz_theme', 'mpl_sample_data >=3.1.3', From 6211d7609d4a13d58d67d595d353ada827830204 Mon Sep 17 00:00:00 2001 From: maximlt Date: Wed, 8 Dec 2021 09:28:09 +0100 Subject: [PATCH 3/4] remove bokeh channel and upgrade to py38 --- .github/workflows/docs.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml index c93b53f007..84587f9a3a 100644 --- a/.github/workflows/docs.yml +++ b/.github/workflows/docs.yml @@ -25,7 +25,7 @@ jobs: DESC: "Documentation build" HV_REQUIREMENTS: "doc" # conda-forge to install myst-nb ... - CHANS_DEV: "-c pyviz/label/dev -c bokeh -c conda-forge" + CHANS_DEV: "-c pyviz/label/dev -c conda-forge" CHANS: "-c pyviz" MPLBACKEND: "Agg" GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} @@ -56,7 +56,7 @@ jobs: conda config --set always_yes True conda install -c pyviz "pyctdev>=0.5" doit ecosystem_setup - doit env_create ${{ env.CHANS_DEV}} --python=3.7 + doit env_create ${{ env.CHANS_DEV}} --python=3.8 - name: doit develop_install run: | eval "$(conda shell.bash hook)" From 995578edf2857d648c6e82088af4529ac8dc57b7 Mon Sep 17 00:00:00 2001 From: maximlt Date: Wed, 8 Dec 2021 11:10:13 +0100 Subject: [PATCH 4/4] move ibis-framework to the unit_tests extras --- setup.py | 21 +++++++++++++-------- 1 file changed, 13 insertions(+), 8 deletions(-) diff --git a/setup.py b/setup.py index 4b3c858daf..47bf5e43cb 100644 --- a/setup.py +++ b/setup.py @@ -48,14 +48,6 @@ "scikit-image" ] -if sys.version_info.major > 2: - extras_require["examples"].extend( - [ - "pyarrow", - "ibis-framework >=1.3", - ] # spatialpandas incompatibility - ) - # Extra third-party libraries extras_require["extras"] = extras_require["examples"] + [ "pscript ==0.7.1", @@ -79,6 +71,19 @@ extras_require["unit_tests"] = extras_require["examples"] + extras_require["tests"] +# Moving ibis-framework from `examples` to `unit_tests` +# because it could not be installed on Linux with conda-forge +# (https://github.com/conda-forge/ibis-framework-feedstock/issues/54) +# which was blocking the docs build. ibis-framework isn't +# required to build the docs anyway. +if sys.version_info.major > 2: + extras_require["unit_tests"].extend( + [ + "pyarrow", + "ibis-framework >=1.3", + ] # spatialpandas incompatibility + ) + extras_require["basic_tests"] = ( extras_require["tests"] + ["matplotlib >=3", "bokeh >=1.1.0", "pandas"]