fix: reverted all files

Author: moe-ad

.ci/build_wheel.py

@@ -3,7 +3,6 @@
 
 import argparse
 import subprocess
-from pathlib import Path
 import os
 import sys
 import shutil
@@ -40,13 +39,15 @@
     print("Created temporary directory: ", tmpdirname)
 
     # Create the temporary build-opts.cfg
-    build_opts_path = Path(tmpdirname) / "build-opts.cfg"
-
-    build_opts_path.write_text(f"[bdist_wheel]\nplat-name={requested_platform}", encoding="utf-8")
-    os.environ["DIST_EXTRA_CONFIG"] = str(build_opts_path)
+    build_opts_path = os.path.join(tmpdirname, "build-opts.cfg")
+    with open(build_opts_path, "w") as build_opts_file:
+        build_opts_file.write(f"[bdist_wheel]\nplat-name={requested_platform}")
+    os.environ["DIST_EXTRA_CONFIG"] = build_opts_path
 
     # Move the binaries
-    gatebin_folder_path = Path.cwd() / "src" / "ansys" / "dpf" / "gatebin"
+    gatebin_folder_path = os.path.join(
+        os.path.curdir, os.path.join("src", "ansys", "dpf", "gatebin")
+    )
     binaries_to_move = []
     moved = []
     if "win" in requested_platform or "any" == requested_platform:
@@ -59,15 +60,15 @@
         binaries_to_move.extend(["_version.py"])
 
     for binary_name in binaries_to_move:
-        src = gatebin_folder_path / binary_name
-        dst = Path(tmpdirname) / binary_name
+        src = os.path.join(gatebin_folder_path, binary_name)
+        dst = os.path.join(tmpdirname, binary_name)
         print(f"Moving {src} to {dst}")
         shutil.move(src=src, dst=dst)
         moved.append([dst, src])
 
     if "any" == requested_platform:
         # Also remove the gatebin folder
-        gatebin_folder_path.rmdir()
+        os.rmdir(gatebin_folder_path)
 
     # Call the build
     if not args.wheelhouse:
@@ -82,7 +83,7 @@
 
     if "any" == requested_platform:
         # Recreate the gatebin folder
-        gatebin_folder_path.mkdir()
+        os.mkdir(gatebin_folder_path)
 
     # Move binaries back
     for move_back in moved:

.ci/code_generation.py

@@ -8,22 +8,21 @@
 import shutil
 
 
-local_dir = Path(__file__).parent
-TARGET_PATH = local_dir.parent / "src" / "ansys" / "dpf" / "core" / "operators"
-files = glob.glob(str(TARGET_PATH / "*"))
+local_dir = os.path.dirname(os.path.abspath(__file__))
+TARGET_PATH = os.path.join(local_dir, os.pardir, "src", "ansys", "dpf", "core", "operators")
+files = glob.glob(os.path.join(TARGET_PATH, "*"))
 for f in files:
-    file_path = Path(f)
-    if file_path.stem == "specification":
+    if Path(f).stem == "specification":
         continue
-    if file_path.name == "build.py":
+    if Path(f).name == "build.py":
         continue
-    if file_path.name == "operator.mustache":
+    if Path(f).name == "operator.mustache":
         continue
     try:
-        if file_path.is_dir():
-            shutil.rmtree(file_path)
+        if os.path.isdir(f):
+            shutil.rmtree(f)
         else:
-            file_path.unlink()
+            os.remove(f)
     except:
         pass
 

.ci/run_examples.py

@@ -12,19 +12,18 @@
 os.environ["MPLBACKEND"] = "Agg"
 
 actual_path = pathlib.Path(__file__).parent.absolute()
-examples_path = actual_path.parent / "examples"
-print(examples_path)
+print(os.path.join(actual_path, os.path.pardir, "examples"))
 
 # Get the DPF server version
 server = dpf.server.get_or_create_server(None)
 server_version = server.version
 server.shutdown()
 print(f"Server version: {server_version}")
 
-for root, subdirectories, files in examples_path.walk():
+for root, subdirectories, files in os.walk(os.path.join(actual_path, os.path.pardir, "examples")):
     for subdirectory in subdirectories:
-        subdir = root / subdirectory
-        for file in glob.iglob(str(subdir / "*.py")):
+        subdir = os.path.join(root, subdirectory)
+        for file in glob.iglob(os.path.join(subdir, "*.py")):
             if sys.platform == "linux" and "08-python-operators" in file:
                 continue
             elif "win" in sys.platform and "06-distributed_stress_averaging" in file:

