Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
29 commits
Select commit Hold shift + click to select a range
0d2337a
WIP: migrate to pyansys actions
Revathyvenugopal162 Dec 6, 2022
013ec69
WIP: Add release actions
Revathyvenugopal162 Dec 6, 2022
60ec347
WIP: rename package name in favour of release actions
Revathyvenugopal162 Dec 6, 2022
62aca6e
WIP: refactor the deployment
Revathyvenugopal162 Dec 6, 2022
3d4987c
WIP: refactor the actions order
Revathyvenugopal162 Dec 6, 2022
21938ac
WIP: Adapt conf for the multidoc
Revathyvenugopal162 Dec 6, 2022
2d42fcd
resolves code style error
Revathyvenugopal162 Dec 6, 2022
f9fd5ff
Update .github/workflows/ci.yml
Revathyvenugopal162 Dec 6, 2022
68460ee
WIP: Change build file for pdf build
Revathyvenugopal162 Dec 6, 2022
1a074f2
Merge branch 'maint/update-to-pyansys-actions' of https://github.com/…
Revathyvenugopal162 Dec 6, 2022
7030b2f
DBG: show latex dir
jorgepiloto Dec 6, 2022
b7fd9f9
CI: apply double quotes
jorgepiloto Dec 6, 2022
02e2fac
CI: fix cache doc/_build
jorgepiloto Dec 6, 2022
8176aea
WIP: Change _build in validate png module
Revathyvenugopal162 Dec 6, 2022
f8c985c
Merge branch 'maint/update-to-pyansys-actions' of https://github.com/…
Revathyvenugopal162 Dec 6, 2022
247e43a
Update theme
Revathyvenugopal162 Dec 6, 2022
76c1f89
change the html docs name
Revathyvenugopal162 Dec 7, 2022
3aa492a
Update the actions to 2
Revathyvenugopal162 Dec 7, 2022
e87e9a7
MAINT: use ansys-sphinx-theme==0.8.0
jorgepiloto Dec 7, 2022
715f154
Add build env
Revathyvenugopal162 Dec 7, 2022
1e6896e
Add build env
Revathyvenugopal162 Dec 7, 2022
3caf3f9
CI: fix double quotes
jorgepiloto Dec 7, 2022
49fd228
Adapt to double quotes
Revathyvenugopal162 Dec 7, 2022
c73b537
fix typo
Revathyvenugopal162 Dec 7, 2022
9be984e
DBG: avoid cache
jorgepiloto Dec 7, 2022
0da4fa0
DBG: avoid cache
jorgepiloto Dec 7, 2022
670102e
Resolves the package check actions
Revathyvenugopal162 Dec 7, 2022
bd2663c
Merge branch 'maint/update-to-pyansys-actions' of https://github.com/…
Revathyvenugopal162 Dec 7, 2022
e0399c2
CI: update nightly docs
jorgepiloto Dec 7, 2022
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
356 changes: 153 additions & 203 deletions .github/workflows/ci.yml

Large diffs are not rendered by default.

19 changes: 1 addition & 18 deletions .github/workflows/nightly-doc-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,14 +25,6 @@ jobs:
steps:
- uses: actions/checkout@v3

# used for documentation deployment
- name: Get Bot Application Token
id: get_workflow_token
uses: peter-murray/workflow-application-token-action@v2
with:
application_id: ${{ secrets.BOT_APPLICATION_ID }}
application_private_key: ${{ secrets.BOT_APPLICATION_PRIVATE_KEY }}

- name: Setup Python
uses: actions/setup-python@v4.3.0
with:
Expand Down Expand Up @@ -74,15 +66,6 @@ jobs:
pip install .[doc]
xvfb-run make -C doc html

- name: Deploy
uses: JamesIves/github-pages-deploy-action@v4.4.1
with:
repository-name: pyansys/pymapdl-dev-docs
token: ${{ steps.get_workflow_token.outputs.token }}
branch: gh-pages
folder: doc/build/html
clean: true

- name: Display files structure
if: always()
run: |
Expand Down Expand Up @@ -141,4 +124,4 @@ jobs:
steps: ${{ toJson(steps) }}
overwrite: "{
title: `${workflow} failed.`,
}"
}"
24 changes: 12 additions & 12 deletions doc/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
SPHINXOPTS = -j auto
SPHINXBUILD = sphinx-build
SOURCEDIR = source
BUILDDIR = build
LINKCHECKDIR = build/linkcheck
BUILDDIR = _build
LINKCHECKDIR = $(BUILDDIR)/linkcheck

