Merge branch 'main' into feat/save-as

Author: dipinknair

.github/workflows/ci_cd.yml

@@ -12,9 +12,8 @@ on:
         - '251'
         - '242'
         - '241'
-        - '232'
         description: 'The Mechanical revision number to run tests on.'
-        default: '251' #stable version is 251, must match $stable_container
+        default: '252' #stable version is 252, must match $stable_container
   schedule:
     - cron: '00 22 * * *'  # UTC time, may start 5-15 mins later than scheduled time
   # registry_package:
@@ -38,7 +37,7 @@ env:
   DOCUMENTATION_CNAME: mechanical.docs.pyansys.com
   MAIN_PYTHON_VERSION: '3.12'
   # DEV_REVN & its Docker image are used in scheduled or registry package runs
-  STABLE_REVN: '251'
+  STABLE_REVN: '252'
   DEV_REVN: '261'
   LICENSE_SERVER: ${{ secrets.LICENSE_SERVER }}
   ANSYSLMD_LICENSE_FILE: 1055@${{ secrets.LICENSE_SERVER }}
@@ -173,7 +172,7 @@ jobs:
         run: |
           # if a tag(release) is pushed, test all versions
           if ${{ github.event_name == 'push' }} && ${{ contains(github.ref, 'refs/tags') }}; then
-            echo "matrix={\"mechanical-version\":['23.2.0', '24.1.0', '24.2.0', '25.1.0'],\"experimental\":[false]}" >> $GITHUB_OUTPUT
+            echo "matrix={\"mechanical-version\":['24.1.0', '24.2.0', '25.1.0', '25.2.0'],\"experimental\":[false]}" >> $GITHUB_OUTPUT
           else
             echo "matrix={\"mechanical-version\":['${{ needs.revn-variations.outputs.test_docker_image_version }}'],\"experimental\":[false]}" >> $GITHUB_OUTPUT
           fi
@@ -399,7 +398,7 @@ jobs:
           NUM_CORES: 1
           PYTHONUNBUFFERED: 1
         run: |
-          mkdir /root/Documents # work around bug #1301340
+          mkdir $HOME/Documents # work around bug #1301340
           . /env/bin/activate
           if [ "${{ needs.container-stability-check.outputs.container_stable_exit }}" = "true" ]; then
             xvfb-run mechanical-env pytest -m embedding -s --junitxml test_results${{ matrix.python-version }}.xml
@@ -643,7 +642,7 @@ jobs:
           NUM_CORES: 1
           ANSYS_WORKBENCH_LOGGING_FILTER_LEVEL: 0
         run: |
-          mkdir /root/Documents # work around #1301340
+          mkdir $HOME/Documents # work around #1301340
           . /env/bin/activate
           # Make html or pdf doc
           make_doc() {

doc/changelog.d/1234.added.md

@@ -0,0 +1 @@
+Add option for pep8 aliases in binding

doc/changelog.d/1237.maintenance.md

@@ -0,0 +1 @@
+Update ci/cd to use 25r2

doc/changelog.d/1242.fixed.md

@@ -0,0 +1 @@
+Create document folder  under  home

src/ansys/mechanical/core/embedding/app.py

@@ -143,6 +143,8 @@ class App:
         Whether to enable logging. Default is True.
     log_level : str, optional
         The logging level for the application. Default is "WARNING".
+    pep8 : bool, optional
+        Whether to enable PEP 8 style binding for the assembly. Default is False.
 
     Examples
     --------
@@ -230,7 +232,8 @@ def __init__(self, db_file=None, private_appdata=False, **kwargs):
             profile = UniqueUserProfile(new_profile_name, copy_profile=copy_profile)
             profile.update_environment(os.environ)
 
-        runtime.initialize(self._version)
+        pep8_alias = kwargs.get("pep8", False)
+        runtime.initialize(self._version, pep8_aliases=pep8_alias)
         self._app = _start_application(configuration, self._version, db_file)
         connect_warnings(self)
         self._poster = None

src/ansys/mechanical/core/embedding/runtime.py

@@ -45,30 +45,44 @@ def __register_function_codec():
     Ansys.Mechanical.CPython.Codecs.FunctionCodec.Register()
 
 
-def _bind_assembly_for_explicit_interface(assembly_name: str):
-    """Bind the assembly for explicit interface implementation."""
+def _bind_assembly(
+    assembly_name: str, explicit_interface: bool = False, pep8_aliases: bool = False
+) -> None:
+    """Bind the assembly for explicit interface and/or pep8 aliases.
+
+    Parameters
+    ----------
+    assembly_name : str
+        The name of the assembly to bind.
+    explicit_interface : bool, optional
+        If True, allows explicit interface implementation. Default is False.
+    pep8_aliases : bool, optional
+        If True, enables PEP 8 aliases. Default is False.
+    """
     # if pythonnet is not installed, we can't bind the assembly
     try:
         distribution("pythonnet")
         Logger.warning("Cannot bind for explicit interface because pythonnet is installed")
         return
     except ModuleNotFoundError:
         pass
-
-    Logger.debug(f"Binding assembly for explicit interface {assembly_name}")
     import clr
 
-    Logger.debug(f"Binding assembly for explicit interface, Loading {assembly_name}")
+    Logger.debug(f"Binding assembly {assembly_name}")
     assembly = clr.AddReference(assembly_name)
-    Logger.debug(f"Binding assembly for explicit interface, Loaded {assembly_name}")
     from Python.Runtime import BindingManager, BindingOptions
 
     binding_options = BindingOptions()
-    binding_options.AllowExplicitInterfaceImplementation = True
+    if explicit_interface:
+        Logger.debug(f"Binding explicit interface for {assembly_name}")
+        binding_options.AllowExplicitInterfaceImplementation = True
+    if pep8_aliases:
+        Logger.debug(f"Setting PEP 8 aliases for {assembly_name}")
+        binding_options.Pep8Aliases = True
     BindingManager.SetBindingOptions(assembly, binding_options)
 
 
-def initialize(version: int) -> None:
+def initialize(version: int, pep8_aliases: bool = False) -> None:
     """Initialize the runtime.
 
     Pythonnet is already initialized but we need to
@@ -86,4 +100,14 @@ def initialize(version: int) -> None:
         __register_function_codec()
         Logger.debug("Registered function codec")
 
-    _bind_assembly_for_explicit_interface("Ansys.ACT.WB1")
+    explicit_interface = True
+
+    if os.environ.get("PYMECHANICAL_EXPLICIT_INTERFACE") == "0":
+        explicit_interface = False
+
+    # TODO: When the pep8_aliases option is enabled (True by default),
+    # keep three environment variables to turn explicit, pep8, and both off.
+
+    _bind_assembly(
+        "Ansys.ACT.WB1", explicit_interface=explicit_interface, pep8_aliases=pep8_aliases
+    )