Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
31 changes: 0 additions & 31 deletions .github/workflows/docs-style.yml

This file was deleted.

26 changes: 14 additions & 12 deletions .github/workflows/docs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -60,10 +60,12 @@ env:
jobs:
doc-style:
name: "Check doc style"
uses: ./.github/workflows/docs-style.yml
with:
vale_reporter: ${{ (inputs.event_name == 'pull_request') && 'github-check' || 'local' }}
secrets: inherit
runs-on: ubuntu-latest
steps:
- name: "Running documentation style checks"
uses: ansys/actions/[email protected]
with:
token: ${{ secrets.GITHUB_TOKEN }}

docs:
name: "Documentation"
Expand Down Expand Up @@ -119,11 +121,11 @@ jobs:
shell: bash
run: |
export SPHINX_APIDOC_OPTIONS=inherited-members
sphinx-apidoc -o docs/source/api src/ansys ${{inputs.build_extras}} -f --implicit-namespaces --separate --no-headings $DEBUG_SPHINX
sphinx-apidoc -o doc/source/api src/ansys ${{inputs.build_extras}} -f --implicit-namespaces --separate --no-headings $DEBUG_SPHINX

- name: "Build HTML Documentation"
shell: bash
working-directory: docs
working-directory: doc
run: |
export TEMP=${{ runner.temp }}
make clean
Expand All @@ -132,7 +134,7 @@ jobs:

- name: "Check for success"
shell: bash
working-directory: docs
working-directory: doc
run: |
case `tail -n 5 log.txt | grep -F "build succeeded" >/dev/null; echo $?` in
0)
Expand All @@ -148,7 +150,7 @@ jobs:

- name: "Build PDF Documentation"
shell: bash
working-directory: docs
working-directory: doc
if: ${{ inputs.generate_pdf == 'true' }}
run: |
export TEMP=${{ runner.temp }}
Expand All @@ -159,13 +161,13 @@ jobs:
uses: actions/upload-artifact@v4
with:
name: doc-${{env.PACKAGE_NAME}}-log
path: docs/*.txt
path: doc/*.txt
if: always()

- name: "Zip HTML Documentation"
uses: vimtor/[email protected]
with:
files: docs/build/html/
files: doc/build/html/
dest: HTML-doc-${{env.PACKAGE_NAME}}.zip
if: always()

Expand All @@ -180,7 +182,7 @@ jobs:
shell: bash
if: ${{ inputs.generate_pdf == 'true' }}
id: pdf
working-directory: docs/build/latex
working-directory: doc/build/latex
run: |
pattern="PyDPF-*.pdf"
files=( $pattern )
Expand All @@ -191,7 +193,7 @@ jobs:
uses: vimtor/[email protected]
if: ${{ inputs.generate_pdf == 'true' }}
with:
files: docs/build/latex/${{ steps.pdf.outputs.PDF_file }}
files: doc/build/latex/${{ steps.pdf.outputs.PDF_file }}
dest: PDF-doc-${{env.PACKAGE_NAME}}.zip

- name: "Upload PDF Documentation"
Expand Down
6 changes: 3 additions & 3 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -71,9 +71,9 @@ instance/
.scrapy

# Sphinx documentation
docs/build/
docs/source/api/_autosummary
docs/source/examples
doc/build/
doc/source/api/_autosummary
doc/source/examples

# PyBuilder
.pybuilder/
Expand Down
4 changes: 2 additions & 2 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
exclude: |
(?x)^(
docs/styles/
doc/styles/
)
repos:
- repo: https://github.com/psf/black
Expand Down Expand Up @@ -28,7 +28,7 @@ repos:
hooks:
- id: codespell
args: [
"docs src",
"doc src",
"*.py *.rst *.md",
]
exclude: conf.py
Expand Down
2 changes: 1 addition & 1 deletion codecov.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,5 +15,5 @@ coverage:
if_no_uploads: error
ignore:
- "examples" # ignore folder and all its contents
- "docs" # ignore folder and all its contents
- "doc" # ignore folder and all its contents
- "tests" # ignore folder and all its contents
86 changes: 43 additions & 43 deletions docs/.vale.ini → doc/.vale.ini
Original file line number Diff line number Diff line change
@@ -1,43 +1,43 @@
# Core settings
# =============
# Location of our `styles`
StylesPath = "styles"
# The options are `suggestion`, `warning`, or `error` (defaults to “warning”).
MinAlertLevel = warning
# By default, `code` and `tt` are ignored.
IgnoredScopes = code, tt
# By default, `script`, `style`, `pre`, and `figure` are ignored.
SkippedScopes = script, style, pre, figure
# WordTemplate specifies what Vale will consider to be an individual word.
WordTemplate = \b(?:%s)\b
# List of Packages to be used for our guidelines
Packages = Google
# Define the Ansys vocabulary
Vocab = ANSYS
[*.{md,rst}]
# Apply the following styles
BasedOnStyles = Vale, Google
# Removing Google-specific rule - Not applicable under some circumstances
Google.WordList = NO
Google.Colons = NO
[formats]
# Format associations appear under
# the optional "formats" section.
[*]
# Format-specific settings appear
# under a user-provided "glob"
# pattern.
TokenIgnores = (:.*:\x60.*\x60)
# Core settings
# =============

# Location of our `styles`
StylesPath = "styles"

# The options are `suggestion`, `warning`, or `error` (defaults to “warning”).
MinAlertLevel = warning

# By default, `code` and `tt` are ignored.
IgnoredScopes = code, tt

# By default, `script`, `style`, `pre`, and `figure` are ignored.
SkippedScopes = script, style, pre, figure

# WordTemplate specifies what Vale will consider to be an individual word.
WordTemplate = \b(?:%s)\b

# List of Packages to be used for our guidelines
Packages = Google

# Define the Ansys vocabulary
Vocab = ANSYS

[*.{md,rst}]

# Apply the following styles
BasedOnStyles = Vale, Google

# Removing Google-specific rule - Not applicable under some circumstances
Google.WordList = NO
Google.Colons = NO

[formats]
# Format associations appear under
# the optional "formats" section.

[*]
# Format-specific settings appear
# under a user-provided "glob"
# pattern.
TokenIgnores = (:.*:\x60.*\x60)

File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes
File renamed without changes.
File renamed without changes.
File renamed without changes.
6 changes: 3 additions & 3 deletions docs/styles/.gitignore → doc/styles/.gitignore
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
*
!Vocab
!Vocab/**
*
!Vocab
!Vocab/**
!.gitignore
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
[Aa]nsys
[Cc]ore
[Pp]ost
ANSYS
API
HDF5
postprocess
postprocessing
(PyDPF\s|PyDPF-Core|PyDPF-Post)
Pythonic
R1
R2
subresult
subresults
Thermal/electric
UTF-8
VTK
[Aa]nsys
[Cc]ore
[Pp]ost
ANSYS
API
HDF5
postprocess
postprocessing
(PyDPF\s|PyDPF-Core|PyDPF-Post)
Pythonic
R1
R2
subresult
subresults
Thermal/electric
UTF-8
VTK
File renamed without changes.