Merge with main

ansys · Sep 26, 2024 · 80632f5 · 80632f5
2 parents 18bc00f + 3f3f2f5
commit 80632f5
Show file tree

Hide file tree

Showing 14 changed files with 68 additions and 25 deletions.
diff --git a/.github/release.yml b/.github/release.yml
@@ -0,0 +1,24 @@
+changelog:
+    exclude:
+      authors:
+        - dependabot[bot]
+    categories:
+      - title: Enhancements
+        labels:
+          - enhancement
+      - title: Bug fixes
+        labels:
+          - bug
+      - title: Documentation
+        labels:
+          - documentation
+      - title: Examples
+        labels:
+          - examples
+      - title: CI/CD
+        labels:
+          - CI/CD
+      - title: Maintenance
+        labels:
+          - maintenance
+          - dependencies
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -43,7 +43,7 @@ jobs:
       - uses: actions/checkout@v4
 
       - name: "Setup Python"
-        uses: actions/setup-python@v5.1.0
+        uses: actions/setup-python@v5.2.0
         with:
           python-version: ${{ env.MAIN_PYTHON_VERSION }}
 
@@ -97,6 +97,7 @@ jobs:
 
       - name: "Test Docstrings"
         uses: ansys/pydpf-actions/[email protected]
+        if: ${{ matrix.python-version == env.MAIN_PYTHON_VERSION }}
         with:
           MODULE: ${{env.MODULE}}
           PACKAGE_NAME: ${{env.PACKAGE_NAME}}
@@ -208,7 +209,7 @@ jobs:
     needs: [docs]
     steps:
       - name: "Upload development documentation"
-        uses: ansys/actions/doc-deploy-dev@v6
+        uses: ansys/actions/doc-deploy-dev@v7
         with:
           cname: ${{ env.DOCUMENTATION_CNAME }}
           token: ${{ secrets.GITHUB_TOKEN }}

diff --git a/.github/workflows/ci_release.yml b/.github/workflows/ci_release.yml
@@ -46,7 +46,7 @@ jobs:
       - uses: actions/checkout@v4
 
       - name: "Setup Python"
-        uses: actions/setup-python@v5.1.0
+        uses: actions/setup-python@v5.2.0
         with:
           python-version: ${{ env.MAIN_PYTHON_VERSION }}
 

diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml
@@ -63,7 +63,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
         - name: "Running documentation style checks"
-          uses: ansys/actions/doc-style@v6
+          uses: ansys/actions/doc-style@v7
           with:
             token: ${{ secrets.GITHUB_TOKEN }}
 
@@ -81,7 +81,7 @@ jobs:
           echo "ANSYSLMD_LICENSE_FILE=1055@${{ secrets.LICENSE_SERVER }}" >> $GITHUB_ENV
 
       - name: Setup Python
-        uses: actions/setup-python@v5.1.0
+        uses: actions/setup-python@v5.2.0
         with:
           python-version: ${{ inputs.python_version }}
 

diff --git a/.github/workflows/examples.yml b/.github/workflows/examples.yml
@@ -72,7 +72,7 @@ jobs:
           echo "ANSYSLMD_LICENSE_FILE=1055@${{ secrets.LICENSE_SERVER }}" >> $GITHUB_ENV
 
       - name: Setup Python
-        uses: actions/setup-python@v5.1.0
+        uses: actions/setup-python@v5.2.0
         with:
           python-version: ${{ matrix.python-version }}
 

diff --git a/.github/workflows/releaser.yml b/.github/workflows/releaser.yml
@@ -47,7 +47,7 @@ jobs:
     needs: get_latest_tag
     steps:
       - name: "Download Release Assets"
-        uses: robinraju/release-downloader@v1.10
+        uses: robinraju/release-downloader@v1.11
         with:
           tag: ${{ github.event.inputs.release_tag || needs.get_latest_tag.outputs.version }}
           fileName: "*.whl"
@@ -90,7 +90,7 @@ jobs:
           path: HTML-doc-ansys-dpf-post.zip
 
       - name: "Deploy the stable documentation"
-        uses: ansys/actions/doc-deploy-stable@v6
+        uses: ansys/actions/doc-deploy-stable@v7
         with:
           cname: ${{ env.DOCUMENTATION_CNAME }}
           token: ${{ secrets.GITHUB_TOKEN }}
@@ -122,7 +122,7 @@ jobs:
           echo "VERSION_MEILI=$VERSION_MEILI" >> $GITHUB_ENV
 
       - name: "Deploy the latest documentation index"
-        uses: ansys/actions/doc-deploy-index@v6
+        uses: ansys/actions/doc-deploy-index@v7
         with:
           cname: ${{ env.DOCUMENTATION_CNAME }}/version/${{ env.VERSION }}
           index-name: pydpf-post-v${{ env.VERSION_MEILI }}

diff --git a/requirements/requirements_build.txt b/requirements/requirements_build.txt
@@ -1 +1 @@
-wheel==0.43.0
+wheel==0.44.0
diff --git a/requirements/requirements_docs.txt b/requirements/requirements_docs.txt
@@ -1,16 +1,16 @@
 pypandoc==1.13
