Merge pull request #910 from nschloe/remove-python-3.5

Remove python 3.5

Author: nschloe

.github/workflows/ci.yml

@@ -30,7 +30,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        python-version: [3.5, 3.6, 3.7, 3.8]
+        python-version: [3.6, 3.7, 3.8]
     steps:
     - uses: actions/setup-python@v2
       with:

meshio/_cli/_ascii.py

@@ -16,7 +16,7 @@ def ascii(argv=None):
     fmt = args.input_format or _filetype_from_path(pathlib.Path(args.infile))
 
     size = os.stat(args.infile).st_size
-    print("File size before: {:.2f} MB".format(size / 1024 ** 2))
+    print(f"File size before: {size / 1024 ** 2:.2f} MB")
     mesh = read(args.infile, file_format=args.input_format)
 
     # # Some converters (like VTK) require `points` to be contiguous.
@@ -42,11 +42,11 @@ def ascii(argv=None):
     elif fmt == "xdmf":
         xdmf.write(args.infile, mesh, data_format="XML")
     else:
-        print("Don't know how to convert {} to ASCII format.".format(args.infile))
+        print(f"Don't know how to convert {args.infile} to ASCII format.")
         exit(1)
 
     size = os.stat(args.infile).st_size
-    print("File size after:  {:.2f} MB".format(size / 1024 ** 2))
+    print(f"File size after: {size / 1024 ** 2:.2f} MB")
 
 
 def _get_parser():

meshio/_cli/_binary.py

@@ -16,7 +16,7 @@ def binary(argv=None):
     fmt = args.input_format or _filetype_from_path(pathlib.Path(args.infile))
 
     size = os.stat(args.infile).st_size
-    print("File size before: {:.2f} MB".format(size / 1024 ** 2))
+    print(f"File size before: {size / 1024 ** 2:.2f} MB")
     mesh = read(args.infile, file_format=args.input_format)
 
     # # Some converters (like VTK) require `points` to be contiguous.
@@ -42,11 +42,11 @@ def binary(argv=None):
     elif fmt == "xdmf":
         xdmf.write(args.infile, mesh, data_format="HDF")
     else:
-        print("Don't know how to convert {} to binary format.".format(args.infile))
+        print(f"Don't know how to convert {args.infile} to binary format.")
         exit(1)
 
     size = os.stat(args.infile).st_size
-    print("File size after:  {:.2f} MB".format(size / 1024 ** 2))
+    print(f"File size after: {size / 1024 ** 2:.2f} MB")
 
 
 def _get_parser():

meshio/_cli/_compress.py

@@ -16,7 +16,7 @@ def compress(argv=None):
     fmt = args.input_format or _filetype_from_path(pathlib.Path(args.infile))
 
     size = os.stat(args.infile).st_size
-    print("File size before: {:.2f} MB".format(size / 1024 ** 2))
+    print(f"File size before: {size / 1024 ** 2:.2f} MB")
     mesh = read(args.infile, file_format=args.input_format)
 
     # # Some converters (like VTK) require `points` to be contiguous.
@@ -60,11 +60,11 @@ def compress(argv=None):
             compression_opts=9 if args.max else 4,
         )
     else:
-        print("Don't know how to compress {}.".format(args.infile))
+        print(f"Don't know how to compress {args.infile}.")
         exit(1)
 
     size = os.stat(args.infile).st_size
-    print("File size after:  {:.2f} MB".format(size / 1024 ** 2))
+    print(f"File size after: {size / 1024 ** 2:.2f} MB")
 
 
 def _get_parser():

meshio/_cli/_decompress.py

@@ -16,7 +16,7 @@ def decompress(argv=None):
     fmt = args.input_format or _filetype_from_path(pathlib.Path(args.infile))
 
     size = os.stat(args.infile).st_size
-    print("File size before: {:.2f} MB".format(size / 1024 ** 2))
+    print(f"File size before: {size / 1024 ** 2:.2f} MB")
     mesh = read(args.infile, file_format=args.input_format)
 
     # # Some converters (like VTK) require `points` to be contiguous.
