From 81d5dce0d6310869a99d1d70aec8d61081e41cd0 Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Mon, 27 Jul 2026 21:44:00 +0000 Subject: [PATCH 1/2] [pre-commit.ci] pre-commit autoupdate MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit updates: - [github.com/pre-commit/pre-commit-hooks: v5.0.0 → v6.0.0](https://github.com/pre-commit/pre-commit-hooks/compare/v5.0.0...v6.0.0) - [github.com/astral-sh/ruff-pre-commit: v0.12.0 → v0.16.0](https://github.com/astral-sh/ruff-pre-commit/compare/v0.12.0...v0.16.0) --- .pre-commit-config.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 493580e..b4566d0 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -2,14 +2,14 @@ exclude: 'dev' repos: - repo: https://github.com/pre-commit/pre-commit-hooks - rev: v5.0.0 + rev: v6.0.0 hooks: - id: check-merge-conflict # checks for files that contain merge conflict strings - id: check-toml # checks toml files for parseable syntax - id: debug-statements # checks for debugger imports and py37+ `breakpoint()` calls in python source - repo: https://github.com/astral-sh/ruff-pre-commit - rev: v0.12.0 + rev: v0.16.0 hooks: # Run the linter. - id: ruff From 9d78aee1642175f4c0d93ee13d1606e92fc21c68 Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Mon, 27 Jul 2026 21:44:48 +0000 Subject: [PATCH 2/2] [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci --- demo.ipynb | 2 +- examples/08-tutorial-standard-problem4.ipynb | 6 ++---- examples/10-tutorial-standard-problem-fmr.ipynb | 4 ++-- examples/11-tutorial-deriving-fields.ipynb | 10 +++++----- examples/13-tutorial-skyrmion.ipynb | 4 ++-- examples/STT-dw-motion.ipynb | 2 +- examples/choosing-runner.ipynb | 4 ++-- examples/energy-term-computations.ipynb | 4 ++-- examples/fixed-subregions.ipynb | 2 +- examples/hysteresis.ipynb | 2 +- examples/multiple-terms.ipynb | 3 ++- examples/negative-A.ipynb | 1 + examples/periodic-boundary-conditions.ipynb | 4 ++-- examples/rkky.ipynb | 1 + examples/sine-hysteresis.ipynb | 2 +- examples/space-time-field.ipynb | 2 +- examples/spatially-varying-parameters1.ipynb | 3 ++- examples/spatially-varying-parameters2.ipynb | 2 +- examples/time-dependent-field-current.ipynb | 6 +++--- examples/time-dependent-field.ipynb | 4 ++-- getting-started/dw-pair-conversion.ipynb | 2 +- getting-started/dynamics-equation.ipynb | 2 +- getting-started/energy-equation.ipynb | 4 ++-- getting-started/first-ubermag-simulation.ipynb | 4 ++-- getting-started/mag2exp.ipynb | 2 +- 25 files changed, 42 insertions(+), 40 deletions(-) diff --git a/demo.ipynb b/demo.ipynb index 24edae4..db66d30 100644 --- a/demo.ipynb +++ b/demo.ipynb @@ -42,8 +42,8 @@ "source": [ "# Some initial configurations\n", "%config InlineBackend.figure_formats = ['svg'] # output matplotlib plots as SVG\n", - "import pandas as pd\n", "import matplotlib.pyplot as plt\n", + "import pandas as pd\n", "\n", "pd.options.display.max_rows = 5\n", "pd.options.display.float_format = \"{:,.2e}\".format" diff --git a/examples/08-tutorial-standard-problem4.ipynb b/examples/08-tutorial-standard-problem4.ipynb index fb97d25..d3fba13 100644 --- a/examples/08-tutorial-standard-problem4.ipynb +++ b/examples/08-tutorial-standard-problem4.ipynb @@ -408,12 +408,10 @@ } ], "source": [ - "print(\"The average magnetisation is {}.\".format(system.m.mean()))\n", + "print(f\"The average magnetisation is {system.m.mean()}.\")\n", "\n", "print(\n", - " \"The magnetisation at the mesh centre {}\\nis {}.\".format(\n", - " system.m.mesh.region.centre, system.m(system.m.mesh.region.centre)\n", - " )\n", + " f\"The magnetisation at the mesh centre {system.m.mesh.region.centre}\\nis {system.m(system.m.mesh.region.centre)}.\"\n", ")" ] }, diff --git a/examples/10-tutorial-standard-problem-fmr.ipynb b/examples/10-tutorial-standard-problem-fmr.ipynb index 99ec2c6..33cbb14 100644 --- a/examples/10-tutorial-standard-problem-fmr.ipynb +++ b/examples/10-tutorial-standard-problem-fmr.ipynb @@ -37,9 +37,9 @@ }, "outputs": [], "source": [ - "import oommfc as oc\n", "import discretisedfield as df\n", - "import micromagneticmodel as mm" + "import micromagneticmodel as mm\n", + "import oommfc as oc" ] }, { diff --git a/examples/11-tutorial-deriving-fields.ipynb b/examples/11-tutorial-deriving-fields.ipynb index 8e8ef12..a9b5277 100644 --- a/examples/11-tutorial-deriving-fields.ipynb +++ b/examples/11-tutorial-deriving-fields.ipynb @@ -25,9 +25,9 @@ "metadata": {}, "outputs": [], "source": [ - "import oommfc as oc\n", "import discretisedfield as df\n", - "import micromagneticmodel as mm" + "import micromagneticmodel as mm\n", + "import oommfc as oc" ] }, { @@ -330,7 +330,7 @@ ], "source": [ "E = oc.compute(system.energy.energy, system)\n", - "print(\"The system's energy is {} J.\".format(E))\n", + "print(f\"The system's energy is {E} J.\")\n", "\n", "system.m.sel(\"x\").mpl()" ] @@ -419,8 +419,8 @@ "for term in system.energy:\n", " total_energy += oc.compute(term.energy, system)\n", "\n", - "print(\"The sum of energy terms is {} J.\".format(total_energy))\n", - "print(\"The system's energy is {} J.\".format(oc.compute(system.energy.energy, system)))" + "print(f\"The sum of energy terms is {total_energy} J.\")\n", + "print(f\"The system's energy is {oc.compute(system.energy.energy, system)} J.\")" ] } ], diff --git a/examples/13-tutorial-skyrmion.ipynb b/examples/13-tutorial-skyrmion.ipynb index 40ff528..3433d04 100644 --- a/examples/13-tutorial-skyrmion.ipynb +++ b/examples/13-tutorial-skyrmion.ipynb @@ -26,9 +26,9 @@ "metadata": {}, "outputs": [], "source": [ - "import oommfc as oc\n", "import discretisedfield as df\n", - "import micromagneticmodel as mm" + "import micromagneticmodel as mm\n", + "import oommfc as oc" ] }, { diff --git a/examples/STT-dw-motion.ipynb b/examples/STT-dw-motion.ipynb index 2870910..c635755 100644 --- a/examples/STT-dw-motion.ipynb +++ b/examples/STT-dw-motion.ipynb @@ -35,9 +35,9 @@ }, "outputs": [], "source": [ - "import oommfc as mc\n", "import discretisedfield as df\n", "import micromagneticmodel as mm\n", + "import oommfc as mc\n", "\n", "# Definition of parameters\n", "L = 500e-9 # sample length (m)\n", diff --git a/examples/choosing-runner.ipynb b/examples/choosing-runner.ipynb index 60068f9..006bf39 100644 --- a/examples/choosing-runner.ipynb +++ b/examples/choosing-runner.ipynb @@ -23,9 +23,9 @@ "metadata": {}, "outputs": [], "source": [ - "import oommfc as mc\n", "import discretisedfield as df\n", - "import micromagneticmodel as mm" + "import micromagneticmodel as mm\n", + "import oommfc as mc" ] }, { diff --git a/examples/energy-term-computations.ipynb b/examples/energy-term-computations.ipynb index 5413e13..906dd90 100644 --- a/examples/energy-term-computations.ipynb +++ b/examples/energy-term-computations.ipynb @@ -23,9 +23,9 @@ "metadata": {}, "outputs": [], "source": [ - "import oommfc as mc\n", "import discretisedfield as df\n", - "import micromagneticmodel as mm" + "import micromagneticmodel as mm\n", + "import oommfc as mc" ] }, { diff --git a/examples/fixed-subregions.ipynb b/examples/fixed-subregions.ipynb index b47805e..fab265d 100644 --- a/examples/fixed-subregions.ipynb +++ b/examples/fixed-subregions.ipynb @@ -27,9 +27,9 @@ }, "outputs": [], "source": [ - "import oommfc as mc\n", "import discretisedfield as df\n", "import micromagneticmodel as mm\n", + "import oommfc as mc\n", "\n", "region = df.Region(p1=(-30e-9, 0, 0), p2=(30e-9, 3e-9, 3e-9))\n", "cell = (3e-9, 3e-9, 3e-9)\n", diff --git a/examples/hysteresis.ipynb b/examples/hysteresis.ipynb index 2ed10a6..828cdc1 100644 --- a/examples/hysteresis.ipynb +++ b/examples/hysteresis.ipynb @@ -23,9 +23,9 @@ }, "outputs": [], "source": [ - "import oommfc as mc\n", "import discretisedfield as df\n", "import micromagneticmodel as mm\n", + "import oommfc as mc\n", "\n", "region = df.Region(p1=(-50e-9, -50e-9, -50e-9), p2=(50e-9, 50e-9, 50e-9))\n", "mesh = df.Mesh(region=region, cell=(5e-9, 5e-9, 5e-9))\n", diff --git a/examples/multiple-terms.ipynb b/examples/multiple-terms.ipynb index c5605a5..1d9cf74 100644 --- a/examples/multiple-terms.ipynb +++ b/examples/multiple-terms.ipynb @@ -24,9 +24,10 @@ "outputs": [], "source": [ "import random\n", - "import oommfc as mc\n", + "\n", "import discretisedfield as df\n", "import micromagneticmodel as mm\n", + "import oommfc as mc\n", "\n", "p1 = (-10e-9, 0, 0)\n", "p2 = (10e-9, 1e-9, 1e-9)\n", diff --git a/examples/negative-A.ipynb b/examples/negative-A.ipynb index 601bd8a..e927403 100644 --- a/examples/negative-A.ipynb +++ b/examples/negative-A.ipynb @@ -24,6 +24,7 @@ "outputs": [], "source": [ "import random\n", + "\n", "import discretisedfield as df\n", "import micromagneticmodel as mm\n", "import oommfc as mc" diff --git a/examples/periodic-boundary-conditions.ipynb b/examples/periodic-boundary-conditions.ipynb index ab794d2..a3b06fc 100644 --- a/examples/periodic-boundary-conditions.ipynb +++ b/examples/periodic-boundary-conditions.ipynb @@ -23,9 +23,9 @@ }, "outputs": [], "source": [ - "import oommfc as mc\n", "import discretisedfield as df\n", - "import micromagneticmodel as mm" + "import micromagneticmodel as mm\n", + "import oommfc as mc" ] }, { diff --git a/examples/rkky.ipynb b/examples/rkky.ipynb index 9f70c4c..e8aac49 100644 --- a/examples/rkky.ipynb +++ b/examples/rkky.ipynb @@ -24,6 +24,7 @@ "outputs": [], "source": [ "import random\n", + "\n", "import discretisedfield as df\n", "import micromagneticmodel as mm\n", "import oommfc as mc\n", diff --git a/examples/sine-hysteresis.ipynb b/examples/sine-hysteresis.ipynb index e43bd2b..31349d5 100644 --- a/examples/sine-hysteresis.ipynb +++ b/examples/sine-hysteresis.ipynb @@ -23,9 +23,9 @@ }, "outputs": [], "source": [ - "import oommfc as mc\n", "import discretisedfield as df\n", "import micromagneticmodel as mm\n", + "import oommfc as mc\n", "\n", "region = df.Region(p1=(-50e-9, -50e-9, 0), p2=(50e-9, 50e-9, 10e-9))\n", "mesh = df.Mesh(region=region, cell=(5e-9, 5e-9, 5e-9))\n", diff --git a/examples/space-time-field.ipynb b/examples/space-time-field.ipynb index b6fe0b2..f1d4b96 100644 --- a/examples/space-time-field.ipynb +++ b/examples/space-time-field.ipynb @@ -28,9 +28,9 @@ }, "outputs": [], "source": [ - "import oommfc as mc\n", "import discretisedfield as df\n", "import micromagneticmodel as mm\n", + "import oommfc as mc\n", "\n", "region = df.Region(p1=(-50e-9, -50e-9, 0), p2=(50e-9, 50e-9, 10e-9))\n", "mesh = df.Mesh(region=region, cell=(5e-9, 5e-9, 5e-9))\n", diff --git a/examples/spatially-varying-parameters1.ipynb b/examples/spatially-varying-parameters1.ipynb index 753ab0f..22cc78e 100644 --- a/examples/spatially-varying-parameters1.ipynb +++ b/examples/spatially-varying-parameters1.ipynb @@ -27,9 +27,9 @@ }, "outputs": [], "source": [ - "import oommfc as mc\n", "import discretisedfield as df\n", "import micromagneticmodel as mm\n", + "import oommfc as mc\n", "\n", "p1 = (-10e-9, 0, 0)\n", "p2 = (10e-9, 1e-9, 1e-9)\n", @@ -74,6 +74,7 @@ "outputs": [], "source": [ "import random\n", + "\n", "import discretisedfield as df\n", "\n", "Ms = 8e5 # saturation magnetisation (A/m)\n", diff --git a/examples/spatially-varying-parameters2.ipynb b/examples/spatially-varying-parameters2.ipynb index 4f8f4c8..61afc9e 100644 --- a/examples/spatially-varying-parameters2.ipynb +++ b/examples/spatially-varying-parameters2.ipynb @@ -25,9 +25,9 @@ }, "outputs": [], "source": [ - "import oommfc as mc\n", "import discretisedfield as df\n", "import micromagneticmodel as mm\n", + "import oommfc as mc\n", "\n", "d = 150e-9\n", "hb = 20e-9\n", diff --git a/examples/time-dependent-field-current.ipynb b/examples/time-dependent-field-current.ipynb index d3e1c79..1c4559b 100644 --- a/examples/time-dependent-field-current.ipynb +++ b/examples/time-dependent-field-current.ipynb @@ -35,11 +35,11 @@ "outputs": [], "source": [ "import discretisedfield as df\n", - "import micromagneticmodel as mm\n", - "import oommfc as mc\n", + "import matplotlib.pyplot as plt\n", "import micromagneticdata\n", + "import micromagneticmodel as mm\n", "import numpy as np\n", - "import matplotlib.pyplot as plt" + "import oommfc as mc" ] }, { diff --git a/examples/time-dependent-field.ipynb b/examples/time-dependent-field.ipynb index e9517c5..1a41a41 100644 --- a/examples/time-dependent-field.ipynb +++ b/examples/time-dependent-field.ipynb @@ -23,9 +23,9 @@ }, "outputs": [], "source": [ - "import oommfc as mc\n", "import discretisedfield as df\n", - "import micromagneticmodel as mm" + "import micromagneticmodel as mm\n", + "import oommfc as mc" ] }, { diff --git a/getting-started/dw-pair-conversion.ipynb b/getting-started/dw-pair-conversion.ipynb index b857127..b41bbf0 100644 --- a/getting-started/dw-pair-conversion.ipynb +++ b/getting-started/dw-pair-conversion.ipynb @@ -56,9 +56,9 @@ } ], "source": [ - "import oommfc as oc\n", "import discretisedfield as df\n", "import micromagneticmodel as mm\n", + "import oommfc as oc\n", "\n", "Ms = 5.8e5 # saturation magnetisation (A/m)\n", "A = 15e-12 # exchange energy constant (J/)\n", diff --git a/getting-started/dynamics-equation.ipynb b/getting-started/dynamics-equation.ipynb index 3c97e1f..3ace0da 100644 --- a/getting-started/dynamics-equation.ipynb +++ b/getting-started/dynamics-equation.ipynb @@ -23,9 +23,9 @@ "metadata": {}, "outputs": [], "source": [ - "import oommfc as mc\n", "import discretisedfield as df\n", "import micromagneticmodel as mm\n", + "import oommfc as mc\n", "\n", "# Define a macrospin mesh (i.e. one discretisation cell).\n", "p1 = (0, 0, 0) # first point of the mesh domain (m)\n", diff --git a/getting-started/energy-equation.ipynb b/getting-started/energy-equation.ipynb index 25d37dc..a3e2767 100644 --- a/getting-started/energy-equation.ipynb +++ b/getting-started/energy-equation.ipynb @@ -23,9 +23,9 @@ "metadata": {}, "outputs": [], "source": [ - "import oommfc as oc\n", "import discretisedfield as df\n", - "import micromagneticmodel as mm" + "import micromagneticmodel as mm\n", + "import oommfc as oc" ] }, { diff --git a/getting-started/first-ubermag-simulation.ipynb b/getting-started/first-ubermag-simulation.ipynb index ffc9910..b4228ac 100644 --- a/getting-started/first-ubermag-simulation.ipynb +++ b/getting-started/first-ubermag-simulation.ipynb @@ -17,8 +17,8 @@ "metadata": {}, "outputs": [], "source": [ - "import micromagneticmodel as mm # mm is just a shorter name we want to use later\n", - "import discretisedfield as df # df is just a shorter name we want to use later" + "import discretisedfield as df # df is just a shorter name we want to use later\n", + "import micromagneticmodel as mm # mm is just a shorter name we want to use later" ] }, { diff --git a/getting-started/mag2exp.ipynb b/getting-started/mag2exp.ipynb index f83543a..0db5646 100644 --- a/getting-started/mag2exp.ipynb +++ b/getting-started/mag2exp.ipynb @@ -40,8 +40,8 @@ ], "source": [ "import discretisedfield as df\n", - "import numpy as np\n", "import micromagneticmodel as mm\n", + "import numpy as np\n", "\n", "np.random.seed(2)\n", "\n",