Merge branch 'master' into maint/update_code_for_242_on_master

ansys · Nov 14, 2023 · b64f6c6 · b64f6c6
2 parents 19b0999 + db667e9
commit b64f6c6
Show file tree

Hide file tree

Showing 9 changed files with 59 additions and 30 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -81,7 +81,7 @@ jobs:
   tests:
     uses: ./.github/workflows/tests.yml
     with:
-      ANSYS_VERSION: "241"
+      ANSYS_VERSION: "242"
       python_versions: '["3.9"]'
       wheel: true
       wheelhouse: false
@@ -91,7 +91,7 @@ jobs:
   tests_any:
     uses: ./.github/workflows/tests.yml
     with:
-      ANSYS_VERSION: "241"
+      ANSYS_VERSION: "242"
       python_versions: '["3.9"]'
       wheel: true
       wheelhouse: false
@@ -103,15 +103,15 @@ jobs:
     name: "Build and Test on Docker"
     uses: ./.github/workflows/test_docker.yml
     with:
-      ANSYS_VERSION: "241"
+      ANSYS_VERSION: "242"
       standalone_suffix: ${{ github.event.inputs.standalone_branch_suffix || '' }}
     secrets: inherit
 
   docker_examples:
     name: "Run examples on Docker"
     uses: ./.github/workflows/examples_docker.yml
     with:
-      ANSYS_VERSION: "241"
+      ANSYS_VERSION: "242"
       python_versions: '["3.9"]'
       standalone_suffix: ${{ github.event.inputs.standalone_branch_suffix || '' }}
     secrets: inherit
@@ -120,7 +120,7 @@ jobs:
     if: startsWith(github.head_ref, 'master') || github.event.action == 'ready_for_review' || !github.event.pull_request.draft
     uses: ./.github/workflows/docs.yml
     with:
-      ANSYS_VERSION: "241"
+      ANSYS_VERSION: "242"
       standalone_suffix: ${{ github.event.inputs.standalone_branch_suffix || '' }}
       event_name: ${{ github.event_name }}
     secrets: inherit
@@ -157,11 +157,22 @@ jobs:
     if: startsWith(github.head_ref, 'master') || github.event.action == 'ready_for_review' || !github.event.pull_request.draft
     uses: ./.github/workflows/examples.yml
     with:
-      ANSYS_VERSION: "241"
+      ANSYS_VERSION: "242"
       python_versions: '["3.9"]'
       standalone_suffix: ${{ github.event.inputs.standalone_branch_suffix || '' }}
     secrets: inherit
 
+  retro_241:
+    name: "retro 241"
+    if: startsWith(github.head_ref, 'master') || github.event.action == 'ready_for_review' || !github.event.pull_request.draft
+    uses: ./.github/workflows/tests.yml
+    with:
+      ANSYS_VERSION: "241"
+      python_versions: '["3.9"]'
+      DOCSTRING: false
+      standalone_suffix: ''
+    secrets: inherit
+
   retro_232:
     name: "retro 232"
     if: startsWith(github.head_ref, 'master') || github.event.action == 'ready_for_review' || !github.event.pull_request.draft
@@ -198,7 +209,7 @@ jobs:
     if: startsWith(github.head_ref, 'master') || github.event.action == 'ready_for_review' || !github.event.pull_request.draft
     uses: ./.github/workflows/pydpf-post.yml
     with:
-      ANSYS_VERSION: "241"
+      ANSYS_VERSION: "242"
       post_branch: "master"
       standalone_suffix: ${{ github.event.inputs.standalone_branch_suffix || '' }}
       test_docstrings: "true"

diff --git a/.github/workflows/ci_release.yml b/.github/workflows/ci_release.yml
@@ -24,7 +24,7 @@ on:
 #* * * * *
 
 env:
-  ANSYS_VERSION: 241
+  ANSYS_VERSION: 242
   DOCUMENTATION_CNAME: 'dpf.docs.pyansys.com'
   MAIN_PYTHON_VERSION: '3.9'
 
