Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Switch from 251 to 252 #1791

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Switch from 251 to 252 #1791

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
7ea86fe
update version
guptadivya1501 Oct 1, 2024
58bd306
update code for 252
guptadivya1501 Oct 3, 2024
8dab10a
add more changes
guptadivya1501 Oct 3, 2024
009e8bb
Merge branch 'dgupta/trial' into dgupta/1134558_252
guptadivya1501 Oct 23, 2024
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
2 changes: 2 additions & 0 deletions .github/ISSUE_TEMPLATE/bug.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,8 @@ body:
label: Which DPF/Ansys version are you using?
multiple: true
options:
- 'DPF Server 2025.2.pre0'
PProfizi marked this conversation as resolved.
Show resolved Hide resolved
- 'Ansys 2025 R1'
- 'DPF Server 2025.1.pre0'
- 'Ansys 2024 R2'
- 'DPF Server 2024.2.pre1'
Expand Down
16 changes: 8 additions & 8 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand All @@ -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
Expand All @@ -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

Expand All @@ -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
Expand All @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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"
Expand Down
47 changes: 37 additions & 10 deletions .github/workflows/ci_release.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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' }}
Copy link
Contributor

@PProfizi PProfizi Oct 3, 2024 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@guptadivya1501 We will also need a retro_251 test just like for retro_241. We actually also need a retro_242 which we must have forgotten to set when switching to 251

python_versions: '["3.9", "3.10", "3.11"]'
wheel: ${{ matrix.python-version == '3.9' }}
wheelhouse: true
Expand All @@ -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
Expand All @@ -97,19 +97,39 @@ 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

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

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

Comment on lines +113 to +132
Copy link
Contributor

@PProfizi PProfizi Oct 7, 2024 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
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_251:
name: "retro 251"
uses: ./.github/workflows/tests.yml
with:
ANSYS_VERSION: "251"
python_versions: '["3.9"]'
DOCSTRING: false
secrets: inherit
retro_242:
name: "retro 242"
uses: ./.github/workflows/tests.yml
with:
ANSYS_VERSION: "242"
python_versions: '["3.9"]'
DOCSTRING: false
secrets: inherit

retro_241:
name: "retro 241"
uses: ./.github/workflows/tests.yml
Expand Down Expand Up @@ -147,14 +167,21 @@ jobs:
DOCSTRING: false
secrets: inherit

pydpf-post_251:
name: "PyDPF-Post with 251"
pydpf-post_252:
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@guptadivya1501 We will also need retrocompatibility tests with 251, just like for 242 below

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

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"
Expand Down Expand Up @@ -195,15 +222,15 @@ 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

docker_examples:
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
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/docs.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/examples.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/examples_docker.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/pydpf-post.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/test_docker.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ on:
ANSYS_VERSION:
required: false
type: string
default: "251"
default: "252"
# Can be called manually
workflow_dispatch:
inputs:
Expand All @@ -25,7 +25,7 @@ on:
description: "ANSYS version to run."
required: true
type: string
default: "251"
default: "252"

env:
PACKAGE_NAME: ansys-dpf-core
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/tests.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ on:
ANSYS_VERSION:
required: false
type: string
default: "251"
default: "252"
wheel:
required: false
type: string
Expand Down Expand Up @@ -46,7 +46,7 @@ on:
description: "ANSYS version"
required: true
type: string
default: "251"
default: "252"
wheel:
description: "Generate a wheel"
required: false
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/update_operators.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
12 changes: 6 additions & 6 deletions doc/source/getting_started/dpf_server.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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::
Expand Down Expand Up @@ -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 <target_installing_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<target_to_license_terms>`.
1 change: 1 addition & 0 deletions src/ansys/dpf/core/_version.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@ class ServerToAnsysVersion:
"8.2": "2024R2",
"9.0": "2025R1",
"9.1": "2025R1",
"10.0": "2025R2",
}

def __getitem__(self, item):
Expand Down
2 changes: 1 addition & 1 deletion src/ansys/grpc/dpf/_version.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
"""ansys-grpc-dpf python protocol version"""
__version__ = '0.10.0dev0' # major.minor.patch
__version__ = '0.11.0dev0' # major.minor.patch
Loading