Undo changes made in other branches

Author: b-matteo

src/ansys/geometry/core/designer/design.py

@@ -506,12 +506,7 @@ def export_to_parasolid_text(self, location: Path | str | None = None) -> Path:
             The path to the saved file.
         """
         # Determine the extension based on the backend type
-        ext = (
-            "x_t"
-            if self._grpc_client.backend_type
-            in (BackendType.LINUX_SERVICE, BackendType.CORE_WINDOWS, BackendType.CORE_LINUX)
-            else "xmt_txt"
-        )
+        ext = "x_t" if self._grpc_client.backend_type == BackendType.LINUX_SERVICE else "xmt_txt"
 
         # Define the file location
         file_location = self.__build_export_file_location(location, ext)
@@ -537,13 +532,8 @@ def export_to_parasolid_bin(self, location: Path | str | None = None) -> Path:
             The path to the saved file.
         """
         # Determine the extension based on the backend type
-        ext = (
-            "x_b"
-            if self._grpc_client.backend_type
-            in (BackendType.LINUX_SERVICE, BackendType.CORE_WINDOWS, BackendType.CORE_LINUX)
-            else "xmt_bin"
-        )
-
+        ext = "x_b" if self._grpc_client.backend_type == BackendType.LINUX_SERVICE else "xmt_bin"
+        
         # Define the file location
         file_location = self.__build_export_file_location(location, ext)
 

src/ansys/geometry/core/modeler.py