@@ -83,7 +83,7 @@ jobs:
   tests:
     uses: ./.github/workflows/tests.yml
     with:
-      ANSYS_VERSION: "241"
+      ANSYS_VERSION: "242"
       python_versions: '["3.9", "3.10", "3.11"]'
       wheel: true
       wheelhouse: true
@@ -93,7 +93,7 @@ jobs:
   tests_any:
     uses: ./.github/workflows/tests.yml
     with:
-      ANSYS_VERSION: "241"
+      ANSYS_VERSION: "242"
       python_versions: '["3.9", "3.10", "3.11"]'
       wheel: true
       wheelhouse: false
@@ -104,19 +104,28 @@ jobs:
   docs:
     uses: ./.github/workflows/docs.yml
     with:
-      ANSYS_VERSION: "241"
+      ANSYS_VERSION: "242"
       standalone_suffix: ${{ github.event.inputs.standalone_branch_suffix || '.pre0' }}
       event_name: ${{ github.event_name }}
     secrets: inherit
 
   examples:
     uses: ./.github/workflows/examples.yml
     with:
-      ANSYS_VERSION: "241"
+      ANSYS_VERSION: "242"
       python_versions: '["3.9", "3.10", "3.11"]'
       standalone_suffix: ${{ github.event.inputs.standalone_branch_suffix || '.pre0' }}
     secrets: inherit
 
+  retro_241:
+    name: "retro 241"
+    uses: ./.github/workflows/tests.yml
+    with:
+      ANSYS_VERSION: "241"
+      python_versions: '["3.9"]'
+      DOCSTRING: false
+    secrets: inherit
+
   retro_232:
     name: "retro 232"
     uses: ./.github/workflows/tests.yml
@@ -144,6 +153,15 @@ jobs:
       DOCSTRING: false
     secrets: inherit
 
+  pydpf-post_242:
+    name: "PyDPF-Post with 242"
+    uses: ./.github/workflows/pydpf-post.yml
+    with:
+      ANSYS_VERSION: "242"
+      standalone_suffix: ${{ github.event.inputs.standalone_branch_suffix || '.pre0' }}
+      test_docstrings: "true"
+    secrets: inherit
+
   pydpf-post_241:
     name: "PyDPF-Post with 241"
     uses: ./.github/workflows/pydpf-post.yml
@@ -178,15 +196,15 @@ jobs:
     name: "Build and Test on Docker"
     uses: ./.github/workflows/test_docker.yml
     with:
-      ANSYS_VERSION: "241"
+      ANSYS_VERSION: "242"
       standalone_suffix: ${{ github.event.inputs.standalone_branch_suffix || '.pre0' }}
     secrets: inherit
 
   docker_examples:
     name: "Run examples on Docker"
     uses: ./.github/workflows/examples_docker.yml
     with:
-      ANSYS_VERSION: "241"
+      ANSYS_VERSION: "242"
       python_versions: '["3.9", "3.10", "3.11"]'
       standalone_suffix: ${{ github.event.inputs.standalone_branch_suffix || '.pre0' }}
     secrets: inherit

diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml
@@ -11,7 +11,7 @@ on:
       ANSYS_VERSION:
         required: false
         type: string
-        default: "241"
+        default: "242"
       standalone_suffix:
         description: "Suffix of the branch on standalone"
         required: false
@@ -34,7 +34,7 @@ on:
         description: "ANSYS version"
         required: true
         type: string
-        default: "241"
+        default: "242"
       standalone_suffix:
         description: "Suffix of the branch on standalone"
         required: false

diff --git a/.github/workflows/examples.yml b/.github/workflows/examples.yml
@@ -11,7 +11,7 @@ on:
       ANSYS_VERSION:
         required: false
         type: string
-        default: "241"
+        default: "242"
       standalone_suffix:
         description: "Suffix of the branch on standalone"
         required: false
@@ -29,7 +29,7 @@ on:
         description: "ANSYS version to run."
         required: true
         type: string
-        default: "241"
+        default: "242"
       standalone_suffix:
         description: "Suffix of the branch on standalone"
         required: false

