From 7ea86fe0d33be566fd9bdbd98d44d59310df1d22 Mon Sep 17 00:00:00 2001 From: Divya Gupta Date: Wed, 2 Oct 2024 00:05:35 +0530 Subject: [PATCH 1/3] update version --- src/ansys/dpf/core/_version.py | 1 + src/ansys/grpc/dpf/_version.py | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/src/ansys/dpf/core/_version.py b/src/ansys/dpf/core/_version.py index 77687af6f0e..37236517dd1 100644 --- a/src/ansys/dpf/core/_version.py +++ b/src/ansys/dpf/core/_version.py @@ -43,6 +43,7 @@ class ServerToAnsysVersion: "8.2": "2024R2", "9.0": "2025R1", "9.1": "2025R1", + "10.0": "2025R2", } def __getitem__(self, item): diff --git a/src/ansys/grpc/dpf/_version.py b/src/ansys/grpc/dpf/_version.py index 10264ef4b08..7a4bf6e2977 100644 --- a/src/ansys/grpc/dpf/_version.py +++ b/src/ansys/grpc/dpf/_version.py @@ -1,2 +1,2 @@ """ansys-grpc-dpf python protocol version""" -__version__ = '0.10.0dev0' # major.minor.patch +__version__ = '0.11.0dev0' # major.minor.patch From 58bd3065e04b4f537c673f10f9948376fe346041 Mon Sep 17 00:00:00 2001 From: Divya Gupta Date: Thu, 3 Oct 2024 15:39:00 +0530 Subject: [PATCH 2/3] update code for 252 --- .github/ISSUE_TEMPLATE/bug.yml | 1 + .github/workflows/ci.yml | 16 ++++++++-------- .github/workflows/ci_release.yml | 20 ++++++++++---------- .github/workflows/docs.yml | 4 ++-- .github/workflows/examples.yml | 4 ++-- .github/workflows/examples_docker.yml | 4 ++-- .github/workflows/pydpf-post.yml | 4 ++-- .github/workflows/test_docker.yml | 4 ++-- .github/workflows/tests.yml | 4 ++-- .github/workflows/update_operators.yml | 8 ++++---- doc/source/getting_started/dpf_server.rst | 12 ++++++------ 11 files changed, 41 insertions(+), 40 deletions(-) diff --git a/.github/ISSUE_TEMPLATE/bug.yml b/.github/ISSUE_TEMPLATE/bug.yml index 965739f4d6a..c6cd80a308c 100644 --- a/.github/ISSUE_TEMPLATE/bug.yml +++ b/.github/ISSUE_TEMPLATE/bug.yml @@ -61,6 +61,7 @@ body: label: Which DPF/Ansys version are you using? multiple: true options: + - 'DPF Server 2025.2.pre0' - 'DPF Server 2025.1.pre0' - 'Ansys 2024 R2' - 'DPF Server 2024.2.pre1' diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index bc7cb1b2fb5..dab0273c2a3 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -14,7 +14,7 @@ on: description: "ANSYS version" required: false type: string - default: "251" + default: "252" standalone_branch_suffix: description: 'Suffix of the branch on standalone' required: false @@ -107,7 +107,7 @@ jobs: uses: ./.github/workflows/tests.yml needs: pick_server_suffix with: - ANSYS_VERSION: ${{ github.event.inputs.ansys_version || '251' }} + ANSYS_VERSION: ${{ github.event.inputs.ansys_version || '252' }} python_versions: '["3.9"]' wheel: true wheelhouse: false @@ -118,7 +118,7 @@ jobs: uses: ./.github/workflows/tests.yml needs: pick_server_suffix with: - ANSYS_VERSION: ${{ github.event.inputs.ansys_version || '251' }} + ANSYS_VERSION: ${{ github.event.inputs.ansys_version || '252' }} python_versions: '["3.9"]' wheel: true wheelhouse: false @@ -131,7 +131,7 @@ jobs: uses: ./.github/workflows/test_docker.yml needs: pick_server_suffix with: - ANSYS_VERSION: ${{ github.event.inputs.ansys_version || '251' }} + ANSYS_VERSION: ${{ github.event.inputs.ansys_version || '252' }} standalone_suffix: ${{needs.pick_server_suffix.outputs.suffix}} secrets: inherit @@ -140,7 +140,7 @@ jobs: uses: ./.github/workflows/examples_docker.yml needs: pick_server_suffix with: - ANSYS_VERSION: ${{ github.event.inputs.ansys_version || '251' }} + ANSYS_VERSION: ${{ github.event.inputs.ansys_version || '252' }} python_versions: '["3.9"]' standalone_suffix: ${{needs.pick_server_suffix.outputs.suffix}} secrets: inherit @@ -150,7 +150,7 @@ jobs: uses: ./.github/workflows/docs.yml needs: pick_server_suffix with: - ANSYS_VERSION: ${{ github.event.inputs.ansys_version || '251' }} + ANSYS_VERSION: ${{ github.event.inputs.ansys_version || '252' }} standalone_suffix: ${{needs.pick_server_suffix.outputs.suffix}} event_name: ${{ github.event_name }} secrets: inherit @@ -188,7 +188,7 @@ jobs: uses: ./.github/workflows/examples.yml needs: pick_server_suffix with: - ANSYS_VERSION: ${{ github.event.inputs.ansys_version || '251' }} + ANSYS_VERSION: ${{ github.event.inputs.ansys_version || '252' }} python_versions: '["3.9"]' standalone_suffix: ${{needs.pick_server_suffix.outputs.suffix}} secrets: inherit @@ -252,7 +252,7 @@ jobs: uses: ./.github/workflows/pydpf-post.yml needs: pick_server_suffix with: - ANSYS_VERSION: ${{ github.event.inputs.ansys_version || '251' }} + ANSYS_VERSION: ${{ github.event.inputs.ansys_version || '252' }} post_branch: "master" standalone_suffix: ${{needs.pick_server_suffix.outputs.suffix}} test_docstrings: "true" diff --git a/.github/workflows/ci_release.yml b/.github/workflows/ci_release.yml index b9d7e440e56..87feffefaee 100644 --- a/.github/workflows/ci_release.yml +++ b/.github/workflows/ci_release.yml @@ -11,7 +11,7 @@ on: ansys_version: description: "Ansys version of the standalone." required: false - default: '251' + default: '252' standalone_branch_suffix: description: 'Suffix of the branch on standalone' required: false @@ -76,7 +76,7 @@ jobs: tests: uses: ./.github/workflows/tests.yml with: - ANSYS_VERSION: ${{ github.event.inputs.ansys_version || '251' }} + ANSYS_VERSION: ${{ github.event.inputs.ansys_version || '252' }} python_versions: '["3.9", "3.10", "3.11"]' wheel: ${{ matrix.python-version == '3.9' }} wheelhouse: true @@ -86,7 +86,7 @@ jobs: tests_any: uses: ./.github/workflows/tests.yml with: - ANSYS_VERSION: ${{ github.event.inputs.ansys_version || '251' }} + ANSYS_VERSION: ${{ github.event.inputs.ansys_version || '252' }} python_versions: '["3.9", "3.10", "3.11"]' wheel: ${{ matrix.python-version == '3.9' }} wheelhouse: false @@ -97,7 +97,7 @@ jobs: docs: uses: ./.github/workflows/docs.yml with: - ANSYS_VERSION: ${{ github.event.inputs.ansys_version || '251' }} + ANSYS_VERSION: ${{ github.event.inputs.ansys_version || '252' }} standalone_suffix: ${{ github.event.inputs.standalone_branch_suffix || '.pre0' }} event_name: ${{ github.event_name }} secrets: inherit @@ -105,7 +105,7 @@ jobs: examples: uses: ./.github/workflows/examples.yml with: - ANSYS_VERSION: ${{ github.event.inputs.ansys_version || '251' }} + ANSYS_VERSION: ${{ github.event.inputs.ansys_version || '252' }} python_versions: '["3.9", "3.10", "3.11"]' standalone_suffix: ${{ github.event.inputs.standalone_branch_suffix || '.pre0' }} secrets: inherit @@ -147,11 +147,11 @@ jobs: DOCSTRING: false secrets: inherit - pydpf-post_251: - name: "PyDPF-Post with 251" + pydpf-post_252: + name: "PyDPF-Post with 252" uses: ./.github/workflows/pydpf-post.yml with: - ANSYS_VERSION: ${{ github.event.inputs.ansys_version || '251' }} + ANSYS_VERSION: ${{ github.event.inputs.ansys_version || '252' }} standalone_suffix: ${{ github.event.inputs.standalone_branch_suffix || '.pre0' }} test_docstrings: "true" secrets: inherit @@ -195,7 +195,7 @@ jobs: name: "Build and Test on Docker" uses: ./.github/workflows/test_docker.yml with: - ANSYS_VERSION: ${{ github.event.inputs.ansys_version || '251' }} + ANSYS_VERSION: ${{ github.event.inputs.ansys_version || '252' }} standalone_suffix: ${{ github.event.inputs.standalone_branch_suffix || '.pre0' }} secrets: inherit @@ -203,7 +203,7 @@ jobs: name: "Run examples on Docker" uses: ./.github/workflows/examples_docker.yml with: - ANSYS_VERSION: ${{ github.event.inputs.ansys_version || '251' }} + ANSYS_VERSION: ${{ github.event.inputs.ansys_version || '252' }} 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 index 242cfcaadfd..5f517caafe8 100644 --- a/.github/workflows/docs.yml +++ b/.github/workflows/docs.yml @@ -11,7 +11,7 @@ on: ANSYS_VERSION: required: false type: string - default: "251" + default: "252" standalone_suffix: description: "Suffix of the branch on standalone" required: false @@ -34,7 +34,7 @@ on: description: "ANSYS version" required: true type: string - default: "251" + default: "252" standalone_suffix: description: "Suffix of the branch on standalone" required: false diff --git a/.github/workflows/examples.yml b/.github/workflows/examples.yml index 037a56bcd4c..9b262f7e5c0 100644 --- a/.github/workflows/examples.yml +++ b/.github/workflows/examples.yml @@ -11,7 +11,7 @@ on: ANSYS_VERSION: required: false type: string - default: "251" + default: "252" 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: "251" + default: "252" 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 index 3c8ea4f51d8..62e306011b3 100644 --- a/.github/workflows/examples_docker.yml +++ b/.github/workflows/examples_docker.yml @@ -11,7 +11,7 @@ on: ANSYS_VERSION: required: false type: string - default: "251" + default: "252" 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: "251" + default: "252" 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 index 77e4957b3f3..6c94a614fe7 100644 --- a/.github/workflows/pydpf-post.yml +++ b/.github/workflows/pydpf-post.yml @@ -10,7 +10,7 @@ on: ANSYS_VERSION: required: false type: string - default: "251" + default: "252" standalone_suffix: description: "Suffix of the branch on standalone" required: false @@ -32,7 +32,7 @@ on: description: "ANSYS version" required: true type: string - default: "251" + default: "252" 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 index 5cd15b304b7..b0b5da126e5 100644 --- a/.github/workflows/test_docker.yml +++ b/.github/workflows/test_docker.yml @@ -12,7 +12,7 @@ on: ANSYS_VERSION: required: false type: string - default: "251" + default: "252" # Can be called manually workflow_dispatch: inputs: @@ -25,7 +25,7 @@ on: description: "ANSYS version to run." required: true type: string - default: "251" + default: "252" env: PACKAGE_NAME: ansys-dpf-core diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 28928b6d1f9..8cbef2d0f99 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -11,7 +11,7 @@ on: ANSYS_VERSION: required: false type: string - default: "251" + default: "252" wheel: required: false type: string @@ -46,7 +46,7 @@ on: description: "ANSYS version" required: true type: string - default: "251" + default: "252" wheel: description: "Generate a wheel" required: false diff --git a/.github/workflows/update_operators.yml b/.github/workflows/update_operators.yml index 0236e94efcf..ae9298c6fa0 100644 --- a/.github/workflows/update_operators.yml +++ b/.github/workflows/update_operators.yml @@ -14,7 +14,7 @@ on: description: "ANSYS version" required: false type: string - default: "251" + default: "252" standalone_branch_suffix: description: "Suffix of the branch on standalone" required: false @@ -49,7 +49,7 @@ jobs: with: dpf-standalone-TOKEN: ${{secrets.DPF_PIPELINE}} standalone_suffix: ${{ github.event.inputs.standalone_branch_suffix || '' }} - ANSYS_VERSION : ${{ github.event.inputs.ANSYS_VERSION || '251' }} + ANSYS_VERSION : ${{ github.event.inputs.ANSYS_VERSION || '252' }} - name: "Update ansys-grpc-dpf" shell: bash @@ -133,9 +133,9 @@ jobs: src/ansys/dpf/core/operators/* doc/source/_static/dpf_operators.html commit-message: update generated code - title: Update generated code for DPF ${{ github.event.inputs.ANSYS_VERSION || '251' }}${{ github.event.inputs.standalone_branch_suffix || '' }} on ${{ github.ref_name }} + title: Update generated code for DPF ${{ github.event.inputs.ANSYS_VERSION || '252' }}${{ 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 || '251' }}${{ github.event.inputs.standalone_branch_suffix || '' }}_on_${{ github.ref_name }} + branch: maint/update_code_for_${{ github.event.inputs.ANSYS_VERSION || '252' }}${{ github.event.inputs.standalone_branch_suffix || '' }}_on_${{ github.ref_name }} labels: server-sync token: ${{ secrets.PYANSYS_CI_BOT_TOKEN }} reviewers: ansys/dpf_integration_proxies diff --git a/doc/source/getting_started/dpf_server.rst b/doc/source/getting_started/dpf_server.rst index b45ff7fe6df..8183add10a2 100644 --- a/doc/source/getting_started/dpf_server.rst +++ b/doc/source/getting_started/dpf_server.rst @@ -25,11 +25,11 @@ Install DPF Server .. _target_installing_server: -#. Download the ``ansys_dpf_server_win_v2025.1.pre0.zip`` or ``ansys_dpf_server_lin_v2025.1.pre0.zip`` file as appropriate. +#. Download the ``ansys_dpf_server_win_v2025.2.pre0.zip`` or ``ansys_dpf_server_lin_v2025.2.pre0.zip`` file as appropriate. #. Unzip the package. #. Optional: download any other plugin ZIP file as appropriate and unzip the package. For example, to access the ``composites`` plugin for Linux, - download ``ansys_dpf_composites_lin_v2025.1.pre0.zip`` and unzip the package in the same location as ``ansys_dpf_server_lin_v2025.1.pre0.zip``. -#. Change to the root folder (``ansys_dpf_server_win_v2025.1.pre0``) of the unzipped package. + download ``ansys_dpf_composites_lin_v2025.2.pre0.zip`` and unzip the package in the same location as ``ansys_dpf_server_lin_v2025.2.pre0.zip``. +#. Change to the root folder (``ansys_dpf_server_win_v2025.2.pre0``) of the unzipped package. #. In a Python environment, run this command: .. code:: @@ -107,15 +107,15 @@ Run DPF Server in a Docker container ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ DPF Server can be run in a Docker container. -#. Along with the ``ansys_dpf_server_lin_v2025.1.pre0.zip`` file mentioned earlier +#. Along with the ``ansys_dpf_server_lin_v2025.2.pre0.zip`` file mentioned earlier in :ref:`Install DPF Server `, download the ``Dockerfile`` file. #. Optional: download any other plugin ZIP file as appropriate. For example, to access the ``composites`` plugin for Linux, - download ``ansys_dpf_composites_lin_v2025.1.pre0.zip``. + download ``ansys_dpf_composites_lin_v2025.2.pre0.zip``. #. Copy all the ZIP files and ``Dockerfile`` file in a folder and navigate into that folder. #. To build the DPF Docker container, run the following command: .. code:: - docker build . -t dpf-core:v2025.1.pre0 --build-arg DPF_VERSION=251 + docker build . -t dpf-core:v2025.2.pre0 --build-arg DPF_VERSION=252 5. To run the DPF Docker container, license it. For more information, see :ref:`DPF Preview License Agreement`. From 8dab10aa6b5753921345fe8b856cec1841da6131 Mon Sep 17 00:00:00 2001 From: Divya Gupta Date: Thu, 3 Oct 2024 21:09:29 +0530 Subject: [PATCH 3/3] add more changes --- .github/ISSUE_TEMPLATE/bug.yml | 1 + .github/workflows/ci_release.yml | 27 +++++++++++++++++++++++++++ 2 files changed, 28 insertions(+) diff --git a/.github/ISSUE_TEMPLATE/bug.yml b/.github/ISSUE_TEMPLATE/bug.yml index c6cd80a308c..fd70177d80a 100644 --- a/.github/ISSUE_TEMPLATE/bug.yml +++ b/.github/ISSUE_TEMPLATE/bug.yml @@ -62,6 +62,7 @@ body: multiple: true options: - 'DPF Server 2025.2.pre0' + - 'Ansys 2025 R1' - 'DPF Server 2025.1.pre0' - 'Ansys 2024 R2' - 'DPF Server 2024.2.pre1' diff --git a/.github/workflows/ci_release.yml b/.github/workflows/ci_release.yml index 87feffefaee..a3cd5077df0 100644 --- a/.github/workflows/ci_release.yml +++ b/.github/workflows/ci_release.yml @@ -110,6 +110,26 @@ jobs: standalone_suffix: ${{ github.event.inputs.standalone_branch_suffix || '.pre0' }} secrets: inherit + retro_251: + name: "retro 251" + uses: ./.github/workflows/tests.yml + with: + ANSYS_VERSION: "251" + python_versions: '["3.9"]' + standalone_suffix: '.sp01' + DOCSTRING: false + secrets: inherit + + retro_242: + name: "retro 242" + uses: ./.github/workflows/tests.yml + with: + ANSYS_VERSION: "242" + python_versions: '["3.9"]' + standalone_suffix: '.sp01' + DOCSTRING: false + secrets: inherit + retro_241: name: "retro 241" uses: ./.github/workflows/tests.yml @@ -155,6 +175,13 @@ jobs: standalone_suffix: ${{ github.event.inputs.standalone_branch_suffix || '.pre0' }} test_docstrings: "true" secrets: inherit + + pydpf-post_251: + name: "PyDPF-Post with 251" + uses: ./.github/workflows/pydpf-post.yml + with: + ANSYS_VERSION: "251" + secrets: inherit pydpf-post_242: name: "PyDPF-Post with 242"