pre-commit run

Author: Alexboiboi

CHANGELOG.md

@@ -16,4 +16,4 @@
 
 # 0.2.0a0
 * renaming xi->susceptibility ([#5](https://github.com/magpylib/magpylib-material-response/pull/5))
-* update to magpylib v5 ([#4](https://github.com/magpylib/magpylib-material-response/pull/4))
+* update to magpylib v5 ([#4](https://github.com/magpylib/magpylib-material-response/pull/4))

src/magpylib_material_response/demag.py

@@ -2,6 +2,8 @@
 
 # +
 # pylint: disable=invalid-name, redefined-outer-name, protected-access
+from __future__ import annotations
+
 import sys
 from collections import Counter
 
@@ -55,25 +57,24 @@ def get_susceptibilities(sources, susceptibility):
                 susis.append(susceptibility)
             else:
                 raise ValueError("susceptibility is not scalar or array fo length 3")
+    # susceptibilities as input to demag function
+    elif np.isscalar(susceptibility):
+        susis = np.ones((n, 3)) * susceptibility
+    elif len(susceptibility) == 3:
+        susis = np.tile(susceptibility, (n, 1))
+        if n == 3:
+            raise ValueError(
+                "Apply_demag input susceptibility is ambiguous - either scalar list or vector single entry. "
+                "Please choose different means of input or change the number of cells in the Collection."
+            )
     else:
-        # susceptibilities as input to demag function
-        if np.isscalar(susceptibility):
-            susis = np.ones((n, 3)) * susceptibility
-        elif len(susceptibility) == 3:
-            susis = np.tile(susceptibility, (n, 1))
-            if n == 3:
-                raise ValueError(
-                    "Apply_demag input susceptibility is ambiguous - either scalar list or vector single entry. "
-                    "Please choose different means of input or change the number of cells in the Collection."
-                )
-        else:
-            if len(susceptibility) != n:
-                raise ValueError(
-                    "Apply_demag input susceptibility must be scalar, 3-vector, or same length as input Collection."
-                )
-            susis = np.array(susceptibility)
-            if susis.ndim == 1:
-                susis = np.repeat(susis, 3).reshape(n, 3)
+        if len(susceptibility) != n:
+            raise ValueError(
+                "Apply_demag input susceptibility must be scalar, 3-vector, or same length as input Collection."
+            )
+        susis = np.array(susceptibility)
+        if susis.ndim == 1:
+            susis = np.repeat(susis, 3).reshape(n, 3)
 
     susis = np.reshape(susis, 3 * n, order="F")
     return np.array(susis)
@@ -141,7 +142,7 @@ def demag_tensor(
 
     if pairs_matching and split != 1:
         raise ValueError("Pairs matching does not support splitting")
-    elif max_dist != 0:
+    if max_dist != 0:
         mask_inds, getH_params, pos0, rot0 = filter_distance(
             src_list, max_dist, return_params=False, return_base_geo=True
         )
@@ -179,7 +180,7 @@ def demag_tensor(
                         H_unit_pol = []
                         for split_ind, src_list_subset in enumerate(src_list_split):
                             logger.info(
-                                f"Sources subset {split_ind+1}/{len(src_list_split)}"
+                                f"Sources subset {split_ind + 1}/{len(src_list_split)}"
                             )
                             if src_list_subset.size > 0:
                                 H_unit_pol.append(

src/magpylib_material_response/meshing.py

@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 from collections import Counter
 from itertools import product
 

src/magpylib_material_response/meshing_utils.py

@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 from itertools import product
 
 import numpy as np

src/magpylib_material_response/package_data/datasets/FEMdata_test_cuboids.json

@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 import numpy as np
 
 

src/magpylib_material_response/package_data/datasets/FEMdata_test_softmag.json

@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 import threading
 import time
 import warnings
@@ -61,7 +63,7 @@ def timelog(msg, min_log_time=1):
 
     if end > min_log_time:
         logger.opt(colors=True).success(
-            f"{msg} done" f"<green> 🕑 {round(end, 3)}sec</green>"
+            f"{msg} done<green> 🕑 {round(end, 3)}sec</green>"
         )
 
 

src/magpylib_material_response/polyline.py

@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 import magpylib as magpy
 import numpy as np
 

src/magpylib_material_response/utils.py

@@ -1,11 +1,12 @@
+from __future__ import annotations
+
 import magpylib as magpy
 import numpy as np
 
 from magpylib_material_response import demag, meshing
 
 
 def test_isotropic_susceptibility():
-
     cells = 1000  # should be >=1000, otherwise discretization error too large
 
     magnet = magpy.magnet.Cuboid(dimension=(1e-3, 1e-3, 1e-3), polarization=(0, 0, 1.1))
@@ -25,7 +26,6 @@ def test_isotropic_susceptibility():
 
 
 def test_anisotropic_susceptibility():
-
     cells = 1000  # should be >=1000, otherwise discretization error too large
 
     magnet = magpy.magnet.Cuboid(dimension=(1e-3, 1e-3, 1e-3), polarization=(0, 0, 1.1))
@@ -45,7 +45,6 @@ def test_anisotropic_susceptibility():
 
 
 def test_negative_susceptibility():
-
     cells = 1000  # should be >=1000, otherwise discretization error too large
 
     magnet = magpy.magnet.Cuboid(