Skip to content

Commit

Permalink
Website updates (#374)
Browse files Browse the repository at this point in the history
  • Loading branch information
maximlt committed Nov 19, 2023
1 parent 12892da commit b72d75c
Show file tree
Hide file tree
Showing 21 changed files with 638 additions and 2,538 deletions.
7 changes: 7 additions & 0 deletions .flake8
@@ -0,0 +1,7 @@
[flake8]
include = *.py
# run_tests.py is generated by conda build, which appears to have a
# bug resulting in code being duplicated a couple of times.
exclude = .git,__pycache__,.tox,.eggs,*.egg,doc,dist,build,_build,.ipynb_checkpoints,run_test.py, preprocessing
ignore = E,
W
36 changes: 13 additions & 23 deletions .github/workflows/docs.yaml
Expand Up @@ -50,6 +50,12 @@ jobs:
MOZ_HEADLESS: 1
DISPLAY: ":99.0"
steps:
- name: Install humor sans fonts for XKCD Matplotlib plots
run: |
sudo apt-get update -y && sudo apt-get install -y fonts-humor-sans fonts-comic-neue ttf-mscorefonts-installer
mkdir -p ~/.local/share/fonts
wget -nc https://github.com/ipython/xkcd-font/blob/master/xkcd-script/font/xkcd-script.ttf?raw=true -O ~/.local/share/fonts/xkcd-Script.ttf || true
sudo fc-cache -f -v
- uses: actions/checkout@v3
with:
fetch-depth: "100"
Expand All @@ -63,32 +69,16 @@ jobs:
run: echo "tag=${GITHUB_REF#refs/*/}" >> $GITHUB_OUTPUT
- name: conda setup
run: |
conda activate base
conda install conda-libmamba-solver
conda config --set solver libmamba
conda create -n test-environment -c pyviz/label/dev -c conda-forge python=3.9 anaconda-project
- name: doit develop_install
run: |
conda activate test-environment
conda list
cd examples
anaconda-project prepare --env-spec doc
cd ..
conda activate examples/envs/doc
pip install --no-deps --no-build-isolation .
conda install anaconda-project
- name: prepare
run: anaconda-project prepare --directory examples
- name: conda list
run: anaconda-project run --directory examples conda_list
- name: generate rst
run: |
conda activate examples/envs/doc
nbsite generate-rst --org holoviz --project-name holoviz --offset 1 --skip envs
run: anaconda-project run --directory examples doc_rst
- name: build docs
run: |
conda activate examples/envs/doc
nbsite build --what=html --output=builtdocs --org holoviz --project-name holoviz
- name: conda info/list
run: |
conda activate examples/envs/doc
conda info
conda list
run: anaconda-project run --directory examples doc_build
- name: git status
run: |
git status
Expand Down
25 changes: 9 additions & 16 deletions .github/workflows/test.yaml
Expand Up @@ -46,20 +46,13 @@ jobs:
run: git fetch --prune --tags --unshallow
- name: conda setup
run: |
conda activate base
conda install conda-libmamba-solver
conda config --set solver libmamba
conda install -c pyviz "pyctdev>=0.5"
conda create -c pyviz --name test-environment python=${{ matrix.python-version }} pyctdev anaconda-project>=0.10.1
- name: doit env_capture
run: |
conda activate test-environment
doit env_capture
- name: doit test_lint
run: |
conda activate test-environment
doit test_lint
- name: doit test_examples
run: |
conda activate test-environment
doit test_examples
conda install "anaconda-project>=0.10.1"
- name: prepare
run: anaconda-project prepare --directory examples
- name: conda list
run: anaconda-project run --directory examples conda_list
- name: lint
run: anaconda-project run --directory examples lint
- name: test
run: anaconda-project run --directory examples test
8 changes: 0 additions & 8 deletions MANIFEST.in

This file was deleted.

73 changes: 0 additions & 73 deletions doc/_static/css/custom.css

This file was deleted.

53 changes: 0 additions & 53 deletions doc/_templates/layout.html

This file was deleted.

22 changes: 12 additions & 10 deletions doc/conf.py
@@ -1,4 +1,5 @@
# -*- coding: utf-8 -*-
import subprocess

from nbsite.shared_conf import *

Expand All @@ -8,15 +9,13 @@
copyright = copyright_fmt.format(**copyright_years)
description = 'High-level tools to simplify visualization in Python.'

import holoviz
version = release = base_version(holoviz.__version__)
ret = subprocess.run([
'git', 'describe', '--long', '--match', "v[0-9]*.[0-9]*.[0-9]*", '--dirty'
], text=True, capture_output=True, check=True)
version = release = base_version(ret.stdout.strip()[1:])

html_static_path += ['_static']

html_css_files = [
'nbsite.css',
'css/custom.css'
]
html_static_path += ['_static']

html_theme = "pydata_sphinx_theme"
html_logo = '_static/holoviz-logo-unstacked.svg'
Expand All @@ -35,11 +34,14 @@
"url": "https://discourse.holoviz.org/",
"icon": "fab fa-discourse",
},
]
],
"header_links_before_dropdown": 6,
"secondary_sidebar_items": [
"github-stars-button",
"page-toc",
],
})

templates_path += ['_templates']

html_context.update({
# Used to add binder links to the latest released tag.
'last_release': f'v{release}',
Expand Down
2 changes: 1 addition & 1 deletion doc/index.rst
Expand Up @@ -86,11 +86,11 @@ If what you see looks relevant to you, you can then follow the steps outlined in
:hidden:
:maxdepth: 2

Introduction <self>
Background <background>
Installation <installation>
Talks <talks/index>
Tutorial <tutorial/index>
Blog <https://blog.holoviz.org/>
Topics <topics/index>
Contributing <contributing>
Roadmap <Roadmap>
Expand Down
25 changes: 0 additions & 25 deletions dodo.py

This file was deleted.

0 comments on commit b72d75c

Please sign in to comment.