@@ -34,11 +34,11 @@ def decompress(argv=None):
     elif fmt == "xdmf":
         xdmf.write(args.infile, mesh, data_format="HDF", compression=None)
     else:
-        print("Don't know how to decompress {}.".format(args.infile))
+        print(f"Don't know how to decompress {args.infile}.")
         exit(1)
 
     size = os.stat(args.infile).st_size
-    print("File size after:  {:.2f} MB".format(size / 1024 ** 2))
+    print(f"File size after:  {size / 1024 ** 2:.2f} MB")
 
 
 def _get_parser():

meshio/_cli/_helpers.py

@@ -1,17 +1,13 @@
-import sys
+from sys import version_info
 
 from ..__about__ import __version__
 
 
 def _get_version_text():
     return "\n".join(
         [
-            "meshio {} [Python {}.{}.{}]".format(
-                __version__,
-                sys.version_info.major,
-                sys.version_info.minor,
-                sys.version_info.micro,
-            ),
+            f"meshio {__version__} "
+            f"[Python {version_info.major}.{version_info.minor}.{version_info.micro}]",
             "Copyright (c) 2015-2020 Nico Schlömer et al.",
         ]
     )

meshio/_cxml/etree.py

@@ -22,7 +22,7 @@ def set(self, key, value):
         self.attrib[key] = value
 
     def write(self, f):
-        kw_list = ['{}="{}"'.format(key, value) for key, value in self.attrib.items()]
+        kw_list = [f'{key}="{value}"' for key, value in self.attrib.items()]
         f.write("<{}>\n".format(" ".join([self.name] + kw_list)))
         if self.text:
             f.write(self.text)
@@ -32,7 +32,7 @@ def write(self, f):
             f.write("\n")
         for child in self._children:
             child.write(f)
-        f.write("</{}>\n".format(self.name))
+        f.write(f"</{self.name}>\n")
 
 
 class SubElement(Element):
@@ -46,7 +46,7 @@ def __init__(self, text):
         self.text = text
 
     def write(self, f):
-        f.write("<!--{}-->\n".format(self.text))
+        f.write(f"<!--{self.text}-->\n")
 
 
 class ElementTree:

meshio/_helpers.py

@@ -30,7 +30,7 @@ def _filetype_from_path(path):
             out = extension_to_filetype[ext]
 
     if out is None:
-        raise ReadError("Could not deduce file format from extension '{}'.".format(ext))
+        raise ReadError(f"Could not deduce file format from extension '{ext}'.")
     return out
 
 
@@ -50,17 +50,17 @@ def read(filename, file_format=None):
                 "tetgen format is spread across multiple files "
                 "and so cannot be read from a buffer"
             )
-        msg = "Unknown file format '{}'".format(file_format)
+        msg = f"Unknown file format '{file_format}'"
     else:
         path = pathlib.Path(filename)
         if not path.exists():
-            raise ReadError("File {} not found.".format(filename))
+            raise ReadError(f"File {filename} not found.")
 
         if not file_format:
             # deduce file format from extension
             file_format = _filetype_from_path(path)
 
-        msg = "Unknown file format '{}' of '{}'.".format(file_format, filename)
+        msg = f"Unknown file format '{file_format}' of '{filename}'."
 
     if file_format not in reader_map:
         raise ReadError(msg)
@@ -78,7 +78,7 @@ def write_points_cells(
     point_sets=None,
     cell_sets=None,
     file_format=None,
-    **kwargs
+    **kwargs,
 ):
     points = numpy.asarray(points)
     if isinstance(cells, dict):

meshio/_mesh.py

@@ -43,32 +43,34 @@ def __init__(
 
         for key, data in self.cell_data.items():
             assert len(data) == len(cells), (
-                "Incompatible cell data. {} cell blocks, but '{}' has {} blocks."
-            ).format(len(cells), key, len(data))
+                "Incompatible cell data. "
+                f"{len(cells)} cell blocks, but '{key}' has {len(data)} blocks."
+            )
 
     def __repr__(self):
