use ansys-api-mapdl-v0 (ansys#681)

Author: akaszynski

ansys/mapdl/core/mapdl_grpc.py

@@ -17,9 +17,9 @@
 import numpy as np
 from tqdm import tqdm
 from grpc._channel import _InactiveRpcError, _MultiThreadedRendezvous
-from ansys.grpc.mapdl import mapdl_pb2 as pb_types
-from ansys.grpc.mapdl import mapdl_pb2_grpc as mapdl_grpc
-from ansys.grpc.mapdl import ansys_kernel_pb2 as anskernel
+from ansys.api.mapdl.v0 import mapdl_pb2 as pb_types
+from ansys.api.mapdl.v0 import mapdl_pb2_grpc as mapdl_grpc
+from ansys.api.mapdl.v0 import ansys_kernel_pb2 as anskernel
 
 from ansys.mapdl.core.mapdl import _MapdlCore
 from ansys.mapdl.core.errors import MapdlExitedError, protect_grpc, MapdlRuntimeError

ansys/mapdl/core/math.py

@@ -7,8 +7,8 @@
 from enum import Enum
 
 import numpy as np
-from ansys.grpc.mapdl import ansys_kernel_pb2 as anskernel
-from ansys.grpc.mapdl import mapdl_pb2 as pb_types
+from ansys.api.mapdl.v0 import ansys_kernel_pb2 as anskernel
+from ansys.api.mapdl.v0 import mapdl_pb2 as pb_types
 
 from .errors import ANSYSDataTypeError, protect_grpc
 from .mapdl_grpc import MapdlGrpc

ansys/mapdl/core/mesh_grpc.py

@@ -4,7 +4,7 @@
 import os
 import numpy as np
 
-from ansys.grpc.mapdl import ansys_kernel_pb2 as anskernel
+from ansys.api.mapdl.v0 import ansys_kernel_pb2 as anskernel
 from ansys.mapdl.reader.mesh import Mesh
 
 from ansys.mapdl.core.misc import threaded, supress_logging

ansys/mapdl/core/misc.py

@@ -70,7 +70,7 @@ def __init__(self, additional=None, ncol=3, text_width=80, sort=False, gpu=True)
             "pyiges",
             "scipy",
             "grpc",  # grpcio
-            "ansys.grpc.mapdl",  # ansys-grpc-mapdl
+            "ansys.api.mapdl.v0",  # ansys-api-mapdl-v0
             "ansys.mapdl.reader",  # ansys-mapdl-reader
             "google.protobuf",  # protobuf library
         ]

ansys/mapdl/core/xpl.py

@@ -3,7 +3,7 @@
 import json
 
 import numpy as np
-from ansys.grpc.mapdl import ansys_kernel_pb2 as anskernel
+from ansys.api.mapdl.v0 import ansys_kernel_pb2 as anskernel
 
 from ansys.mapdl.core.errors import MapdlRuntimeError
 

setup.py

@@ -24,7 +24,7 @@
     "pyiges>=0.1.4",
     "scipy>=1.3.0",  # for sparse (consider optional?)
     "grpcio>=1.30.0",  # tested up to grpcio==1.35
-    "ansys-grpc-mapdl==0.4.0",  # supports at least 2020R2 - 2021R2
+    "ansys-api-mapdl-v0==0.4.1",  # supports at least 2020R2 - 2021R2
     "ansys-mapdl-reader>=0.50.15",
     "protobuf>=3.12.2",  # minimum required based on latest ansys-grpc-mapdl
 ]

tests/test_launcher.py

@@ -138,7 +138,6 @@ def test_license_type_keyword():
         checks.append(license_description in mapdl.__str__().split('\n')[0])
         mapdl.exit()
 
-    breakpoint()
     assert any(checks)
 
     dummy_license_name = 'dummy'
@@ -155,8 +154,8 @@ def test_license_type_keyword_names():
     # This test might became a way to check available licenses, which is not the purpose.
 
     successful_check = False
-    for license_description, each_keyword in zip(LICENSES.values(), keywords):
-        mapdl = launch_mapdl(license_type=each_keyword)
+    for license_name, license_description in LICENSES.items():
+        mapdl = launch_mapdl(license_type=license_name)
 
         #Using first line to ensure not picking up other stuff.
         successful_check = license_description in mapdl.__str__().split('\n')[0] or successful_check