Merge pull request #1188 from nschloe/3.10

3.10

Author: nschloe

.github/workflows/ci.yml

@@ -23,7 +23,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        python-version: [3.7, 3.8, 3.9]
+        python-version: ["3.7", "3.8", "3.9", "3.10-dev"]
     steps:
     - uses: actions/setup-python@v2
       with:

justfile

@@ -5,7 +5,7 @@ default:
 
 tag:
 	@if [ "$(git rev-parse --abbrev-ref HEAD)" != "main" ]; then exit 1; fi
-	curl -H "Authorization: token `cat ~/.github-access-token`" -d '{"tag_name": "{{version}}"}' https://api.github.com/repos/nschloe/meshio/releases
+	curl -H "Authorization: token `cat ~/.github-access-token`" -d '{"tag_name": "v{{version}}"}' https://api.github.com/repos/nschloe/meshio/releases
 
 upload: clean
 	@if [ "$(git rev-parse --abbrev-ref HEAD)" != "main" ]; then exit 1; fi

setup.cfg

@@ -1,6 +1,6 @@
 [metadata]
 name = meshio
-version = 5.0.1
+version = 5.0.2
 author = Nico Schlömer et al.
 author_email = [email protected]
 description = I/O for many mesh formats
@@ -22,6 +22,7 @@ classifiers =
     Programming Language :: Python :: 3.7
     Programming Language :: Python :: 3.8
     Programming Language :: Python :: 3.9
+    Programming Language :: Python :: 3.10
     Topic :: Scientific/Engineering
     Topic :: Utilities
 keywords =

src/meshio/_helpers.py

@@ -1,5 +1,6 @@
+from __future__ import annotations
+
 import pathlib
-from typing import List, Optional
 
 import numpy as np
 
@@ -13,7 +14,7 @@
 _writer_map = {}
 
 
-def register(name: str, extensions: List[str], reader, writer_map):
+def register(name: str, extensions: list[str], reader, writer_map):
     for ext in extensions:
         extension_to_filetype[ext] = name
 
@@ -35,7 +36,7 @@ def _filetype_from_path(path: pathlib.Path):
     return out
 
 
-def read(filename, file_format: Optional[str] = None):
+def read(filename, file_format: str | None = None):
     """Reads an unstructured mesh with added data.
 
     :param filenames: The files/PathLikes to read from.
@@ -97,7 +98,7 @@ def write_points_cells(
     mesh.write(filename, file_format=file_format, **kwargs)
 
 
-def write(filename, mesh: Mesh, file_format: Optional[str] = None, **kwargs):
+def write(filename, mesh: Mesh, file_format: str | None = None, **kwargs):
     """Writes mesh together with data to a file.
 
     :params filename: File to write to.

src/meshio/_mesh.py

@@ -1,6 +1,7 @@
+from __future__ import annotations
+
 import collections
 import warnings
-from typing import Optional
 
 import numpy as np
 
@@ -59,8 +60,8 @@ def __init__(
             self.point_data[key] = np.asarray(item)
             if len(self.point_data[key]) != len(self.points):
                 raise ValueError(
-                    f"len(points) = {len(points)}, "
-                    f'but len(point_data["{key}"]) = {len(point_data[key])}'
+                    f"len(points) = {len(self.points)}, "
+                    f'but len(point_data["{key}"]) = {len(self.point_data[key])}'
                 )
 
         # assert cell data consistency and convert to numpy arrays
@@ -212,7 +213,7 @@ def prune_z_0(self, tol: float = 1.0e-13):
         if self.points.shape[1] == 3 and np.all(np.abs(self.points[:, 2]) < tol):
             self.points = self.points[:, :2]
 
-    def write(self, path_or_buf, file_format: Optional[str] = None, **kwargs):
+    def write(self, path_or_buf, file_format: str | None = None, **kwargs):
         # avoid circular import
         from ._helpers import write
 

src/meshio/svg/_svg.py

@@ -1,4 +1,5 @@
-from typing import Optional, Union
+from __future__ import annotations
+
 from xml.etree import ElementTree as ET
 
 import numpy as np
@@ -11,11 +12,11 @@ def write(
     filename,
     mesh,
     float_fmt: str = ".3f",
-    stroke_width: Optional[str] = None,
+    stroke_width: str | None = None,
     # Use a default image_width (not None). If set to None, images will come out at the
     # width of the mesh (which is okay). Some viewers (e.g., eog) have problems
     # displaying SVGs of width around 1 since they interpret it as the width in pixels.
-    image_width: Optional[Union[int, float]] = 100,
+    image_width: int | float | None = 100,
     # ParaView's default colors
     fill: str = "#c8c5bd",
     stroke: str = "#000080",