-        lines = [
-            "<meshio mesh object>",
-            "  Number of points: {}".format(len(self.points)),
-        ]
+        lines = ["<meshio mesh object>", f"  Number of points: {len(self.points)}"]
         if len(self.cells) > 0:
             lines.append("  Number of cells:")
             for tpe, elems in self.cells:
-                lines.append("    {}: {}".format(tpe, len(elems)))
+                lines.append(f"    {tpe}: {len(elems)}")
         else:
             lines.append("  No cells.")
 
         if self.point_sets:
-            lines.append("  Point sets: {}".format(", ".join(self.point_sets.keys())))
+            names = ", ".join(self.point_sets.keys())
+            lines.append(f"  Point sets: {names}")
 
         if self.cell_sets:
-            lines.append("  Cell sets: {}".format(", ".join(self.cell_sets.keys())))
+            names = ", ".join(self.cell_sets.keys())
+            lines.append(f"  Cell sets: {names}")
 
         if self.point_data:
-            lines.append("  Point data: {}".format(", ".join(self.point_data.keys())))
+            names = ", ".join(self.point_data.keys())
+            lines.append(f"  Point data: {names}")
 
         if self.cell_data:
-            lines.append("  Cell data: {}".format(", ".join(self.cell_data.keys())))
+            names = ", ".join(self.cell_data.keys())
+            lines.append(f"  Cell data: {names}")
 
         return "\n".join(lines)
 
@@ -90,7 +92,8 @@ def prune(self):
         self.cells = new_cells
         self.cell_data = new_cell_data
 
-        print("Pruned cell types: {}".format(", ".join(prune_list)))
+        pruned = ", ".join(prune_list)
+        print(f"Pruned cell types: {pruned}")
 
         # remove_orphaned_nodes.
         # find which nodes are not mentioned in the cells and remove them
@@ -229,7 +232,7 @@ def int_data_to_sets(self):
             names = sorted(list(set(key.split("-"))))
             if len(names) != len(tags):
                 # alternative names
-                names = ["set{}".format(tag) for tag in tags]
+                names = [f"set{tag}" for tag in tags]
 
             for name, tag in zip(names, tags):
                 self.cell_sets[name] = []

meshio/abaqus/_abaqus.py

@@ -164,7 +164,7 @@ def read_buffer(f):
                     elif set_name in cell_sets_element.keys():
                         cell_sets[name].append(cell_sets_element[set_name])
                     else:
-                        raise ReadError("Unknown cell set '{}'".format(set_name))
+                        raise ReadError(f"Unknown cell set '{set_name}'")
         else:
             # There are just too many Abaqus keywords to explicitly skip them.
             line = f.readline()
@@ -217,7 +217,7 @@ def _read_nodes(f):
 def _read_cells(f, params_map, point_ids):
     etype = params_map["TYPE"]
     if etype not in abaqus_to_meshio_type.keys():
-        raise ReadError("Element type not available: {}".format(etype))
+        raise ReadError(f"Element type not available: {etype}")
 
     cell_type = abaqus_to_meshio_type[etype]
 
@@ -281,7 +281,7 @@ def get_param_map(word, required_keys=None):
     msg = ""
     for key in required_keys:
         if key not in param_map:
-            msg += "{} not found in {}\n".format(key, word)
+            msg += f"{key} not found in {word}\n"
     if msg:
         raise RuntimeError(msg)
     return param_map
@@ -315,7 +315,7 @@ def write(filename, mesh, float_fmt=".16e", translate_cell_names=True):
     with open_file(filename, "wt") as f:
         f.write("*HEADING\n")
         f.write("Abaqus DataFile Version 6.14\n")
-        f.write("written by meshio v{}\n".format(__version__))
+        f.write(f"written by meshio v{__version__}\n")
         f.write("*NODE\n")
         fmt = ", ".join(["{}"] + ["{:" + float_fmt + "}"] * mesh.points.shape[1]) + "\n"
         for k, x in enumerate(mesh.points):