@@ -123,11 +123,7 @@ def __init__(
         # Initialize the RepairTools - Not available on Linux
         # TODO: delete "if" when Linux service is able to use repair tools
         # https://github.com/ansys/pyansys-geometry/issues/1319
-        if self.client.backend_type in (
-            BackendType.LINUX_SERVICE,
-            BackendType.CORE_WINDOWS,
-            BackendType.CORE_LINUX,
-        ):
+        if self.client.backend_type == BackendType.LINUX_SERVICE:
             self._measurement_tools = None
             LOG.warning("Linux backend does not support measurement tools.")
         else:

tests/integration/conftest.py

@@ -51,11 +51,7 @@
 
 def skip_if_linux(modeler: Modeler, test_name: str, element_not_available: str):
     """Skip test if running on Linux."""
-    if modeler.client.backend_type in (
-        BackendType.LINUX_SERVICE,
-        BackendType.CORE_WINDOWS,
-        BackendType.CORE_LINUX,
-    ):
+    if modeler.client.backend_type == BackendType.LINUX_SERVICE:
         pytest.skip(
             reason=f"Skipping '{test_name}'. '{element_not_available}' not on Linux service."
         )  # skip!

tests/integration/test_design.py

@@ -913,19 +913,15 @@ def test_download_file(modeler: Modeler, tmp_path_factory: pytest.TempPathFactor
     assert file.exists()
 
     # Check that we can also save it (even if it is not accessible on the server)
-    if modeler.client.backend_type in (BackendType.LINUX_SERVICE, BackendType.CORE_LINUX):
+    if modeler.client.backend_type == BackendType.LINUX_SERVICE:
         file_save = "/tmp/cylinder-temp.scdocx"
     else:
         file_save = tmp_path_factory.mktemp("scdoc_files_save") / "cylinder.scdocx"
 
     design.save(file_location=file_save)
 
     # Check for other exports - Windows backend...
-    if modeler.client.backend_type not in (
-        BackendType.LINUX_SERVICE,
-        BackendType.CORE_LINUX,
-        BackendType.CORE_WINDOWS,
-    ):
+    if modeler.client.backend_type != BackendType.LINUX_SERVICE:
         binary_parasolid_file = tmp_path_factory.mktemp("scdoc_files_download") / "cylinder.x_b"
         text_parasolid_file = tmp_path_factory.mktemp("scdoc_files_download") / "cylinder.x_t"
 

tests/integration/test_design_export.py

@@ -229,11 +229,7 @@ def test_export_to_parasolid_text(modeler: Modeler, tmp_path_factory: pytest.Tem
     # Define the location and expected file location
     location = tmp_path_factory.mktemp("test_export_to_parasolid_text")
 
-    if modeler.client.backend_type in (
-        BackendType.LINUX_SERVICE,
-        BackendType.CORE_LINUX,
-        BackendType.CORE_WINDOWS,
-    ):
+    if modeler.client.backend_type == BackendType.LINUX_SERVICE:
         file_location = location / f"{design.name}.x_t"
     else:
         file_location = location / f"{design.name}.xmt_txt"
@@ -256,11 +252,7 @@ def test_export_to_parasolid_binary(modeler: Modeler, tmp_path_factory: pytest.T
     # Define the location and expected file location
     location = tmp_path_factory.mktemp("test_export_to_parasolid_binary")
 
-    if modeler.client.backend_type in (
-        BackendType.LINUX_SERVICE,
-        BackendType.CORE_LINUX,
-        BackendType.CORE_WINDOWS,
-    ):
+    if modeler.client.backend_type == BackendType.LINUX_SERVICE:
         file_location = location / f"{design.name}.x_b"
     else:
         file_location = location / f"{design.name}.xmt_bin"

tests/integration/test_design_import.py

@@ -253,11 +253,7 @@ def test_open_file(modeler: Modeler, tmp_path_factory: pytest.TempPathFactory):
     _checker_method(design, design2, True)
 
     # Test HOOPS formats (Windows only)
-    if modeler.client.backend_type not in (
-        BackendType.LINUX_SERVICE,
-        BackendType.CORE_LINUX,
-        BackendType.CORE_WINDOWS,
-    ):
+    if modeler.client.backend_type != BackendType.LINUX_SERVICE:
         # IGES
         #
         # TODO: Something has gone wrong with IGES

tests/integration/test_tessellation.py

@@ -69,11 +69,7 @@ def test_body_tessellate(modeler: Modeler):
     blocks_2 = body_2.tessellate()
     assert "MultiBlock" in str(blocks_2)
     assert blocks_2.n_blocks == 3
-    if modeler.client.backend_type not in (
-        BackendType.LINUX_SERVICE,
-        BackendType.CORE_LINUX,
-        BackendType.CORE_WINDOWS,
-    ):
+    if modeler.client.backend_type != BackendType.LINUX_SERVICE:
         assert blocks_2.bounds == pytest.approx(
             [0.019999999999999997, 0.04, 0.020151922469877917, 0.03984807753012208, 0.0, 0.03],
             rel=1e-6,
@@ -90,11 +86,7 @@ def test_body_tessellate(modeler: Modeler):
 
     # Tessellate the body merging the individual faces
     mesh_2 = body_2.tessellate(merge=True)
-    if modeler.client.backend_type not in (
-        BackendType.LINUX_SERVICE,
-        BackendType.CORE_LINUX,
-        BackendType.CORE_WINDOWS,
-    ):
+    if modeler.client.backend_type != BackendType.LINUX_SERVICE:
         assert "PolyData" in str(mesh_2)
         assert mesh_2.n_cells == 72
         assert mesh_2.n_points == 76
@@ -143,11 +135,7 @@ def test_component_tessellate(modeler: Modeler):
     mesh = comp.tessellate()
     comp.plot()
     assert "PolyData" in str(mesh)
-    if modeler.client.backend_type not in (
-        BackendType.LINUX_SERVICE,
-        BackendType.CORE_LINUX,
-        BackendType.CORE_WINDOWS,
-    ):
+    if modeler.client.backend_type != BackendType.LINUX_SERVICE:
         assert mesh.n_cells == 3280
         assert mesh.n_faces == 3280
         assert mesh.n_arrays == 0

tests/integration/test_trimmed_geometry.py

@@ -87,11 +87,7 @@ def create_hedgehog(modeler: Modeler):
                 create_sketch_line(design, p1, p2)
                 current_gap += 1
     # Add isoparametric curves, not on linux
-    if modeler.client.backend_type not in (
-        BackendType.LINUX_SERVICE,
-        BackendType.CORE_LINUX,
-        BackendType.CORE_WINDOWS,
-    ):
+    if modeler.client.backend_type != BackendType.LINUX_SERVICE:
         param = 0.20
         while param <= 1:
             for face in body.faces: