Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

docs: update sphinx theme #4367

Merged
merged 26 commits into from
Sep 22, 2023
Merged
Show file tree
Hide file tree
Changes from 25 commits
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
3e0a71f
docs: fix tox doc builds
dboddie Jul 12, 2023
675edf7
docs: update Sphinx theme
dboddie Jul 13, 2023
8007c0a
docs: tidied up configuration
dboddie Jul 13, 2023
da4cd8e
docs: install submodule before requirements
dboddie Jul 13, 2023
bc2792e
docs: add missing subrepo
dboddie Jul 13, 2023
d6439b1
docs: fixed broken subrepo URL
dboddie Jul 13, 2023
137eaab
Merge branch 'main' into tox-doc-builds-fix
dboddie Jul 13, 2023
4efe757
docs: use submodules section
dboddie Jul 13, 2023
f7fcca6
Merge branch 'main' into tox-doc-builds-fix
dboddie Jul 13, 2023
3325caf
Merge branch 'main' into update-sphinx-theme
dboddie Jul 13, 2023
5d2ffde
docs: add sphinx-lint to requirements
dboddie Jul 19, 2023
12892a6
Merge branch 'tox-doc-builds-fix' of github.com:dboddie-canonical-wor…
dboddie Jul 19, 2023
558d2e4
Merge branch 'tox-doc-builds-fix' into update-sphinx-theme
dboddie Jul 19, 2023
4b2337b
docs: clean up; fix tox build
dboddie Jul 19, 2023
3fe87fe
Merge branch 'update-sphinx-theme' of github.com:dboddie-canonical-wo…
dboddie Jul 19, 2023
b2f4ea7
docs: avoid mypy warning
dboddie Jul 24, 2023
b049778
docs: lint fix
dboddie Jul 24, 2023
9648370
Merge branch 'main' into update-sphinx-theme
dboddie Jul 27, 2023
da0c6ab
Merge branch 'main' into update-sphinx-theme
dboddie Jul 31, 2023
02fbbc0
Merge branch 'main' into sphinx
sergiusens Sep 18, 2023
f3e238c
ci: fix tox doc environments
mr-cal Sep 22, 2023
4411a8e
Merge branch 'main' into sphinx
mr-cal Sep 22, 2023
5372430
Merge branch 'main' into sphinx
mr-cal Sep 22, 2023
9670947
ci: fix tox doc environments
mr-cal Sep 22, 2023
d340902
ci: fix tox doc environments
mr-cal Sep 22, 2023
72b136a
Update docs/conf.py
mr-cal Sep 22, 2023
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
[submodule "tests/spread/tools/snapd-testing-tools"]
path = tests/spread/tools/snapd-testing-tools
url = https://github.com/snapcore/snapd-testing-tools.git
[submodule "docs/sphinx-resources"]
path = docs/sphinx-resources
url = https://github.com/canonical/sphinx-docs-starter-pack.git
6 changes: 5 additions & 1 deletion .readthedocs.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,10 @@
---
version: 2

submodules:
include:
- docs/sphinx-resources

build:
os: ubuntu-22.04
tools:
Expand All @@ -19,5 +23,5 @@ sphinx:

python:
install:
- requirements: docs/.sphinx/requirements.txt
- requirements: docs/requirements.txt
- requirements: docs/sphinx-resources/.sphinx/requirements.txt
170 changes: 0 additions & 170 deletions docs/.sphinx/_static/custom.css

This file was deleted.

10 changes: 0 additions & 10 deletions docs/.sphinx/requirements.txt

This file was deleted.

24 changes: 0 additions & 24 deletions docs/.sphinx/spellingcheck.yaml

This file was deleted.

27 changes: 19 additions & 8 deletions docs/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,11 @@

# You can set these variables from the command line, and also
# from the environment for the first two.
SPHINXOPTS ?=
SPHINXOPTS ?= -q
SPHINXBUILD ?= sphinx-build
SOURCEDIR = .
BUILDDIR = _build
VENV = .sphinx/venv/bin/activate
VENV = sphinx-resources/.sphinx/venv/bin/activate


# Put it first so that "make" without argument is like "make help".
Expand All @@ -16,8 +16,8 @@ help:

install:
@echo "... setting up virtualenv"
python3 -m venv .sphinx/venv
. $(VENV); pip install --upgrade -r .sphinx/requirements.txt -r requirements.txt
python3 -m venv sphinx-resources/.sphinx/venv
. $(VENV); pip install --upgrade -r sphinx-resources/.sphinx/requirements.txt -r requirements.txt

@echo "\n" \
"--------------------------------------------------------------- \n" \
Expand All @@ -27,25 +27,36 @@ install:
"* clean built doc files: make clean-doc \n" \
"* clean full environment: make clean \n" \
"* check spelling: make spelling \n" \
"* check inclusive language: make woke \n" \
"--------------------------------------------------------------- \n"
run:
. $(VENV); sphinx-autobuild -c . "$(SOURCEDIR)" "$(BUILDDIR)"
. $(VENV); sphinx-autobuild -c . -b html "$(SOURCEDIR)" "$(BUILDDIR)"

html:
. $(VENV); $(SPHINXBUILD) -c . "$(SOURCEDIR)" "$(BUILDDIR)" -w .sphinx/warnings.txt
. $(VENV); $(SPHINXBUILD) -c . -b html "$(SOURCEDIR)" "$(BUILDDIR)" -w sphinx-resources/.sphinx/warnings.txt

epub:
. $(VENV); $(SPHINXBUILD) -c . -b epub "$(SOURCEDIR)" "$(BUILDDIR)" -w sphinx-resources/.sphinx/warnings.txt

serve:
cd "$(BUILDDIR)"; python3 -m http.server 8000

clean: clean-doc
rm -rf .sphinx/venv
rm -rf reference/commands
rm -rf sphinx-resources/.sphinx/venv

clean-doc:
git clean -fx "$(BUILDDIR)"

spelling: html
. $(VENV) ; python3 -m pyspelling -c .sphinx/spellingcheck.yaml
. $(VENV) ; python3 -m pyspelling -c sphinx-resources/.sphinx/spellingcheck.yaml

linkcheck:
. $(VENV) ; $(SPHINXBUILD) -c . -b linkcheck "$(SOURCEDIR)" "$(BUILDDIR)"

woke:
type woke >/dev/null 2>&1 || { snap install woke; exit 1; }
woke *.rst **/*.rst -c https://github.com/canonical-web-and-design/Inclusive-naming/raw/main/config.yml

.PHONY: help Makefile

Expand Down
Loading