Skip to content

Commit

Permalink
Merge branch 'main' into doc/install_readme
Browse files Browse the repository at this point in the history
  • Loading branch information
clatapie authored Oct 9, 2023
2 parents 9625f1c + 03366ee commit 2ac3a8e
Show file tree
Hide file tree
Showing 5 changed files with 17 additions and 8 deletions.
8 changes: 4 additions & 4 deletions .github/workflows/ci_cd.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ jobs:
name: Code style
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: Set up Python
uses: actions/setup-python@v4
with:
Expand Down Expand Up @@ -66,7 +66,7 @@ jobs:

steps:
- name: "Install Git and checkout project"
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: "Set up Python using cache"
uses: actions/setup-python@v4
Expand All @@ -89,7 +89,7 @@ jobs:
xvfb-run python .ci/display_test.py
- name: Login in Github Container registry
uses: docker/login-action@v2.2.0
uses: docker/login-action@v3.0.0
with:
registry: ghcr.io
username: ${{ github.actor }}
Expand Down Expand Up @@ -222,7 +222,7 @@ jobs:
needs: [style, doc-build] #docs-style
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

- uses: actions/download-artifact@v3

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/label.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:
name: Syncer
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- uses: micnncim/action-label-syncer@v1
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
Expand Down
11 changes: 10 additions & 1 deletion doc/source/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -146,7 +146,11 @@


# must be less than or equal to the XVFB window size
pyvista.rcParams["window_size"] = np.array([1024, 768])
try:
pyvista.global_theme.window_size = np.array([1024, 768])
except AttributeError:
# for compatibility with pyvista < 0.40
pyvista.rcParams["window_size"] = np.array([1024, 768])

# Save figures in specified directory
pyvista.FIGURE_PATH = os.path.join(os.path.abspath("./images/"), "auto-generated/")
Expand Down Expand Up @@ -184,3 +188,8 @@
# Read link all targets from file
with open("links.rst") as f:
rst_epilog += f.read()

# ignore some link checks
linkcheck_ignore = [
"https://ansyshelp.ansys.com/*",
]
2 changes: 1 addition & 1 deletion doc/source/links.rst
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

.. #Other projects
.. _dpf_post_docs: https://post.docs.pyansys.com/
.. _matplotlib_org: _https://matplotlib.org/
.. _matplotlib_org: https://matplotlib.org/
.. _pandas_org: https://pandas.pydata.org/
.. _precommit: https://pre-commit.com/
.. _pypi_org: https://pypi.org/
Expand Down
2 changes: 1 addition & 1 deletion requirements/requirements_doc.txt
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ sphinx-copybutton==0.5.2
jupyter_sphinx==0.4.0
jupyterlab>=3.2.8
sphinxemoji==0.2.0
sphinx-gallery==0.13.0
sphinx-gallery==0.14.0
sphinx-autobuild==2021.3.14
sphinx-autodoc-typehints==1.24.0
sphinx-notfound-page==0.8.3
Expand Down

0 comments on commit 2ac3a8e

Please sign in to comment.