Merge branch 'master' into correction_in_getting_started

ubermag · Nov 14, 2023 · a9d2170 · a9d2170
2 parents 18832a3 + 6a56ac2
commit a9d2170
Show file tree

Hide file tree

Showing 37 changed files with 20,645 additions and 17,584 deletions.
diff --git a/.github/environment.yml b/.github/environment.yml
@@ -4,7 +4,7 @@ channels:
   - conda-forge
 
 dependencies:
-  - python==3.8
+  - python==3.10
   - pip
   - oommf
   - pytest

diff --git a/.github/workflows/conda.yml b/.github/workflows/conda.yml
@@ -3,6 +3,10 @@ name: conda
 on:
   schedule:
     - cron: '0 0 * * 1'  # run every Monday
+  workflow_dispatch:
+
+env:
+  PYTEST_ADDOPTS: "--color=yes"
 
 jobs:
   conda:
@@ -26,6 +30,9 @@ jobs:
         auto-update-conda: true
         activate-environment: conda-environment
         environment-file: binder/environment.yml
+        miniforge-version: latest
+        miniforge-variant: Mambaforge
+        use-mamba: true
 
     - name: Install testing packages
       run: python -m pip install --upgrade pip pytest-cov nbval

diff --git a/.github/workflows/workflow.yml b/.github/workflows/workflow.yml
@@ -4,6 +4,10 @@ on:
   push:
   schedule:
     - cron: '0 0 * * 1'  # run every Monday
+  workflow_dispatch:
+
+env:
+  PYTEST_ADDOPTS: "--color=yes"
 
 jobs:
   workflow:
@@ -25,6 +29,9 @@ jobs:
         auto-update-conda: true
         activate-environment: conda-environment
         environment-file: .github/environment.yml
+        miniforge-version: latest
+        miniforge-variant: Mambaforge
+        use-mamba: true
 
     # The first import (of discretisedfield) on Windows produces a failure in the notebook tests
     # (output mismatch) because of some (hidden) message on stderr (some IO error on Windows that

diff --git a/binder/environment.yml b/binder/environment.yml
@@ -4,6 +4,6 @@ channels:
   - conda-forge
 
 dependencies:
-  - python==3.8
+  - python==3.10
   - ubermag
 