# Put it first so that "make" without argument is like "make help".
help:
Expand Down Expand Up @@ -37,8 +37,8 @@ clean-except-examples:
pdf:
@$(SPHINXBUILD) -M latex "$(SOURCEDIR)" "$(BUILDDIR)" $(SPHINXOPTS) $(O)
python validate_png.py # clean-up GIFs mislabeled as PNG
cd build/latex && latexmk -r latexmkrc -pdf *.tex -interaction=nonstopmode || true
(test -f build/latex/*.pdf && echo pdf exists) || exit 1
cd $(BUILDDIR)/latex && latexmk -r latexmkrc -pdf *.tex -interaction=nonstopmode || true
(test -f $(BUILDDIR)/latex/*.pdf && echo pdf exists) || exit 1

checklinks:
$(SPHINXBUILD) -b linkcheck $(SPHINXOPTS) $(LINKCHECKDIR)
Expand All @@ -53,12 +53,12 @@ deploy:
@echo "This overwrites the history of gh-pages."
@echo "Are you sure? [y/N] " && read ans && [ $${ans:-N} = y ]
@echo "Deploying..."
touch build/html/.nojekyll
touch $(BUILDDIR)/html/.nojekyll
echo "mapdl.docs.pyansys.com" >> build/html/CNAME
cd build/html && git init
cd build/html && git add .
cd build/html && git checkout -b gh-pages
cd build/html && git commit -am "manual build"
cd build/html && git remote add origin https://github.com/pyansys/pymapdl-docs
cd build/html && git push -u origin gh-pages --force
rm -rf build/html/.git
cd $(BUILDDIR)/html && git init
cd $(BUILDDIR)/html && git add .
cd $(BUILDDIR)/html && git checkout -b gh-pages
cd $(BUILDDIR)/html && git commit -am "manual build"
cd $(BUILDDIR)/html && git remote add origin https://github.com/pyansys/pymapdl-docs
cd $(BUILDDIR)/html && git push -u origin gh-pages --force
rm -rf $(BUILDDIR)/html/.git
2 changes: 1 addition & 1 deletion doc/make.bat
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ if "%SPHINXBUILD%" == "" (
set SPHINXBUILD=sphinx-build
)
set SOURCEDIR=source
set BUILDDIR=build
set BUILDDIR=_build
set LINKCHECKDIR=\%BUILDDIR%\linkcheck

if "%1" == "" goto help
Expand Down
10 changes: 8 additions & 2 deletions doc/source/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
import os
import warnings

from ansys_sphinx_theme import pyansys_logo_black
from ansys_sphinx_theme import ansys_favicon, get_version_match, pyansys_logo_black
import numpy as np
import pyvista
from sphinx_gallery.sorting import FileNameSortKey
Expand Down Expand Up @@ -45,6 +45,7 @@

# The short X.Y version
release = version = __version__
cname = os.getenv("DOCUMENTATION_CNAME", "nocname.com")


# -- General configuration ---------------------------------------------------
Expand Down Expand Up @@ -107,7 +108,7 @@
}

# Favicon
html_favicon = "favicon.png"
html_favicon = ansys_favicon

# notfound.extension
notfound_template = "404.rst"
Expand Down Expand Up @@ -205,6 +206,11 @@
"icon": "fa fa-comment fa-fw",
},
],
"switcher": {
"json_url": f"https://{cname}/release/versions.json",
"version_match": get_version_match(__version__),
},
"navbar_end": ["version-switcher", "theme-switcher", "navbar-icon-links"],
}

html_context = {
Expand Down
Binary file removed doc/source/favicon.png
Binary file not shown.
2 changes: 1 addition & 1 deletion doc/validate_png.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
from PIL import Image

this_path = os.path.dirname(os.path.abspath(__file__))
check_path = os.path.join(this_path, "build", "latex")
check_path = os.path.join(this_path, "_build", "latex")
if not os.path.isdir(check_path):
raise FileNotFoundError(f"Invalid path {check_path}")

Expand Down
2 changes: 1 addition & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ doc = [
"Sphinx==5.3.0",
"ansys-dpf-core==0.7.0",
"ansys-mapdl-reader==0.52.3",
"ansys-sphinx-theme==0.7.2",
"ansys-sphinx-theme==0.8.0",
"grpcio==1.43.0",
"imageio-ffmpeg==0.4.7",
"imageio==2.22.4",
Expand Down