.ci/run_non_regression_examples.py

@@ -9,26 +9,45 @@
 os.environ["MPLBACKEND"] = "Agg"
 
 actual_path = pathlib.Path(__file__).parent.absolute()
-examples_path = actual_path.parent / "examples"
-print(examples_path)
+print(os.path.join(actual_path, os.path.pardir, "examples"))
 
 
 list_tests = [
-    examples_path / "00-basic",
-    examples_path / "01-transient_analyses",
-    examples_path / "02-modal_analyses",
-    examples_path / "03-harmonic_analyses",
-    examples_path / "06-plotting" / "00-basic_plotting.py",
-    examples_path / "06-plotting" / "05-plot_on_warped_mesh.py",
-    examples_path / "07-distributed-post" / "00-distributed_total_disp.py",
+    os.path.join(actual_path, os.path.pardir, "examples", "00-basic"),
+    os.path.join(actual_path, os.path.pardir, "examples", "01-transient_analyses"),
+    os.path.join(actual_path, os.path.pardir, "examples", "02-modal_analyses"),
+    os.path.join(actual_path, os.path.pardir, "examples", "03-harmonic_analyses"),
+    os.path.join(actual_path, os.path.pardir, "examples", "06-plotting", "00-basic_plotting.py"),
+    os.path.join(
+        actual_path,
+        os.path.pardir,
+        "examples",
+        "06-plotting",
+        "05-plot_on_warped_mesh.py",
+    ),
+    os.path.join(
+        actual_path,
+        os.path.pardir,
+        "examples",
+        "07-distributed-post",
+        "00-distributed_total_disp.py",
+    ),
 ]
 
 if core.SERVER_CONFIGURATION != core.AvailableServerConfigs.InProcessServer:
-    list_tests.append(examples_path / "08-python-operators" / "00-wrapping_numpy_capabilities.py")
+    list_tests.append(
+        os.path.join(
+            actual_path,
+            os.path.pardir,
+            "examples",
+            "08-python-operators",
+            "00-wrapping_numpy_capabilities.py",
+        )
+    )
 
 for path in list_tests:
-    if path.is_dir():
-        for file in glob.iglob(str(path / "*.py")):
+    if os.path.isdir(path):
+        for file in glob.iglob(os.path.join(path, "*.py")):
             print("\n--------------------------------------------------")
             print(file)
             try:

.ci/update_dpf_dependencies.py

@@ -1,86 +1,69 @@
-"""Script to update ansys.dpf.gate.generated, ansys.dpf.gatebin and ansys.grpc.dpf.
-
-This script should only be used to quickly test changes to any of these dependencies.
-Actual commit of updated code should not occur.
-The GitHub pipelines take care of the actual update in ansys-dpf-core.
-
-Define environment variables to know where to get the code from:
-- "DPFDV_ROOT" defines the DPF repo where ansys-grpc-dpf resides.
-  Will unzip the latest wheel built in DPF/proto/dist/.
-- "ANSYSDPFPYGATE_ROOT" defines where the ansys-dpf-pygate repository resides.
-
-It will update the current repo
-or the repo defined by the environment variable "ANSYSDPFCORE_ROOT" if it exists.
-"""
-
 import os
 import glob
-from pathlib import Path
-import platform
-import shutil
-import zipfile
+from ansys.dpf import core
+import pathlib
+import subprocess
+import sys
 
+os.environ["PYVISTA_OFF_SCREEN"] = "true"
+os.environ["MPLBACKEND"] = "Agg"
 
-grpc_path_key = "DPFDV_ROOT"
-gate_path_key = "ANSYSDPFPYGATE_ROOT"
-core_path = Path(__file__).parent.parent
-if "ANSYSDPFCORE_ROOT" in os.environ:
-    core_path = os.environ["ANSYSDPFCORE_ROOT"]
+actual_path = pathlib.Path(__file__).parent.absolute()
+print(os.path.join(actual_path, os.path.pardir, "examples"))
 
-grpc_path = os.getenv(grpc_path_key, None)
-gate_path = os.getenv(gate_path_key, None)
 