diff --git a/demo.ipynb b/demo.ipynb
diff --git a/examples/07-tutorial-standard-problem3.ipynb b/examples/07-tutorial-standard-problem3.ipynb
diff --git a/examples/08-tutorial-standard-problem4.ipynb b/examples/08-tutorial-standard-problem4.ipynb
diff --git a/examples/09-tutorial-standard-problem5.ipynb b/examples/09-tutorial-standard-problem5.ipynb
diff --git a/examples/10-tutorial-standard-problem-fmr.ipynb b/examples/10-tutorial-standard-problem-fmr.ipynb
diff --git a/examples/11-tutorial-deriving-fields.ipynb b/examples/11-tutorial-deriving-fields.ipynb
diff --git a/examples/12-tutorial-stray-field.ipynb b/examples/12-tutorial-stray-field.ipynb
@@ -2,7 +2,13 @@
  "cells": [
   {
    "cell_type": "markdown",
-   "metadata": {},
+   "metadata": {
+    "editable": true,
+    "slideshow": {
+     "slide_type": ""
+    },
+    "tags": []
+   },
    "source": [
     "# Calculating a stray field using an airbox method\n",
     "\n",
@@ -134,6 +140,10 @@
    "cell_type": "code",
    "execution_count": 5,
    "metadata": {
+    "editable": true,
+    "slideshow": {
+     "slide_type": ""
+    },
     "tags": []
    },
    "outputs": [
@@ -169,7 +179,7 @@
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
-   "version": "3.8.17"
+   "version": "3.10.12"
   },
   "widgets": {
    "application/vnd.jupyter.widget-state+json": {

diff --git a/examples/13-tutorial-skyrmion.ipynb b/examples/13-tutorial-skyrmion.ipynb
diff --git a/examples/STT-dw-motion.ipynb b/examples/STT-dw-motion.ipynb
diff --git a/examples/choosing-runner.ipynb b/examples/choosing-runner.ipynb
diff --git a/examples/energy-term-computations.ipynb b/examples/energy-term-computations.ipynb
diff --git a/examples/field-operations2.ipynb b/examples/field-operations2.ipynb
diff --git a/examples/finite-temperature.ipynb b/examples/finite-temperature.ipynb
diff --git a/examples/fixed-subregions.ipynb b/examples/fixed-subregions.ipynb
diff --git a/examples/hysteresis.ipynb b/examples/hysteresis.ipynb
diff --git a/examples/multiple-terms.ipynb b/examples/multiple-terms.ipynb
diff --git a/examples/negative-A.ipynb b/examples/negative-A.ipynb
diff --git a/examples/periodic-boundary-conditions.ipynb b/examples/periodic-boundary-conditions.ipynb
diff --git a/examples/rkky.ipynb b/examples/rkky.ipynb
diff --git a/examples/sine-hysteresis.ipynb b/examples/sine-hysteresis.ipynb
diff --git a/examples/space-time-field.ipynb b/examples/space-time-field.ipynb
diff --git a/examples/spatially-varying-parameters1.ipynb b/examples/spatially-varying-parameters1.ipynb
diff --git a/examples/spatially-varying-parameters2.ipynb b/examples/spatially-varying-parameters2.ipynb
diff --git a/examples/time-dependent-field-current.ipynb b/examples/time-dependent-field-current.ipynb
diff --git a/examples/time-dependent-field.ipynb b/examples/time-dependent-field.ipynb
diff --git a/getting-started/dw-pair-conversion.ipynb b/getting-started/dw-pair-conversion.ipynb
diff --git a/getting-started/dynamics-equation.ipynb b/getting-started/dynamics-equation.ipynb
diff --git a/getting-started/energy-equation.ipynb b/getting-started/energy-equation.ipynb
diff --git a/getting-started/first-ubermag-simulation.ipynb b/getting-started/first-ubermag-simulation.ipynb
diff --git a/getting-started/mag2exp.ipynb b/getting-started/mag2exp.ipynb
diff --git a/getting-started/magnetisation-field.ipynb b/getting-started/magnetisation-field.ipynb
diff --git a/getting-started/python-basics.ipynb b/getting-started/python-basics.ipynb
@@ -2,7 +2,13 @@
  "cells": [
   {
    "cell_type": "markdown",
-   "metadata": {},
+   "metadata": {
+    "editable": true,
+    "slideshow": {
+     "slide_type": ""
+    },
+    "tags": []
+   },
    "source": [
     "# Python basics\n",
     "\n",
@@ -396,7 +402,7 @@
     {
      "data": {
       "text/plain": [
-       "2.6535897933527304e-06"
+       "2.65358979335273e-06"
       ]
      },
      "execution_count": 16,
@@ -706,7 +712,7 @@
      "traceback": [
       "\u001b[0;31m---------------------------------------------------------------------------\u001b[0m",
       "\u001b[0;31mTypeError\u001b[0m                                 Traceback (most recent call last)",
-      "Cell \u001b[0;32mIn[29], line 1\u001b[0m\n\u001b[0;32m----> 1\u001b[0m b[\u001b[38;5;241m2\u001b[39m] \u001b[38;5;241m=\u001b[39m \u001b[38;5;241m3\u001b[39m\n",
+      "Cell \u001b[0;32mIn[29], line 1\u001b[0m\n\u001b[0;32m----> 1\u001b[0m \u001b[43mb\u001b[49m\u001b[43m[\u001b[49m\u001b[38;5;241;43m2\u001b[39;49m\u001b[43m]\u001b[49m \u001b[38;5;241m=\u001b[39m \u001b[38;5;241m3\u001b[39m\n",
       "\u001b[0;31mTypeError\u001b[0m: 'tuple' object does not support item assignment"
      ]
     }
@@ -1307,17 +1313,22 @@
    "cell_type": "code",
    "execution_count": 52,
    "metadata": {
+    "editable": true,
+    "slideshow": {
+     "slide_type": ""
+    },
     "tags": [
-     "raises-exception"
+     "raises-exception",
+     "nbval-ignore-output"
     ]
    },
    "outputs": [
     {
      "ename": "SyntaxError",
-     "evalue": "invalid syntax (1951381238.py, line 1)",
+     "evalue": "expected ':' (1951381238.py, line 1)",
      "output_type": "error",
      "traceback": [
-      "\u001b[0;36m  Cell \u001b[0;32mIn[52], line 1\u001b[0;36m\u001b[0m\n\u001b[0;31m    def speed(s, t)\u001b[0m\n\u001b[0m                   ^\u001b[0m\n\u001b[0;31mSyntaxError\u001b[0m\u001b[0;31m:\u001b[0m invalid syntax\n"
+      "\u001b[0;36m  Cell \u001b[0;32mIn[52], line 1\u001b[0;36m\u001b[0m\n\u001b[0;31m    def speed(s, t)\u001b[0m\n\u001b[0m                   ^\u001b[0m\n\u001b[0;31mSyntaxError\u001b[0m\u001b[0;31m:\u001b[0m expected ':'\n"
      ]
     }
    ],
@@ -1337,17 +1348,22 @@
    "cell_type": "code",
    "execution_count": 53,
    "metadata": {
+    "editable": true,
+    "slideshow": {
+     "slide_type": ""
+    },
     "tags": [
-     "raises-exception"
+     "raises-exception",
+     "nbval-ignore-output"
     ]
    },
    "outputs": [
     {
      "ename": "IndentationError",
-     "evalue": "expected an indented block (3863715070.py, line 2)",
+     "evalue": "expected an indented block after function definition on line 1 (3863715070.py, line 2)",
      "output_type": "error",
      "traceback": [
-      "\u001b[0;36m  Cell \u001b[0;32mIn[53], line 2\u001b[0;36m\u001b[0m\n\u001b[0;31m    return s/t\u001b[0m\n\u001b[0m    ^\u001b[0m\n\u001b[0;31mIndentationError\u001b[0m\u001b[0;31m:\u001b[0m expected an indented block\n"
+      "\u001b[0;36m  Cell \u001b[0;32mIn[53], line 2\u001b[0;36m\u001b[0m\n\u001b[0;31m    return s/t\u001b[0m\n\u001b[0m    ^\u001b[0m\n\u001b[0;31mIndentationError\u001b[0m\u001b[0;31m:\u001b[0m expected an indented block after function definition on line 1\n"
      ]
     }
    ],
@@ -1445,7 +1461,7 @@
      "traceback": [
       "\u001b[0;31m---------------------------------------------------------------------------\u001b[0m",
       "\u001b[0;31mNameError\u001b[0m                                 Traceback (most recent call last)",
-      "Cell \u001b[0;32mIn[56], line 2\u001b[0m\n\u001b[1;32m      1\u001b[0m \u001b[38;5;28;01mimport\u001b[39;00m \u001b[38;5;21;01mscipy\u001b[39;00m \n\u001b[0;32m----> 2\u001b[0m \u001b[43mscpy\u001b[49m\u001b[38;5;241m.\u001b[39mfft\u001b[38;5;241m.\u001b[39mfft()\n",
+      "Cell \u001b[0;32mIn[56], line 2\u001b[0m\n\u001b[1;32m      1\u001b[0m \u001b[38;5;28;01mimport\u001b[39;00m \u001b[38;5;21;01mscipy\u001b[39;00m \n\u001b[0;32m----> 2\u001b[0m \u001b[43mscpy\u001b[49m\u001b[38;5;241m.\u001b[39mfft\u001b[38;5;241m.\u001b[39mfft()  \u001b[38;5;66;03m# typo: scpy instead of scipy\u001b[39;00m\n",
       "\u001b[0;31mNameError\u001b[0m: name 'scpy' is not defined"
      ]
     }
@@ -1524,7 +1540,19 @@
      "nbval-ignore-output"
     ]
    },
-   "outputs": [],
+   "outputs": [
+    {
+     "data": {
+      "text/plain": [
+       "\u001b[0;31mSignature:\u001b[0m \u001b[0mmath\u001b[0m\u001b[0;34m.\u001b[0m\u001b[0msqrt\u001b[0m\u001b[0;34m(\u001b[0m\u001b[0mx\u001b[0m\u001b[0;34m,\u001b[0m \u001b[0;34m/\u001b[0m\u001b[0;34m)\u001b[0m\u001b[0;34m\u001b[0m\u001b[0;34m\u001b[0m\u001b[0m\n",
+       "\u001b[0;31mDocstring:\u001b[0m Return the square root of x.\n",
+       "\u001b[0;31mType:\u001b[0m      builtin_function_or_method"
+      ]
+     },
+     "metadata": {},
+     "output_type": "display_data"
+    }
+   ],
    "source": [
     "import math\n",
     "math.sqrt?"
@@ -1586,7 +1614,7 @@
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
-   "version": "3.9.15"
+   "version": "3.10.12"
   },
   "widgets": {
    "application/vnd.jupyter.widget-state+json": {