Skip to content

Commit 82d3661

Browse files
committed
Merge branch 'main' into post_processor_refacto
2 parents 7fd4007 + e9c7290 commit 82d3661

15 files changed

+15
-126
lines changed

.github/workflows/build_documentation.yml

+6
Original file line numberDiff line numberDiff line change
@@ -103,6 +103,12 @@ jobs:
103103
run: |
104104
make -C doc pdf-no-examples
105105
106+
- name: Add assets to HTML docs
107+
run: |
108+
zip -r documentation-html.zip ./doc/_build/html
109+
mv documentation-html.zip ./doc/_build/html/_static/assets/download/
110+
cp doc/_build/latex/PyAEDT-Documentation-*.pdf ./doc/_build/html/_static/assets/download/pyaedt.pdf
111+
106112
- name: Upload documentation PDF artifact
107113
uses: actions/upload-artifact@v4
108114
with:

.pre-commit-config.yaml

+6
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,12 @@ repos:
5858
- id: blacken-docs
5959
additional_dependencies: [black==24.3.0]
6060

61+
# This validates our pre-commit.ci configuration
62+
- repo: https://github.com/pre-commit-ci/pre-commit-ci-config
63+
rev: v1.6.1
64+
hooks:
65+
- id: check-pre-commit-ci-config
66+
6167

6268
# - repo: https://github.com/numpy/numpydoc
6369
# rev: v1.6.0

doc/Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ phtml-no-examples:
3737
pdf:
3838
@$(SPHINXBUILD) -M latex "$(SOURCEDIR)" "$(BUILDDIR)" $(SPHINXOPTS) $(O)
3939
cd $(BUILDDIR)/latex && latexmk -r latexmkrc -pdf *.tex -interaction=nonstopmode || true
40-
(test -f $(BUILDDIR)/latex/pyaedt.pdf && echo pdf exists) || exit 1
40+
(test -f $(BUILDDIR)/latex/PyAEDT-Documentation-*.pdf && echo pdf exists) || exit 1
4141

4242
pdf-no-examples:
4343
export PYAEDT_SKIP_EXAMPLE="1"
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Downloadable assets are stored here.
-3.13 KB
Binary file not shown.

doc/source/_static/assets/index_api.svg

-23
This file was deleted.
-5.33 KB
Binary file not shown.

doc/source/_static/assets/index_contribute.svg

-19
This file was deleted.
-7.83 KB
Binary file not shown.

doc/source/_static/assets/index_examples.svg

-22
This file was deleted.
Binary file not shown.

doc/source/_static/assets/index_getting_started.svg

-25
This file was deleted.
-12.2 KB
Binary file not shown.

doc/source/_static/assets/index_user_guide.svg

-36
This file was deleted.

doc/source/conf.py

+1
Original file line numberDiff line numberDiff line change
@@ -344,6 +344,7 @@ def setup(app):
344344
},
345345
{
346346
"name": "Download documentation in PDF",
347+
# NOTE: Changes to this URL must be reflected in CICD documentation build
347348
"url": f"https://{cname}/version/{switcher_version}/_static/assets/download/pyaedt.pdf",
348349
# noqa: E501
349350
"icon": "fa fa-file-pdf fa-fw",

0 commit comments

Comments
 (0)