-if grpc_path:
-    # Update ansys-grpc-dpf with latest in proto/dist
-    print("Updating ansys.grpc.dpf")
-    dist_path = Path(grpc_path) / "proto" / "dist" / "*"
-    print(f"from {dist_path}")
-    destination = Path(core_path) / "src"
-    print(f"into {destination}")
-    latest_wheel = max(glob.glob(str(dist_path)), key=os.path.getctime)
-    with zipfile.ZipFile(latest_wheel, "r") as wheel:
-        for file in wheel.namelist():
-            # print(file)
-            if file.startswith("ansys/"):
-                wheel.extract(
-                    file,
-                    path=destination,
-                )
-    print("Done updating ansys.grpc.dpf")
-else:
-    print(f"{grpc_path_key} environment variable is not defined. " "Cannot update ansys-grpc-dpf.")
+list_tests = [
+    os.path.join(actual_path, os.path.pardir, "examples", "00-basic"),
+    os.path.join(actual_path, os.path.pardir, "examples", "01-transient_analyses"),
+    os.path.join(actual_path, os.path.pardir, "examples", "02-modal_analyses"),
+    os.path.join(actual_path, os.path.pardir, "examples", "03-harmonic_analyses"),
+    os.path.join(actual_path, os.path.pardir, "examples", "06-plotting", "00-basic_plotting.py"),
+    os.path.join(
+        actual_path,
+        os.path.pardir,
+        "examples",
+        "06-plotting",
+        "05-plot_on_warped_mesh.py",
+    ),
+    os.path.join(
+        actual_path,
+        os.path.pardir,
+        "examples",
+        "07-distributed-post",
+        "00-distributed_total_disp.py",
+    ),
+]
 
-if gate_path:
-    # Update ansys-dpf-gate
-    print("Updating ansys.dpf.gate generated code")
-    dist_path = Path(gate_path) / "ansys-dpf-gate" / "ansys" / "dpf" / "gate" / "generated"
-    print(f"from {dist_path}")
-    destination = Path(core_path) / "src" / "ansys" / "dpf" / "gate" / "generated"
-    print(f"into {destination}")
-    shutil.copytree(
-        src=dist_path,
-        dst=destination,
-        dirs_exist_ok=True,
-        ignore=lambda directory, contents: ["__pycache__"] if str(directory)[-5:] == "gate" else [],
+if core.SERVER_CONFIGURATION != core.AvailableServerConfigs.InProcessServer:
+    list_tests.append(
+        os.path.join(
+            actual_path,
+            os.path.pardir,
+            "examples",
+            "08-python-operators",
+            "00-wrapping_numpy_capabilities.py",
+        )
     )
 
-    dist_path = Path(gate_path) / "ansys-dpf-gate" / "ansys" / "dpf" / "gate" / "__init__.py"
-    print(f"from {dist_path}")
-    destination = Path(core_path) / "src" / "ansys" / "dpf" / "gate" / "__init__.py"
-    print(f"into {destination}")
-    shutil.copy(src=dist_path, dst=destination)
-    print("Done updating ansys.dpf.gate generated code")
-
-    # Update ansys-dpf-gatebin
-    print("Updating ansys.dpf.gatebin")
-    dist_path = Path(gate_path) / "ansys-dpf-gatebin" / "ansys"
-    print(f"from {dist_path}")
-    destination = Path(core_path) / "src" / "ansys"
-    print(f"into {destination}")
-    shutil.copytree(src=dist_path, dst=destination, dirs_exist_ok=True)
-    print(f"Done updating ansys.dpf.gatebin for {platform.system()}")
-else:
-    print(
-        f"{gate_path_key} environment variable is not defined. "
-        "Cannot update ansys.dpf.gate or ansys.dpf.gatebin."
-    )
+for path in list_tests:
+    if os.path.isdir(path):
+        for file in glob.iglob(os.path.join(path, "*.py")):
+            print("\n--------------------------------------------------")
+            print(file)
+            try:
+                subprocess.check_call([sys.executable, file])
+            except subprocess.CalledProcessError as e:
+                sys.stderr.write(str(e.args))
+                if e.returncode != 3221225477:
+                    raise e
+            print("PASS")
+    else:
+        print("\n--------------------------------------------------")
+        print(path)
+        try:
+            subprocess.check_call([sys.executable, file])
+        except subprocess.CalledProcessError as e:
+            sys.stderr.write(str(e.args))
+            if e.returncode != 3221225477:
+                raise e
+        print("PASS")