Merge branch 'experimental' of...

Merge branch 'experimental' of https://git.rz.tu-bs.de/irmb/uppsala/VirtualFluids_dev into experimental

pythonbindings/src/gpu/submodules/grid_generator.cpp

@@ -51,11 +51,9 @@ namespace grid_generator
         .def_static("make", &TriangularMesh::make, py::return_value_policy::reference);
 
         py::class_<GridBuilder, std::shared_ptr<GridBuilder>>(gridGeneratorModule, "GridBuilder")
-        .def("get_number_of_grid_levels", &GridBuilder::getNumberOfGridLevels)
-        .def("get_grid", &GridBuilder::getGrid, py::arg("level"));
+        .def("get_number_of_grid_levels", &GridBuilder::getNumberOfGridLevels);
 
         py::class_<LevelGridBuilder, GridBuilder, std::shared_ptr<LevelGridBuilder>>(gridGeneratorModule, "LevelGridBuilder")
-        .def("get_grid", py::overload_cast<int, int>(&LevelGridBuilder::getGrid), py::arg("level"), py::arg("box"))
         .def("set_slip_boundary_condition", &LevelGridBuilder::setSlipBoundaryCondition, py::arg("side_type"), py::arg("normal_x"), py::arg("normal_y"), py::arg("normal_z"))
         .def("set_velocity_boundary_condition", &LevelGridBuilder::setVelocityBoundaryCondition, py::arg("side_type"), py::arg("vx"), py::arg("vy"), py::arg("vz"))
         .def("set_pressure_boundary_condition", &LevelGridBuilder::setPressureBoundaryCondition, py::arg("side_type"), py::arg("rho"))

setup.py

 import sys
 from pathlib import Path
+from typing import List
 
 import skbuild
 
@@ -24,11 +25,31 @@ or install via pip:
 package_name = "pyfluids"
 target = "python_bindings"
 src_dir = "pythonbindings"
+stub_package = package_name+"-stubs"
+
+stub_dir = Path(src_dir)/stub_package
+
+
+def add_subfiles(dir_path: Path, suffix: str, root_dir: Path) -> List[str]:
+    files = []
+    for f in dir_path.iterdir():
+        if f.is_dir():
+            files.extend(add_subfiles(f, suffix, root_dir))
+        if f.is_file():
+            if f.suffix != suffix:
+                continue
+            files.append(str(f.relative_to(root_dir)))
+    return files
+
+def add_directory(dir_path: Path, suffix: str):
+    return add_subfiles(dir_path, suffix, dir_path)
+
+stub_files = add_directory(stub_dir, ".pyi")
 
 # hack to get config-args for installation with pip>21
 cmake_args = []
-if("config_args" in locals()):
-    cmake_args.extend([f"{k}={v}" for k,v in locals()["config_args"].items()])
+if "config_args" in locals():
+    cmake_args.extend([f"{k}={v}" for k, v in locals()["config_args"].items()])
 
 cmake_args += [
         f"-DPython3_ROOT_DIR={Path(sys.prefix)}",
@@ -41,9 +62,11 @@ cmake_args += [
 
 skbuild.setup(
     name=package_name,
-    packages=[package_name, "pymuparser"],
+    packages=[package_name, "pymuparser", "pyfluids-stubs"],
     package_dir={"": src_dir},
-    cmake_args = cmake_args,
+    cmake_args=cmake_args,
     cmake_install_target=target,
+    package_data={  "pyfluids": ["py.typed"],
+                    "pyfluids-stubs": stub_files},
     include_package_data=True,
 )