pytetwild 0.2.0__tar.gz → 0.2.2__tar.gz

{pytetwild-0.2.0 → pytetwild-0.2.2}/.github/workflows/build-and-deploy.yml

@@ -142,6 +142,7 @@ jobs:
       url: https://pypi.org/p/pytetwild
     permissions:
       id-token: write  # this permission is mandatory for trusted publishing
+      contents: write  # required to create a release
     steps:
       - uses: actions/download-artifact@v7
       - name: Flatten directory structure

{pytetwild-0.2.0 → pytetwild-0.2.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: pytetwild
-Version: 0.2.0
+Version: 0.2.2
 Summary: Python wrapper of fTetWild
 Author-Email: Alex Kaszynski <akascap@gmail.com>
 Classifier: Development Status :: 3 - Alpha
@@ -22,7 +22,7 @@ Requires-Dist: pyvista; extra == "all"
 Provides-Extra: tests
 Requires-Dist: pytest; extra == "tests"
 Requires-Dist: pyvista; extra == "tests"
-Requires-Dist: scipy; extra == "tests"
+Requires-Dist: scipy<1.17.0; extra == "tests"
 Requires-Dist: meshio; extra == "tests"
 Provides-Extra: dev
 Requires-Dist: pre-commit; extra == "dev"

{pytetwild-0.2.0 → pytetwild-0.2.2}/pyproject.toml

@@ -4,7 +4,7 @@ requires = ["scikit-build-core >=0.4.3", "nanobind >=1.3.2"]
 
 [project]
 name = "pytetwild"
-version = "0.2.0"
+version = "0.2.2"
 description = "Python wrapper of fTetWild"
 readme = { file = "README.rst", content-type = "text/x-rst" }
 authors = [{ name = "Alex Kaszynski", email = "akascap@gmail.com" }]
@@ -34,7 +34,7 @@ pytetwild = ["py.typed"]
 
 [project.optional-dependencies]
 all = ['pyvista']
-tests = ["pytest", "pyvista", "scipy", "meshio"]
+tests = ["pytest", "pyvista", "scipy<1.17.0", "meshio"]
 dev = ["pre-commit"]
 
 [tool.scikit-build]
@@ -57,13 +57,13 @@ archs = ["auto64"]  # 64-bit only
 before-build = "pip install abi3audit"
 build = "cp310-* cp311-* cp312-*"  # 3.12+ are abi3 wheels
 skip = ["*musllinux*"]  # disable musl-based wheels
-test-requires = "pytest pyvista scipy meshio"
+test-extras = ["tests"]
 test-command = "pytest {project}/tests -v"
 
 [tool.cibuildwheel.linux]
-manylinux-x86_64-image = "manylinux_2_28"
-before-all = "dnf install -y gmp-devel"
-before-build = "pip install abi3audit cmake==3.29.0"
+manylinux-x86_64-image = "manylinux2014"
+before-all = "yum install -y gmp-devel"
+before-build = "pip install abi3audit cmake"
 repair-wheel-command = [
   "auditwheel repair -w {dest_dir} {wheel}",
   "bash tools/audit_wheel.sh {wheel}"

{pytetwild-0.2.0 → pytetwild-0.2.2}/src/FTetWildWrapper.cpp

@@ -41,6 +41,20 @@ using floatTetWild::json;
 using floatTetWild::Vector3;
 using floatTetWild::Vector3i;
 
+struct CoutRedirect {
+    std::streambuf *old = nullptr;
+    explicit CoutRedirect(bool enable) {
+        if (enable) {
+            old = std::cout.rdbuf();
+            std::cout.rdbuf(nullptr);
+        }
+    }
+    ~CoutRedirect() {
+        if (old)
+            std::cout.rdbuf(old);
+    }
+};
+
 // Convert a tetwild mesh to numpy vertex and int arrays
 nb::tuple extractMeshDataNumpy(const floatTetWild::Mesh &mesh, bool vtk_ordering) {
     std::map<int, int> old2new;
@@ -107,13 +121,6 @@ template <typename T> GEO::vector<T> array_to_geo_vector(NDArray<T, 2> array) {
     // numpy arrays are contiguous
     std::memcpy(geo_vec.data(), array.data(), sz * sizeof(T));
 
-    // if above unstable, simply loop
-    // T *data = array.data();
-    // // Populate the GEO::vector<T> with elements from the array.
-    // for (size_t i = 0; i < sz; ++i) {
-    //     geo_vec.data()[i] = data[i];
-    // }
-
     return geo_vec;
 }
 
@@ -135,13 +142,7 @@ nb::tuple Tetrahedralize(
     using namespace floatTetWild;
     using namespace Eigen;
     GEO::initialize();
-
-    // There's some std::cout used in floatTetWild that needs to be redirected
-    std::streambuf *orig_cout_buf;
-    if (quiet) {
-        orig_cout_buf = std::cout.rdbuf();
-        std::cout.rdbuf(NULL);
-    }
+    CoutRedirect cout_guard(quiet);
 
     if (!quiet) {
         std::cout << "Starting tetrahedralization..." << std::endl;
@@ -284,11 +285,6 @@ nb::tuple Tetrahedralize(
         std::cout << "Tetrahedralization completed. Extracting mesh data..." << std::endl;
     }
 
-    // return stdout
-    if (orig_cout_buf) {
-        std::cout.rdbuf(orig_cout_buf);
-    }
-
     return extractMeshDataNumpy(mesh, vtk_ordering);
 }
 

{pytetwild-0.2.0 → pytetwild-0.2.2}/tests/test_pytetwild.py

@@ -48,7 +48,7 @@ def test_tetrahedralize_abs_edge_len() -> None:
 def test_tetrahedralize_edge_length_fac() -> None:
     mesh = pv.Cube().triangulate()
     result = tetrahedralize_pv(mesh, num_opt_iter=5)  # default is 0.05
-    result_very_coarse = tetrahedralize_pv(mesh, edge_length_fac=0.1, num_opt_iter=5)
+    result_very_coarse = tetrahedralize_pv(mesh, edge_length_fac=0.1, num_opt_iter=5, quiet=True)
     assert result_very_coarse.n_cells < result.n_cells
 
     # invalid edge length