Merge branch 'dev' of https://github.com/gimli-org/gimli into dev

gimli-org · Dec 13, 2024 · fdde68b · fdde68b
2 parents a149879 + 62c40a7
commit fdde68b
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 3 deletions.
diff --git a/pygimli/CMakeLists.txt b/pygimli/CMakeLists.txt
@@ -49,7 +49,7 @@ else()
     add_custom_target(whl${TARGET_NAME}PackageBuild DEPENDS whlpgcore
         COMMAND "${Python_EXECUTABLE}" -m pip wheel . --wheel-dir=${WHEELHOUSE} --find-links ${WHEELHOUSE}
         WORKING_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}"
-        COMMENT "Building python wheel package for ${TARGET_NAME}"
+        COMMENT "Building python wheel package (${WHEELFILE}) for ${TARGET_NAME}"
     )
 
     add_custom_target(whl${TARGET_NAME} DEPENDS whl${TARGET_NAME}PackageBuild)
@@ -59,12 +59,12 @@ else()
     add_custom_target(whl${TARGET_NAME}TestInstall DEPENDS whl${TARGET_NAME} DEPENDS whlpgcoreTestRun
         COMMAND "${Python3_EXECUTABLE}" -m pip uninstall -y ${TARGET_NAME}
         COMMAND "${Python3_EXECUTABLE}" -m pip install ${WHEELHOUSE}/${PY_WHEELFILE} --quiet --find-links ${WHEELHOUSE}
-        COMMENT "Installing ${TARGET_NAME} in virtual test environment"
+        COMMENT "Installing ${TARGET_NAME} ((${WHEELFILE}) in virtual test environment"
     )
     add_custom_target(whl${TARGET_NAME}TestRun DEPENDS whl${TARGET_NAME}TestInstall
         COMMAND ${Python3_EXECUTABLE} -c "import pygimli as pg; pg.version()"
         VERBATIM
-        COMMENT "Testing ${TARGET_NAME} installation in virtual test environment. ${Python3_EXECUTABLE} -c \'import pygimli as pg; pg.version()\'"
+        COMMENT "Testing ${TARGET_NAME} installation (${WHEELFILE}) in virtual test environment. ${Python3_EXECUTABLE} -c \'import pygimli as pg; pg.version()\'"
     )
     add_custom_target(whl${TARGET_NAME}Test DEPENDS whl${TARGET_NAME}TestRun)
 

diff --git a/pygimli/meshtools/mesh.py b/pygimli/meshtools/mesh.py
@@ -71,6 +71,9 @@ def createMesh(poly, quality=32, area=0.0, smooth=None, switches=None,
     >>> ax, _ = pg.show(mt.createMesh(rect, quality=33, area=0.01))
     >>> pg.wait()
     """
+    #mpl somehow/somewhere changes locale back tu system settings
+    pg.checkAndFixLocaleDecimal_point()
+
     #  poly == [pg.Mesh, ]
     if isinstance(poly, list):
         if isinstance(poly[0], pg.Mesh):

diff --git a/pygimli/testing/test_SparseMatrix.py b/pygimli/testing/test_SparseMatrix.py
@@ -166,6 +166,7 @@ def test_BlockMatrix(self):
         B.add(A, 10, 10)
         print(B)
 
+
     def test_Misc(self):
         D = pg.SparseMapMatrix(3, 4)
         for i in range(D.rows()):
@@ -182,5 +183,7 @@ def test_Misc(self):
         np.testing.assert_allclose(D.row(2), [1.0, 0.0, 1.0, 1.0])
 
 
+
+
 if __name__ == '__main__':
     unittest.main()