From 92369ca6d4030cceb5a0969510e2bf762242754f Mon Sep 17 00:00:00 2001 From: "paul.profizi" Date: Wed, 14 Feb 2024 11:44:16 +0100 Subject: [PATCH 1/4] Move CI_release to 2024.2.pre0 Signed-off-by: paul.profizi --- .github/workflows/ci_release.yml | 51 ++++++++++++++++++++++---------- 1 file changed, 35 insertions(+), 16 deletions(-) diff --git a/.github/workflows/ci_release.yml b/.github/workflows/ci_release.yml index 647485faa9a..688509f2a37 100644 --- a/.github/workflows/ci_release.yml +++ b/.github/workflows/ci_release.yml @@ -8,10 +8,14 @@ on: - cron: "0 13 * * 0" workflow_dispatch: inputs: + ansys_version: + description: "Ansys version of the standalone." + required: false + default: '242' standalone_branch_suffix: description: 'Suffix of the branch on standalone' required: false - default: '.sp01' + default: '.pre0' #┌───────────── minute (0 - 59) #│ ┌───────────── hour (0 - 23) @@ -24,7 +28,6 @@ on: #* * * * * env: - ANSYS_VERSION: 241 DOCUMENTATION_CNAME: 'dpf.docs.pyansys.com' MAIN_PYTHON_VERSION: '3.9' @@ -83,38 +86,47 @@ jobs: tests: uses: ./.github/workflows/tests.yml with: - ANSYS_VERSION: "241" + ANSYS_VERSION: ${{ github.event.inputs.ansys_version || '242' }} python_versions: '["3.9", "3.10", "3.11"]' wheel: true wheelhouse: true - standalone_suffix: ${{ github.event.inputs.standalone_branch_suffix || '.sp01' }} + standalone_suffix: ${{ github.event.inputs.standalone_branch_suffix || '.pre0' }} secrets: inherit tests_any: uses: ./.github/workflows/tests.yml with: - ANSYS_VERSION: "241" + ANSYS_VERSION: ${{ github.event.inputs.ansys_version || '242' }} python_versions: '["3.9", "3.10", "3.11"]' wheel: true wheelhouse: false - standalone_suffix: ${{ github.event.inputs.standalone_branch_suffix || '.sp01' }} + standalone_suffix: ${{ github.event.inputs.standalone_branch_suffix || '.pre0' }} test_any: true secrets: inherit docs: uses: ./.github/workflows/docs.yml with: - ANSYS_VERSION: "241" - standalone_suffix: ${{ github.event.inputs.standalone_branch_suffix || '.sp01' }} + ANSYS_VERSION: ${{ github.event.inputs.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: ${{ github.event.inputs.ansys_version || '242' }} python_versions: '["3.9", "3.10", "3.11"]' - standalone_suffix: ${{ github.event.inputs.standalone_branch_suffix || '.sp01' }} + 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: @@ -144,13 +156,20 @@ jobs: DOCSTRING: false secrets: inherit + pydpf-post_242: + name: "PyDPF-Post with 242" + uses: ./.github/workflows/pydpf-post.yml + with: + ANSYS_VERSION: ${{ github.event.inputs.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 with: ANSYS_VERSION: "241" - standalone_suffix: ${{ github.event.inputs.standalone_branch_suffix || '.sp01' }} - test_docstrings: "true" secrets: inherit pydpf-post_232: @@ -178,17 +197,17 @@ jobs: name: "Build and Test on Docker" uses: ./.github/workflows/test_docker.yml with: - ANSYS_VERSION: "241" - standalone_suffix: ${{ github.event.inputs.standalone_branch_suffix || '.sp01' }} + ANSYS_VERSION: ${{ github.event.inputs.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: ${{ github.event.inputs.ansys_version || '242' }} python_versions: '["3.9", "3.10", "3.11"]' - standalone_suffix: ${{ github.event.inputs.standalone_branch_suffix || '.sp01' }} + standalone_suffix: ${{ github.event.inputs.standalone_branch_suffix || '.pre0' }} secrets: inherit draft_release: From e83003eada353134937d0bcb9b551e7a4760b44b Mon Sep 17 00:00:00 2001 From: Paul Profizi <100710998+PProfizi@users.noreply.github.com> Date: Wed, 14 Feb 2024 15:21:17 +0100 Subject: [PATCH 2/4] Update .github/workflows/ci_release.yml --- .github/workflows/ci_release.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/ci_release.yml b/.github/workflows/ci_release.yml index 688509f2a37..235cd282bec 100644 --- a/.github/workflows/ci_release.yml +++ b/.github/workflows/ci_release.yml @@ -126,6 +126,7 @@ jobs: with: ANSYS_VERSION: "241" python_versions: '["3.9"]' + standalone_suffix: '.sp01' DOCSTRING: false secrets: inherit From 4bc30bfd69f0e09c9e22c3eac4234d40cecf4609 Mon Sep 17 00:00:00 2001 From: "paul.profizi" Date: Wed, 14 Feb 2024 22:47:22 +0100 Subject: [PATCH 3/4] Skip the last start_local_server in a server_factory.py doctest Signed-off-by: paul.profizi Try skip problematic doctest lines Signed-off-by: paul.profizi Try skip problematic doctest line Signed-off-by: paul.profizi Try skip problematic doctest line Signed-off-by: paul.profizi Try skip problematic doctest line Signed-off-by: paul.profizi --- src/ansys/dpf/core/server_factory.py | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/ansys/dpf/core/server_factory.py b/src/ansys/dpf/core/server_factory.py index 3c84c59c88a..459cf404a28 100644 --- a/src/ansys/dpf/core/server_factory.py +++ b/src/ansys/dpf/core/server_factory.py @@ -235,15 +235,15 @@ class ServerConfig: ... protocol=dpf.server_factory.CommunicationProtocols.gRPC, legacy=False) >>> legacy_grpc_config = dpf.ServerConfig( ... protocol=dpf.server_factory.CommunicationProtocols.gRPC, legacy=True) - >>> in_process_server = dpf.start_local_server(config=in_process_config, as_global=False) - >>> grpc_server = dpf.start_local_server(config=grpc_config, as_global=False) - >>> legacy_grpc_server = dpf.start_local_server(config=legacy_grpc_config, as_global=False) + >>> in_process_server = dpf.start_local_server(config=in_process_config, as_global=False) # doctest: +SKIP + >>> grpc_server = dpf.start_local_server(config=grpc_config, as_global=False) # doctest: +SKIP + >>> legacy_grpc_server = dpf.start_local_server(config=legacy_grpc_config, as_global=False) # doctest: +SKIP Use the environment variable to set the default server configuration. >>> import os >>> os.environ["DPF_SERVER_TYPE"] = "INPROCESS" - >>> dpf.start_local_server() + >>> dpf.start_local_server() # doctest: +SKIP """ @@ -358,9 +358,9 @@ class AvailableServerConfigs: >>> in_process_config = dpf.AvailableServerConfigs.InProcessServer >>> grpc_config = dpf.AvailableServerConfigs.GrpcServer >>> legacy_grpc_config = dpf.AvailableServerConfigs.LegacyGrpcServer - >>> in_process_server = dpf.start_local_server(config=in_process_config, as_global=False) - >>> grpc_server = dpf.start_local_server(config=grpc_config, as_global=False) - >>> legacy_grpc_server = dpf.start_local_server(config=legacy_grpc_config, as_global=False) + >>> in_process_server = dpf.start_local_server(config=in_process_config, as_global=False) # doctest: +SKIP + >>> grpc_server = dpf.start_local_server(config=grpc_config, as_global=False) # doctest: +SKIP + >>> legacy_grpc_server = dpf.start_local_server(config=legacy_grpc_config, as_global=False) # doctest: +SKIP """ From ee3921ef95c58c6e53814bf61c3e7b4125614c77 Mon Sep 17 00:00:00 2001 From: "paul.profizi" Date: Thu, 15 Feb 2024 11:53:21 +0100 Subject: [PATCH 4/4] Revert "Skip the last start_local_server in a server_factory.py doctest" This reverts commit 4bc30bfd69f0e09c9e22c3eac4234d40cecf4609. --- src/ansys/dpf/core/server_factory.py | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/ansys/dpf/core/server_factory.py b/src/ansys/dpf/core/server_factory.py index 459cf404a28..3c84c59c88a 100644 --- a/src/ansys/dpf/core/server_factory.py +++ b/src/ansys/dpf/core/server_factory.py @@ -235,15 +235,15 @@ class ServerConfig: ... protocol=dpf.server_factory.CommunicationProtocols.gRPC, legacy=False) >>> legacy_grpc_config = dpf.ServerConfig( ... protocol=dpf.server_factory.CommunicationProtocols.gRPC, legacy=True) - >>> in_process_server = dpf.start_local_server(config=in_process_config, as_global=False) # doctest: +SKIP - >>> grpc_server = dpf.start_local_server(config=grpc_config, as_global=False) # doctest: +SKIP - >>> legacy_grpc_server = dpf.start_local_server(config=legacy_grpc_config, as_global=False) # doctest: +SKIP + >>> in_process_server = dpf.start_local_server(config=in_process_config, as_global=False) + >>> grpc_server = dpf.start_local_server(config=grpc_config, as_global=False) + >>> legacy_grpc_server = dpf.start_local_server(config=legacy_grpc_config, as_global=False) Use the environment variable to set the default server configuration. >>> import os >>> os.environ["DPF_SERVER_TYPE"] = "INPROCESS" - >>> dpf.start_local_server() # doctest: +SKIP + >>> dpf.start_local_server() """ @@ -358,9 +358,9 @@ class AvailableServerConfigs: >>> in_process_config = dpf.AvailableServerConfigs.InProcessServer >>> grpc_config = dpf.AvailableServerConfigs.GrpcServer >>> legacy_grpc_config = dpf.AvailableServerConfigs.LegacyGrpcServer - >>> in_process_server = dpf.start_local_server(config=in_process_config, as_global=False) # doctest: +SKIP - >>> grpc_server = dpf.start_local_server(config=grpc_config, as_global=False) # doctest: +SKIP - >>> legacy_grpc_server = dpf.start_local_server(config=legacy_grpc_config, as_global=False) # doctest: +SKIP + >>> in_process_server = dpf.start_local_server(config=in_process_config, as_global=False) + >>> grpc_server = dpf.start_local_server(config=grpc_config, as_global=False) + >>> legacy_grpc_server = dpf.start_local_server(config=legacy_grpc_config, as_global=False) """