Skip to content

Commit 23b57d7

Browse files
authored
Merge branch 'master' into dependabot/pip/requirements/pypandoc-1.11
2 parents 359981b + 2c000e3 commit 23b57d7

File tree

104 files changed

+5965
-4760
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

104 files changed

+5965
-4760
lines changed

.ci/build_operators_doc.py

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
import ansys.dpf.core as dpf
2+
from ansys.dpf.core.server_context import (
3+
SERVER_CONTEXT,
4+
)
5+
6+
print(f"Server version: {dpf.global_server().version}")
7+
# Generate entry documentation
8+
print("Generating operator documentation")
9+
print(f"Current context: {SERVER_CONTEXT}")
10+
dpf.operators.utility.html_doc(r"../docs/source/_static/dpf_operators.html").eval()
11+
print("Done.\n")

.ci/operator_doc_per_context.py

Lines changed: 0 additions & 20 deletions
This file was deleted.

.github/workflows/docs.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,6 @@ jobs:
8585
run: |
8686
echo "ANSYS_DPF_ACCEPT_LA=Y" >> $GITHUB_ENV
8787
echo "ANSYSLMD_LICENSE_FILE=1055@${{ secrets.LICENSE_SERVER }}" >> $GITHUB_ENV
88-
echo "ANSYS_DPF_SERVER_CONTEXT=PREMIUM" >> $GITHUB_ENV
8988
9089
- name: Setup Python
9190
uses: actions/[email protected]

.github/workflows/pydpf-post.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,6 @@ jobs:
7777
run: |
7878
echo "ANSYS_DPF_ACCEPT_LA=Y" >> $GITHUB_ENV
7979
echo "ANSYSLMD_LICENSE_FILE=1055@${{ secrets.LICENSE_SERVER }}" >> $GITHUB_ENV
80-
echo "ANSYS_DPF_SERVER_CONTEXT=PREMIUM" >> $GITHUB_ENV
8180
8281
- name: "Setup Python"
8382
uses: actions/[email protected]

.github/workflows/test_docker.yml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -173,6 +173,14 @@ jobs:
173173
command: |
174174
pytest $DEBUG $COVERAGE --cov-append $RERUNS --junitxml=../tests/junit/test-results9.xml test_service/.
175175
176+
- name: "Test API Entry"
177+
shell: bash
178+
working-directory: tests
179+
run: |
180+
cd entry
181+
pytest $DEBUG $COVERAGE --cov-append $RERUNS --junitxml=junit/test-results10.xml .
182+
if: always()
183+
176184
- name: "Upload Test Results"
177185
uses: actions/upload-artifact@v3
178186
with:

.github/workflows/tests.yml

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -155,8 +155,6 @@ jobs:
155155
MODULE: ${{env.MODULE}}
156156
PACKAGE_NAME: ${{env.PACKAGE_NAME}}
157157
working-directory: src
158-
env:
159-
ANSYS_DPF_SERVER_CONTEXT: PREMIUM
160158

161159
- name: "Separate long Core tests"
162160
shell: pwsh
@@ -197,7 +195,7 @@ jobs:
197195
- name: "Test API test_server"
198196
uses: nick-fields/retry@v2
199197
with:
200-
timeout_minutes: 2
198+
timeout_minutes: 5
201199
max_attempts: 2
202200
shell: bash
203201
command: |
@@ -285,6 +283,18 @@ jobs:
285283
uses: pyansys/pydpf-actions/[email protected]
286284
if: always()
287285

286+
- name: "Test API Entry"
287+
shell: bash
288+
working-directory: tests
289+
run: |
290+
cd entry
291+
pytest $DEBUG $COVERAGE --cov-append $RERUNS --junitxml=junit/test-results10.xml .
292+
if: always()
293+
294+
- name: "Kill all servers"
295+
uses: pyansys/pydpf-actions/[email protected]
296+
if: always()
297+
288298
- name: "Upload Test Results"
289299
uses: actions/upload-artifact@v3
290300
with:

.github/workflows/update_operators.yml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ jobs:
6666
shell: bash
6767
working-directory: .ci
6868
run: |
69-
python operator_doc_per_context.py
69+
python build_operators_doc.py
7070
timeout-minutes: 5
7171

7272
- name: "Show changes"
@@ -80,8 +80,7 @@ jobs:
8080
delete-branch: true
8181
add-paths: |
8282
src/ansys/dpf/core/operators/*
83-
docs/source/_static/dpf_entry.html
84-
docs/source/_static/dpf_premium.html
83+
docs/source/_static/dpf_operators.html
8584
commit-message: update operators
8685
title: Update Operators for DPF ${{ github.event.inputs.ANSYS_VERSION || '232' }}${{ github.event.inputs.standalone_branch_suffix || '' }} on ${{ github.ref_name }}
8786
body: An update of operators has been triggered either manually or by an update in the dpf-standalone repository.

README.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -41,15 +41,15 @@ without ever leaving the Python environment.
4141

4242
Visit the [DPF-Core Documentation](https://dpfdocs.pyansys.com) for a
4343
detailed description of the library, or see the [Examples
44-
Gallery](https://dpfdocs.pyansys.com/examples/index.html) for more
44+
Gallery](https://dpfdocs.pyansys.com/version/stable/examples/index.html) for more
4545
detailed examples.
4646

4747
## Installation
4848

4949
PyDPF-Core requires DPF to be available, either thanks to a compatible Ansys installation or after installing the
50-
standalone server package ``ansys-dpf-server`` (see [here](https://dpf.docs.pyansys.com/user_guide/getting_started_with_dpf_server.html)).
50+
standalone server package ``ansys-dpf-server`` (see [here](https://dpf.docs.pyansys.com/version/stable/user_guide/getting_started_with_dpf_server.html)).
5151
Compatibility between PyDPF-Core and Ansys is documented
52-
[here](https://dpfdocs.pyansys.com/getting_started/index.html#compatibility).
52+
[here](https://dpfdocs.pyansys.com/version/stable/getting_started/index.html#compatibility).
5353

5454
To use PyDPF-Core with ``ansys-dpf-server`` or Ansys 2021 R2 or later,
5555
install the latest version with this command:
@@ -65,7 +65,7 @@ To install PyDPF-Core with its optional plotting functionalities, use:
6565
pip install ansys-dpf-core[plotting]
6666
```
6767

68-
For more information about PyDPF-Core plotting capabilities, see [Plotting](https://dpf.docs.pyansys.com/user_guide/plotting.html).
68+
For more information about PyDPF-Core plotting capabilities, see [Plotting](https://dpf.docs.pyansys.com/version/stable/user_guide/plotting.html).
6969

7070
To use PyDPF-Core with Ansys 2021 R1, install the latest version
7171
with this command:
@@ -78,7 +78,7 @@ with this command:
7878
### Brief Demo
7979

8080
Provided you have DPF available, either thanks to an Ansys installation or after installing the
81-
standalone server package ``ansys-dpf-server`` (see [here](https://dpf.docs.pyansys.com/user_guide/getting_started_with_dpf_server.html)),
81+
standalone server package ``ansys-dpf-server`` (see [here](https://dpf.docs.pyansys.com/version/stable/user_guide/getting_started_with_dpf_server.html)),
8282
a DPF server will start automatically once you start using PyDPF-Core.
8383

8484
To open a result file and explore what's inside, do:

0 commit comments

Comments
 (0)