@@ -325,7 +325,7 @@ def write(filename, mesh, float_fmt=".16e", translate_cell_names=True):
             name = (
                 meshio_to_abaqus_type[cell_type] if translate_cell_names else cell_type
             )
-            f.write("*ELEMENT, TYPE={}\n".format(name))
+            f.write(f"*ELEMENT, TYPE={name}\n")
             for row in node_idcs:
                 eid += 1
                 nids_strs = (str(nid + 1) for nid in row.tolist())
@@ -337,7 +337,7 @@ def write(filename, mesh, float_fmt=".16e", translate_cell_names=True):
             for k, v in mesh.cell_sets.items():
                 if len(v[ic]) > 0:
                     els = [str(i + 1 + offset) for i in v[ic]]
-                    f.write("*ELSET, ELSET={}\n".format(k))
+                    f.write(f"*ELSET, ELSET={k}\n")
                     f.write(
                         ",\n".join(
                             ",".join(els[i : i + nnl]) for i in range(0, len(els), nnl)
@@ -348,7 +348,7 @@ def write(filename, mesh, float_fmt=".16e", translate_cell_names=True):
 
         for k, v in mesh.point_sets.items():
             nds = [str(i + 1) for i in v]
-            f.write("*NSET, NSET={}\n".format(k))
+            f.write(f"*NSET, NSET={k}\n")
             f.write(
                 ",\n".join(",".join(nds[i : i + nnl]) for i in range(0, len(nds), nnl))
                 + "\n"

meshio/ansys/_ansys.py

@@ -389,13 +389,13 @@ def read(filename):  # noqa: C901
 def write(filename, mesh, binary=True):
     with open_file(filename, "wb") as fh:
         # header
-        fh.write('(1 "meshio {}")\n'.format(__version__).encode("utf8"))
+        fh.write(f'(1 "meshio {__version__}")\n'.encode("utf8"))
 
         # dimension
         dim = mesh.points.shape[1]
         if dim not in [2, 3]:
-            raise WriteError("Can only write dimension 2, 3, got {}.".format(dim))
-        fh.write(("(2 {})\n".format(dim)).encode("utf8"))
+            raise WriteError(f"Can only write dimension 2, 3, got {dim}.")
+        fh.write((f"(2 {dim})\n").encode("utf8"))
 
         # total number of nodes
         first_node_index = 1
@@ -407,7 +407,7 @@ def write(filename, mesh, binary=True):
 
         # total number of cells
         total_num_cells = sum([len(c) for c in mesh.cells])
-        fh.write(("(12 (0 1 {:x} 0))\n".format(total_num_cells)).encode("utf8"))
+        fh.write((f"(12 (0 1 {total_num_cells:x} 0))\n").encode("utf8"))
 
         # Write nodes
         key = "3010" if binary else "10"
@@ -465,7 +465,7 @@ def write(filename, mesh, binary=True):
             if binary:
                 (values + first_node_index).tofile(fh)
                 fh.write(b"\n)")
-                fh.write(("End of Binary Section {})\n".format(key)).encode("utf8"))
+                fh.write((f"End of Binary Section {key})\n").encode("utf8"))
             else:
                 numpy.savetxt(fh, values + first_node_index, fmt="%x")
                 fh.write(b"))\n")

meshio/avsucd/_avsucd.py

@@ -156,7 +156,7 @@ def write(filename, mesh):
 
     with open_file(filename, "w") as f:
         # Write meshio version
-        f.write("# Written by meshio v{}\n".format(version))
+        f.write(f"# Written by meshio v{version}\n")
 
         # Write first line
         num_nodes = len(mesh.points)
@@ -236,7 +236,7 @@ def _write_data(f, labels, data_array, num_entities, num_data, num_data_sum):
     f.write("{} {}\n".format(len(num_data), num_data_str))
 
     for label in labels:
-        f.write("{}, real\n".format(label))
+        f.write(f"{label}, real\n")
 
     data_array = numpy.column_stack((numpy.arange(1, num_entities + 1), data_array))
     numpy.savetxt(f, data_array, delimiter=" ", fmt=["%d"] + ["%.14e"] * num_data_sum)