Maint/get ansys version from pygate (#420)

* Remove __ansys_version__ from setup.py

* Get __ansys_version__ from gate instead of core in core.misc

* Get __ansys_version__ from core.misc and not core._version

* Fix flake8 import error

Author: PProfizi

.ci/edit_ansys_version.py

@@ -3,7 +3,6 @@
 version_info = 0, 5, "dev2"
 # Nice string for the version
 __version__ = ".".join(map(str, version_info))
-__ansys_version__ = "222"
 min_server_version = "2.0"
 
 server_to_ansys_grpc_dpf_version = {

ansys/dpf/core/_version.py

@@ -3,7 +3,7 @@
 import glob
 import os
 from pkgutil import iter_modules
-from ansys.dpf.core._version import (
+from ansys.dpf.gate._version import (
     __ansys_version__
 )
 

ansys/dpf/core/misc.py

@@ -207,7 +207,7 @@ def get_server_type_from_config(config=None, ansys_path=None):
             config.protocol == CommunicationProtocols.gRPC
             and not config.legacy
         ):
-            from ansys.dpf.core._version import __ansys_version__
+            from ansys.dpf.core.misc import __ansys_version__
 
             if ansys_path is None:
                 ansys_path = os.environ.get(

ansys/dpf/core/server_factory.py

@@ -23,9 +23,9 @@
 from ansys.dpf.core import errors, session
 from ansys.dpf.core._version import (
     server_to_ansys_grpc_dpf_version,
-    server_to_ansys_version,
-    __ansys_version__
+    server_to_ansys_version
 )
+from ansys.dpf.core.misc import __ansys_version__
 from ansys.dpf.gate import load_api, data_processing_grpcapi
 
 import logging
@@ -43,12 +43,11 @@
 
 def _get_dll_path(name, ansys_path=None):
     """Helper function to get the right dll path for Linux or Windows"""
-    from ansys.dpf.core import _version
     ISPOSIX = os.name == "posix"
     if ansys_path is None:
         ansys_path = os.environ.get("ANSYS_DPF_PATH")
     if ansys_path is None:
-        ANSYS_INSTALL = os.environ.get("AWP_ROOT" + str(_version.__ansys_version__), None)
+        ANSYS_INSTALL = os.environ.get("AWP_ROOT" + str(__ansys_version__), None)
     else:
         ANSYS_INSTALL = ansys_path
     SUB_FOLDERS = os.path.join(ANSYS_INSTALL, load_api._get_path_in_install())

ansys/dpf/core/server_types.py

@@ -357,7 +357,7 @@ def server_clayer(request):
 
 @pytest.fixture()
 def restore_awp_root(request):
-    awp_root_name = "AWP_ROOT" + core._version.__ansys_version__
+    awp_root_name = "AWP_ROOT" + core.misc.__ansys_version__
     awp_root_save = os.environ.get(awp_root_name, None)
     yield
     # restore awp_root

tests/conftest.py

@@ -63,11 +63,11 @@ def reset_server():
         reason="Ans.Dpf.Grpc.bat and .sh need AWP_ROOT221 for 221 install",
     )
     def test_start_local_custom_ansys_path(self, server_config):
-        path = os.environ["AWP_ROOT" + str(core._version.__ansys_version__)]
+        path = os.environ["AWP_ROOT" + str(core.misc.__ansys_version__)]
         try:
-            os.unsetenv("AWP_ROOT" + str(core._version.__ansys_version__))
+            os.unsetenv("AWP_ROOT" + str(core.misc.__ansys_version__))
         except:
-            del os.environ["AWP_ROOT" + str(core._version.__ansys_version__)]
+            del os.environ["AWP_ROOT" + str(core.misc.__ansys_version__)]
         try:
             server = core.start_local_server(
                 ansys_path=path,
@@ -80,11 +80,11 @@ def test_start_local_custom_ansys_path(self, server_config):
                 p = psutil.Process(server.info["server_process_id"])
                 assert path in p.cwd()
             os.environ[
-                "AWP_ROOT" + str(core._version.__ansys_version__)
+                "AWP_ROOT" + str(core.misc.__ansys_version__)
                 ] = path
         except Exception as e:
             os.environ[
-                "AWP_ROOT" + str(core._version.__ansys_version__)
+                "AWP_ROOT" + str(core.misc.__ansys_version__)
                 ] = path
             raise e
 
@@ -107,22 +107,22 @@ def test_start_local_no_ansys_path(self, server_config):
     )
     def test_start_local_ansys_path_environment_variable(self, server_config):
         awp_root = os.environ[
-            "AWP_ROOT" + str(core._version.__ansys_version__)
+            "AWP_ROOT" + str(core.misc.__ansys_version__)
             ]
         try:
             os.environ["ANSYS_DPF_PATH"] = awp_root
             try:
-                os.unsetenv("AWP_ROOT" + str(core._version.__ansys_version__))
+                os.unsetenv("AWP_ROOT" + str(core.misc.__ansys_version__))
             except:
                 del os.environ[
-                    "AWP_ROOT" + str(core._version.__ansys_version__)
+                    "AWP_ROOT" + str(core.misc.__ansys_version__)
                     ]
             server = core.start_local_server(
                 use_docker_by_default=False, config=server_config
             )
             assert isinstance(server.os, str)
             os.environ[
-                "AWP_ROOT" + str(core._version.__ansys_version__)
+                "AWP_ROOT" + str(core.misc.__ansys_version__)
                 ] = awp_root
             try:
                 os.unsetenv("ANSYS_DPF_PATH")
@@ -131,7 +131,7 @@ def test_start_local_ansys_path_environment_variable(self, server_config):
 
         except Exception as e:
             os.environ[
-                "AWP_ROOT" + str(core._version.__ansys_version__)
+                "AWP_ROOT" + str(core.misc.__ansys_version__)
                 ] = awp_root
             try:
                 os.unsetenv("ANSYS_DPF_PATH")
@@ -182,7 +182,7 @@ def test_start_local_wrong_ansys_path(self, server_config):
     @staticmethod
     def test_launch_server_full_path(server_config):
         ansys_path = os.environ.get(
-            "AWP_ROOT" + core._version.__ansys_version__, core.misc.find_ansys()
+            "AWP_ROOT" + core.misc.__ansys_version__, core.misc.find_ansys()
         )
         if os.name == "nt":
             path = os.path.join(ansys_path, "aisol", "bin", "winx64")

tests/test_launcher.py

@@ -295,7 +295,7 @@ def test_load_api_without_awp_root(restore_awp_root):
     legacy_conf = ServerConfig(protocol=CommunicationProtocols.gRPC, legacy=True)
     loc_serv = dpf.core.start_local_server(config=legacy_conf, as_global=False)
 
-    awp_root_name = "AWP_ROOT" + dpf.core._version.__ansys_version__
+    awp_root_name = "AWP_ROOT" + dpf.core.misc.__ansys_version__
     # delete awp_root
     del os.environ[awp_root_name]
 
@@ -372,7 +372,7 @@ def test_load_api_without_awp_root_no_gatebin(restore_awp_root):
     legacy_conf = ServerConfig(protocol=CommunicationProtocols.gRPC, legacy=True)
     loc_serv = dpf.core.start_local_server(config=legacy_conf, as_global=False)
 
-    awp_root_name = "AWP_ROOT" + dpf.core._version.__ansys_version__
+    awp_root_name = "AWP_ROOT" + dpf.core.misc.__ansys_version__
     # delete awp_root
     del os.environ[awp_root_name]