Merge pull request #202 from tataratat/ft-add-update

Ft add update + v0.0.25

Author: j042

.github/workflows/build_and_upload_wheels.yml renamed to .github/workflows/deploy.yml

@@ -10,8 +10,8 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        python-version: ["3.7", "3.8", "3.9", "3.10", "3.11", "3.12"]
-        os: [ubuntu-20.04, macos-latest]
+        python-version: ["3.8", "3.9", "3.10", "3.11", "3.12"]
+        os: [ubuntu-20.04, macos-13, macos-14, windows-latest]
 
     steps:
     - uses: actions/checkout@v3

.github/workflows/tests.yml

@@ -3,4 +3,4 @@
 Current version.
 """
 
-version = "0.0.24"
+version = "0.0.25"

gustaf/_version.py

@@ -251,6 +251,20 @@ def __contains__(self, key):
         """
         return key in self._saved
 
+    def __len__(self):
+        """
+        Returns number of items.
+
+        Parameters
+        ----------
+        None
+
+        Returns
+        -------
+        len: int
+        """
+        return len(self._saved)
+
     def pop(self, key, default=None):
         """
         Applied pop() to saved data
@@ -318,6 +332,20 @@ def items(self):
         """
         return self._saved.items()
 
+    def update(self, **kwargs):
+        """
+        Updates given kwargs using __setitem__.
+
+        Parameters
+        ----------
+        **kwargs: kwargs
+
+        Returns
+        -------
+        None
+        """
+        self._saved.update(**kwargs)
+
 
 class ComputedData(DataHolder):
     _depends = None

gustaf/helpers/data.py

@@ -84,7 +84,7 @@ def load(fname):
     return meshes[0] if len(meshes) == 1 else meshes
 
 
-def export(mesh, fname, submeshes=None, **kwargs):
+def export(fname, mesh, submeshes=None, **kwargs):
     """Export mesh elements and vertex data into meshio and use its write
     function. The definition of submeshes with identical vertex coordinates
     is possible. In that case vertex numbering and data from the main mesh
@@ -132,10 +132,10 @@ def export(mesh, fname, submeshes=None, **kwargs):
 
     Parameters
     ------------
-    mesh: Edges, Faces or Volumes
-      Input mesh
     fname: Union[str, pathlib.Path]
       File to save the mesh in.
+    mesh: Edges, Faces or Volumes
+      Input mesh
     submeshes: Iterable
       Submeshes where the vertices are identical to the main mesh. The element
       type can be identical to mesh.elements or lower-dimensional (e.g.
@@ -164,7 +164,8 @@ def export(mesh, fname, submeshes=None, **kwargs):
 
     cells = []
     # Merge main mesh and submeshes in one list
-    meshes = [mesh]
+    meshes = mesh if isinstance(mesh, list) else [mesh]
+
     if submeshes is not None:
         meshes.extend(submeshes)
 

gustaf/io/meshio.py

@@ -107,15 +107,15 @@ def extract_values(fname, start_index, n_lines, total_lines, dtype):
         return mesh
 
 
-def export(mesh, fname):
+def export(fname, mesh):
     """Export mesh in MFEM format. Supports 2D triangle and quadrilateral
     meshes. Does not support different element attributes or difference in
     vertex dimension and mesh dimension.
 
     Parameters
     ------------
-    mesh: Faces
     fname: str
+    mesh: Faces
 
     Returns
     ------------

gustaf/io/mfem.py

@@ -116,8 +116,8 @@ def load(
 
 
 def export(
-    mesh,
     fname,
+    mesh,
     space_time=False,
     dual=False,
 ):

gustaf/io/mixd.py

@@ -61,14 +61,14 @@ def load(fname):
     return mesh
 
 
-def export(mesh, fname):
+def export(fname, mesh):
     """Export in Nutils format. Files are saved as np.savez().
     Supports triangle,and tetrahedron Meshes.
 
     Parameters
     -----------
-    mesh: Faces or Volumes
     fname: str
+    mesh: Faces or Volumes
 
     Returns
     --------

gustaf/io/nutils.py

@@ -10,13 +10,12 @@ keywords = [
     "visualization",
     "mesh",
 ]
-requires-python = ">=3.7"
+requires-python = ">=3.8"
 license = {file = "LICENSE.txt"}
 classifiers = [
     "Development Status :: 3 - Alpha",
     "License :: OSI Approved :: MIT License",
     "Programming Language :: Python",
-    "Programming Language :: Python :: 3.7",
     "Programming Language :: Python :: 3.8",
     "Programming Language :: Python :: 3.9",
     "Programming Language :: Python :: 3.10",
@@ -81,7 +80,7 @@ version = {attr = "gustaf._version.version"}
 
 [tool.ruff]
 line-length = 79
-target-version = "py37"
+target-version = "py38"
 
 [tool.ruff.lint]
 select = [
@@ -107,7 +106,6 @@ ignore = [
     "PLR0913", # Too many arguments to function call
     "PLR0915", # Too many statements
     "B904", # Within an `except` clause, raise exceptions with ...
-    # "PLR0911", # Too many return statements
 ]
 
 [tool.ruff.lint.per-file-ignores]