-imageio==2.34.0
-numpydoc==1.6.0
-imageio-ffmpeg==0.4.7
+imageio==2.35.1
+numpydoc==1.8.0
+imageio-ffmpeg==0.5.1
 Sphinx<7.2.0; python_version == '3.8'
-Sphinx==7.2.6; python_version >= '3.9'
-sphinx-autobuild==2024.4.16
+Sphinx==8.0.2; python_version >= '3.9'
 sphinxcontrib-napoleon==0.7
-sphinxcontrib-websupport==1.2.7
+sphinxcontrib-websupport==2.0.0
 pytest-sphinx==0.6.3
-sphinx-notfound-page==1.0.0
+sphinx-notfound-page==1.0.4
 sphinx-copybutton==0.5.0
-sphinx-gallery==0.16.0
-ansys_sphinx_theme==0.16.0
-sphinx-autodoc-typehints==2.0.0
-pyvista==0.43.8
+sphinx-gallery==0.17.1
+ansys_sphinx_theme==1.0.11
+sphinx-autodoc-typehints==2.4.4; python_version == '3.8'
+sphinx-autodoc-typehints==2.4.4; python_version >= '3.9'
+pyvista==0.44.1
diff --git a/requirements/requirements_test.txt b/requirements/requirements_test.txt
@@ -1,5 +1,5 @@
-coverage==7.4.3
-pytest-cov==4.0.0
+coverage==7.6.1
+pytest-cov==5.0.0
 pytest-rerunfailures==14.0
-pytest==8.0.1
-pyvista==0.43.8
+pytest==8.3.3
+pyvista==0.44.1
diff --git a/src/ansys/dpf/post/harmonic_mechanical_simulation.py b/src/ansys/dpf/post/harmonic_mechanical_simulation.py
@@ -71,6 +71,7 @@ def _get_result_workflow(
         )
         _connect_initial_results_inputs(
             initial_result_workflow=result_workflows.initial_result_workflow,
+            split_by_body_workflow=result_workflows.split_by_bodies_workflow,
             selection=selection,
             data_sources=self._model.metadata.data_sources,
             streams_provider=self._model.metadata.streams_provider,

diff --git a/src/ansys/dpf/post/modal_mechanical_simulation.py b/src/ansys/dpf/post/modal_mechanical_simulation.py
@@ -58,6 +58,7 @@ def _get_result_workflow(
         )
         _connect_initial_results_inputs(
             initial_result_workflow=result_workflows.initial_result_workflow,
+            split_by_body_workflow=result_workflows.split_by_bodies_workflow,
             selection=selection,
             data_sources=self._model.metadata.data_sources,
             streams_provider=self._model.metadata.streams_provider,

diff --git a/src/ansys/dpf/post/static_mechanical_simulation.py b/src/ansys/dpf/post/static_mechanical_simulation.py
@@ -39,6 +39,7 @@ def _get_result_workflow(
         selection: Union[Selection, None] = None,
         expand_cyclic: Union[bool, List[Union[int, List[int]]]] = True,
         phase_angle_cyclic: Union[float, None] = None,
+        average_across_bodies: bool = True,
     ) -> (core.Workflow, Union[str, list[str], None], str):
         """Generate (without evaluating) the Workflow to extract results."""
         result_workflow_inputs = _create_result_workflow_inputs(
@@ -50,6 +51,7 @@ def _get_result_workflow(
             selection=selection,
             create_operator_callable=self._model.operator,
             mesh_provider=self._model.metadata.mesh_provider,
+            average_across_bodies=average_across_bodies,
         )
         result_workflows = _create_result_workflows(
             server=self._model._server,
@@ -114,6 +116,7 @@ def _get_result(
         phase_angle_cyclic: Union[float, None] = None,
         external_layer: Union[bool, List[int]] = False,
         skin: Union[bool, List[int]] = False,
+        average_across_bodies: bool = True,
     ) -> DataFrame:
         """Extract results from the simulation.
 
@@ -226,6 +229,7 @@ def _get_result(
             selection=selection,
             expand_cyclic=expand_cyclic,
             phase_angle_cyclic=phase_angle_cyclic,
+            average_across_bodies=average_across_bodies,
         )
 
         # Evaluate  the workflow

diff --git a/src/ansys/dpf/post/transient_mechanical_simulation.py b/src/ansys/dpf/post/transient_mechanical_simulation.py
@@ -56,6 +56,7 @@ def _get_result_workflow(
         )
         _connect_initial_results_inputs(
             initial_result_workflow=result_workflows.initial_result_workflow,
+            split_by_body_workflow=result_workflows.split_by_bodies_workflow,
             selection=selection,
             data_sources=self._model.metadata.data_sources,
             streams_provider=self._model.metadata.streams_provider,

diff --git a/tests/conftest.py b/tests/conftest.py
@@ -211,6 +211,17 @@ def grpc_server():
     server.shutdown()
 
 
+@pytest.fixture(scope="session", autouse=True)
+def license_context():
+    if SERVERS_VERSION_GREATER_THAN_OR_EQUAL_TO_6_2:
+        with core.LicenseContextManager(
+            increment_name="preppost", license_timeout_in_seconds=1.0
+        ):
+            yield
+    else:
+        yield
+
+
 SERVERS_VERSION_GREATER_THAN_OR_EQUAL_TO_9_0 = meets_version(
     get_server_version(core._global_server()), "9.0"
 )