[pre-commit.ci] pre-commit autoupdate (#728)

* [pre-commit.ci] pre-commit autoupdate + switch to isort updates: - [github.com/asottile/pyupgrade: v3.15.0 → v3.15.1](asottile/pyupgrade@v3.15.0...v3.15.1) - [github.com/psf/black: 23.12.1 → 24.2.0](psf/black@23.12.1...24.2.0) * [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci * switch to isort --------- Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com> Co-authored-by: Alexandre Boisselet <alexabois@gmail.com>
magpylib · Mar 8, 2024 · bf6cd29 · bf6cd29
1 parent aefa19a
commit bf6cd29
Show file tree

Hide file tree

Showing 61 changed files with 149 additions and 145 deletions.
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -11,21 +11,21 @@ repos:
       - id: debug-statements
         language_version: python3
 
-  - repo: https://github.com/asottile/reorder-python-imports
-    rev: v3.12.0
+  - repo: https://github.com/pycqa/isort
+    rev: 5.13.2
     hooks:
-      - id: reorder-python-imports
-        args: [--py38-plus]
+      - id: isort
+        name: isort (python)
 
   - repo: https://github.com/asottile/pyupgrade
-    rev: v3.15.0
+    rev: v3.15.1
     hooks:
       - id: pyupgrade
         args: [--py38-plus]
 
 
   - repo: https://github.com/psf/black
-    rev: "23.12.1"
+    rev: "24.2.0"
     hooks:
       - id: black
 

diff --git a/docs/conf.py b/docs/conf.py
@@ -25,9 +25,9 @@
 
 # Location of Sphinx files
 sys.path.insert(0, os.path.abspath("./../"))  ##Add the folder one level above
-os.environ[
-    "SPHINX_APIDOC_OPTIONS"
-] = "members,show-inheritance"  ## Hide undocumented members
+os.environ["SPHINX_APIDOC_OPTIONS"] = (
+    "members,show-inheritance"  ## Hide undocumented members
+)
 import sphinx.ext.apidoc
 
 # from sphinx_gallery.sorting import FileNameSortKey
@@ -68,7 +68,6 @@ def setup(app):
 # The full version, including alpha/beta/rc tags
 from magpylib import __version__ as release
 
-
 # -- General configuration ---------------------------------------------------
 
 # If your documentation needs a minimal Sphinx version, state it here.

diff --git a/magpylib/__init__.py b/magpylib/__init__.py
@@ -54,10 +54,19 @@
 
 # create interface to outside of package
 from scipy.constants import mu_0
-from magpylib._src.defaults.defaults_utility import SUPPORTED_PLOTTING_BACKENDS
-from magpylib import magnet, current, misc, core, graphics
+
+from magpylib import core
+from magpylib import current
+from magpylib import graphics
+from magpylib import magnet
+from magpylib import misc
 from magpylib._src.defaults.defaults_classes import default_settings as defaults
-from magpylib._src.fields import getB, getH, getM, getJ
-from magpylib._src.obj_classes.class_Sensor import Sensor
+from magpylib._src.defaults.defaults_utility import SUPPORTED_PLOTTING_BACKENDS
+from magpylib._src.display.display import show
+from magpylib._src.display.display import show_context
+from magpylib._src.fields import getB
+from magpylib._src.fields import getH
+from magpylib._src.fields import getJ
+from magpylib._src.fields import getM
 from magpylib._src.obj_classes.class_Collection import Collection
-from magpylib._src.display.display import show, show_context
+from magpylib._src.obj_classes.class_Sensor import Sensor
diff --git a/magpylib/_src/defaults/defaults_classes.py b/magpylib/_src/defaults/defaults_classes.py
@@ -1,7 +1,7 @@
+from magpylib._src.defaults.defaults_utility import SUPPORTED_PLOTTING_BACKENDS
+from magpylib._src.defaults.defaults_utility import MagicProperties
 from magpylib._src.defaults.defaults_utility import color_validator
 from magpylib._src.defaults.defaults_utility import get_defaults_dict
-from magpylib._src.defaults.defaults_utility import MagicProperties
-from magpylib._src.defaults.defaults_utility import SUPPORTED_PLOTTING_BACKENDS
 from magpylib._src.defaults.defaults_utility import validate_property_class
 from magpylib._src.style import DisplayStyle
 

diff --git a/magpylib/_src/defaults/defaults_utility.py b/magpylib/_src/defaults/defaults_utility.py
@@ -1,4 +1,5 @@
 """utilities for creating property classes"""
+
 # pylint: disable=too-many-branches
 import collections.abc
 import re

diff --git a/magpylib/_src/display/backend_matplotlib.py b/magpylib/_src/display/backend_matplotlib.py
@@ -1,4 +1,5 @@
 """matplotlib backend"""
+
 # pylint: disable=too-many-branches
 # pylint: disable=too-many-statements
 # pylint: disable=import-outside-toplevel

diff --git a/magpylib/_src/display/backend_plotly.py b/magpylib/_src/display/backend_plotly.py
@@ -1,4 +1,5 @@
 """plotly backend"""
+
 # pylint: disable=C0302
 # pylint: disable=too-many-branches
 import inspect
@@ -17,7 +18,6 @@
 from magpylib._src.defaults.defaults_utility import linearize_dict
 from magpylib._src.display.traces_utility import get_scene_ranges
 
-
 SYMBOLS_TO_PLOTLY = {
     ".": "circle",
     "o": "circle",

diff --git a/magpylib/_src/display/backend_pyvista.py b/magpylib/_src/display/backend_pyvista.py
@@ -1,4 +1,5 @@
 """pyvista backend"""
+
 # pylint: disable=too-many-branches
 # pylint: disable=too-many-statements
 import os
@@ -15,8 +16,9 @@
         conda, see https://docs.pyvista.org/getting-started/installation.html"""
     ) from missing_module
 
-from pyvista.plotting.colors import Color  # pylint: disable=import-error
 from matplotlib.colors import LinearSegmentedColormap
+from pyvista.plotting.colors import Color  # pylint: disable=import-error
+
 from magpylib._src.utility import open_animation
 
 # from magpylib._src.utility import format_obj_input

diff --git a/magpylib/_src/display/display.py b/magpylib/_src/display/display.py
@@ -1,4 +1,5 @@
 """ Display function codes"""
+
 import warnings
 from contextlib import contextmanager
 from importlib import import_module
@@ -8,8 +9,8 @@
 
 from magpylib._src.defaults.defaults_utility import _DefaultValue
 from magpylib._src.defaults.defaults_utility import get_defaults_dict
-from magpylib._src.display.traces_generic import get_frames
 from magpylib._src.display.traces_generic import MagpyMarkers
+from magpylib._src.display.traces_generic import get_frames
 from magpylib._src.display.traces_utility import process_show_input_objs
 from magpylib._src.input_checks import check_format_input_backend
 from magpylib._src.input_checks import check_format_input_vector
@@ -150,9 +151,10 @@ def infer_backend(canvas):
     in_notebook = False
     plotly_available = False
     try:
-        from magpylib._src.utility import is_notebook
         import plotly  # pylint: disable=unused-import
 
+        from magpylib._src.utility import is_notebook
+
         plotly_available = True
         in_notebook = is_notebook()
         if in_notebook:

diff --git a/magpylib/_src/display/traces_base.py b/magpylib/_src/display/traces_base.py
@@ -1,4 +1,5 @@
 """base traces building functions"""
+
 from functools import partial
 
 import numpy as np

diff --git a/magpylib/_src/display/traces_core.py b/magpylib/_src/display/traces_core.py
@@ -1,4 +1,5 @@
 """Generic trace drawing functionalities"""
+
 # pylint: disable=C0302
 # pylint: disable=too-many-branches
 # pylint: disable=too-many-statements

diff --git a/magpylib/_src/display/traces_generic.py b/magpylib/_src/display/traces_generic.py
@@ -1,4 +1,5 @@
 """Generic trace drawing functionalities"""
+
 # pylint: disable=C0302
 # pylint: disable=too-many-branches
 # pylint: disable=too-many-statements
@@ -560,9 +561,7 @@ def get_generic_traces(
         tr["showlegend"] = (
             showlegend
             if showlegend is not None
-            else tr_showleg
-            if style.legend.show
-            else False
+            else tr_showleg if style.legend.show else False
         )
     out = {"generic": path_traces_generic}
 
@@ -581,11 +580,11 @@ def get_generic_traces(
                             "opacity": style.opacity,
                             "color": style.color,
                             "legendgroup": legendgroup,
-                            "showlegend": showlegend
-                            if showlegend is not None
-                            else None
-                            if style.legend.show
-                            else False,
+                            "showlegend": (
+                                showlegend
+                                if showlegend is not None
+                                else None if style.legend.show else False
+                            ),
                             "name": legendtext if legendtext else legend_label,
                             "row": row,
                             "col": col,

diff --git a/magpylib/_src/display/traces_utility.py b/magpylib/_src/display/traces_utility.py
@@ -1,4 +1,5 @@
 """ Display function codes"""
+
 # pylint: disable=too-many-branches
 from collections import defaultdict
 from functools import lru_cache
@@ -137,9 +138,7 @@ def draw_arrowed_line(
     anchor = (
         (0, -0.5, 0)
         if pivot == "tip"
-        else (0, 0.5, 0)
-        if pivot == "tail"
-        else (0, 0, 0)
+        else (0, 0.5, 0) if pivot == "tail" else (0, 0, 0)
     )
     arrow = [
         [0, arrow_shift, 0],

diff --git a/magpylib/_src/fields/__init__.py b/magpylib/_src/fields/__init__.py
@@ -3,4 +3,7 @@
 __all__ = ["getB", "getH", "getM", "getJ"]
 
 # create interface to outside of package
-from magpylib._src.fields.field_wrap_BH import getB, getH, getM, getJ
+from magpylib._src.fields.field_wrap_BH import getB
+from magpylib._src.fields.field_wrap_BH import getH
+from magpylib._src.fields.field_wrap_BH import getJ
+from magpylib._src.fields.field_wrap_BH import getM
diff --git a/magpylib/_src/fields/field_BH_circle.py b/magpylib/_src/fields/field_BH_circle.py
@@ -2,6 +2,7 @@
 Implementations of analytical expressions for the magnetic field of
 a circular current loop. Computation details in function docstrings.
 """
+
 import numpy as np
 from scipy.constants import mu_0 as MU0
 

diff --git a/magpylib/_src/fields/field_BH_cuboid.py b/magpylib/_src/fields/field_BH_cuboid.py
@@ -2,6 +2,7 @@
 Implementations of analytical expressions for the magnetic field of homogeneously
 magnetized Cuboids. Computation details in function docstrings.
 """
+
 import numpy as np
 from scipy.constants import mu_0 as MU0
 

diff --git a/magpylib/_src/fields/field_BH_cylinder.py b/magpylib/_src/fields/field_BH_cylinder.py
@@ -2,6 +2,7 @@
 Implementations of analytical expressions for the magnetic field of
 homogeneously magnetized Cylinders. Computation details in function docstrings.
 """
+
 # pylint: disable = no-name-in-module
 import numpy as np
 from scipy.constants import mu_0 as MU0
@@ -168,10 +169,7 @@ def magnet_cylinder_diametral_Hfield(
                 + 3
                 / 8
                 * r3X
-                * (
-                    (1 - 4 * zp2X) / zpp**3 / sqrt_p
-                    - (1 - 4 * zm2X) / zmm**3 / sqrt_m
-                )
+                * ((1 - 4 * zp2X) / zpp**3 / sqrt_p - (1 - 4 * zm2X) / zmm**3 / sqrt_m)
                 + 15
                 / 64
                 * r5X