diff --git a/.github/workflows/examples_docker.yml b/.github/workflows/examples_docker.yml
@@ -11,7 +11,7 @@ on:
       ANSYS_VERSION:
         required: false
         type: string
-        default: "241"
+        default: "242"
       standalone_suffix:
         description: "Suffix of the branch on standalone"
         required: false
@@ -29,7 +29,7 @@ on:
         description: "ANSYS version to run."
         required: true
         type: string
-        default: "241"
+        default: "242"
       standalone_suffix:
         description: "Suffix of the branch on standalone"
         required: false

diff --git a/.github/workflows/pydpf-post.yml b/.github/workflows/pydpf-post.yml
@@ -10,7 +10,7 @@ on:
       ANSYS_VERSION:
         required: false
         type: string
-        default: "241"
+        default: "242"
       standalone_suffix:
         description: "Suffix of the branch on standalone"
         required: false
@@ -32,7 +32,7 @@ on:
         description: "ANSYS version"
         required: true
         type: string
-        default: "241"
+        default: "242"
       standalone_suffix:
         description: "Suffix of the branch on standalone"
         required: false

diff --git a/.github/workflows/test_docker.yml b/.github/workflows/test_docker.yml
@@ -12,7 +12,7 @@ on:
       ANSYS_VERSION:
         required: false
         type: string
-        default: "241"
+        default: "242"
 # Can be called manually
   workflow_dispatch:
     inputs:
@@ -25,7 +25,7 @@ on:
         description: "ANSYS version to run."
         required: true
         type: string
-        default: "241"
+        default: "242"
 
 env:
   PACKAGE_NAME: ansys-dpf-core

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -11,7 +11,7 @@ on:
       ANSYS_VERSION:
         required: false
         type: string
-        default: "241"
+        default: "242"
       wheel:
         required: false
         type: string
@@ -46,7 +46,7 @@ on:
         description: "ANSYS version"
         required: true
         type: string
-        default: "231"
+        default: "242"
       wheel:
         description: "Generate a wheel"
         required: false

diff --git a/.github/workflows/update_operators.yml b/.github/workflows/update_operators.yml
@@ -8,7 +8,7 @@ on:
         description: "ANSYS version"
         required: false
         type: string
-        default: "241"
+        default: "242"
       standalone_branch_suffix:
         description: "Suffix of the branch on standalone"
         required: false
@@ -40,7 +40,7 @@ jobs:
         with:
           dpf-standalone-TOKEN: ${{secrets.DPF_PIPELINE}}
           standalone_suffix: ${{ github.event.inputs.standalone_branch_suffix || '' }}
-          ANSYS_VERSION : ${{ github.event.inputs.ANSYS_VERSION || '241' }}
+          ANSYS_VERSION : ${{ github.event.inputs.ANSYS_VERSION || '242' }}
 
       - name: "Update ansys-grpc-dpf"
         shell: bash
@@ -123,9 +123,9 @@ jobs:
             src/ansys/dpf/core/operators/*
             docs/source/_static/dpf_operators.html
           commit-message: update generated code
-          title: Update generated code for DPF ${{ github.event.inputs.ANSYS_VERSION || '241' }}${{ github.event.inputs.standalone_branch_suffix || '' }} on ${{ github.ref_name }}
+          title: Update generated code for DPF ${{ github.event.inputs.ANSYS_VERSION || '242' }}${{ github.event.inputs.standalone_branch_suffix || '' }} on ${{ github.ref_name }}
           body: An update of generated code has been triggered either manually or by an update in the dpf-standalone repository.
-          branch: maint/update_code_for_${{ github.event.inputs.ANSYS_VERSION || '241' }}${{ github.event.inputs.standalone_branch_suffix || '' }}_on_${{ github.ref_name }}
+          branch: maint/update_code_for_${{ github.event.inputs.ANSYS_VERSION || '242' }}${{ github.event.inputs.standalone_branch_suffix || '' }}_on_${{ github.ref_name }}
           labels: maintenance
 
       - name: "Kill all servers"