Move from black to ruff formatter (#697)

.pre-commit-config.yaml

@@ -14,15 +14,13 @@ repos:
         exclude: '.teamcity'
       - id: trailing-whitespace
   - repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: v0.0.291
+    rev: v0.1.2
     hooks:
       - id: ruff
+        types_or: [python, pyi, jupyter]
         args: [--fix, --exit-non-zero-on-fix]
-  - repo: https://github.com/psf/black
-    rev: 23.9.1
-    hooks:
-      - id: black
-      - id: black-jupyter
+      - id: ruff-format
+        types_or: [python, pyi, jupyter]
   - repo: https://github.com/kynan/nbstripout
     rev: 0.6.1
     hooks:

.vscode/extensions.json

@@ -2,7 +2,6 @@
     "recommendations": [
         "julialang.language-julia",
         "ms-python.python",
-        "ms-python.black-formatter",
         "ms-python.mypy-type-checker",
         "charliermarsh.ruff",
         "njpwerner.autodocstring"

.vscode/settings_template.json

@@ -5,7 +5,7 @@
     "julia.environmentPath": "core",
     "notebook.formatOnSave.enabled": true,
     "[python]": {
-        "editor.defaultFormatter": "ms-python.black-formatter",
+        "editor.defaultFormatter": "charliermarsh.ruff",
         "editor.formatOnSave": true,
         "editor.codeActionsOnSave": {
             "source.fixAll": true

docs/python/examples.ipynb

@@ -35,12 +35,12 @@
    "metadata": {},
    "outputs": [],
    "source": [
+    "from pathlib import Path\n",
+    "\n",
     "import geopandas as gpd\n",
+    "import matplotlib.pyplot as plt\n",
     "import numpy as np\n",
     "import pandas as pd\n",
-    "import matplotlib.pyplot as plt\n",
-    "from pathlib import Path\n",
-    "\n",
     "import ribasim"
    ]
   },
@@ -459,9 +459,8 @@
    "source": [
     "import numpy as np\n",
     "import pandas as pd\n",
-    "import xarray as xr\n",
-    "\n",
-    "import ribasim"
+    "import ribasim\n",
+    "import xarray as xr"
    ]
   },
   {
@@ -1418,7 +1417,8 @@
     "# Plot target level\n",
     "target_levels = model.pid_control.time.target.to_numpy()[::2]\n",
     "times = date2num(model.pid_control.time.time)[::2]\n",
-    "ax.plot(times, target_levels, color=\"k\", ls=\":\", label=\"target level\");"
+    "ax.plot(times, target_levels, color=\"k\", ls=\":\", label=\"target level\")\n",
+    "pass"
    ]
   },
   {
@@ -1445,7 +1445,7 @@
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
-   "version": "3.10.12"
+   "version": "3.11.5"
   }
  },
  "nbformat": 4,