[pre-commit.ci] pre-commit autoupdate

.pre-commit-config.yaml

@@ -1,6 +1,6 @@
 repos:
 - repo: https://github.com/pre-commit/pre-commit-hooks
-  rev: v4.4.0
+  rev: v6.0.0
   hooks:
   - id: trailing-whitespace
   #- id: end-of-file-fixer
@@ -12,8 +12,8 @@ repos:
 #   rev: latest
 #   hooks:
 #   - id: reuse
-- repo: https://github.com/psf/black
-  rev: 23.3.0
+- repo: https://github.com/psf/black-pre-commit-mirror
+  rev: 26.1.0
   hooks:
   - id: black
   - id: black-jupyter

notebooks/co2scenarios.ipynb

@@ -264,9 +264,11 @@
     "\n",
     "    df = df.loc[carrier].groupby(level=2).sum().div(1e6)  # TWh / MtCO2\n",
     "    df.index = [\n",
-    "        i[:-1]\n",
-    "        if ((i not in [\"co2\", \"NH3\", \"H2\"]) and (i[-1:] in [\"0\", \"1\", \"2\", \"3\"]))\n",
-    "        else i\n",
+    "        (\n",
+    "            i[:-1]\n",
+    "            if ((i not in [\"co2\", \"NH3\", \"H2\"]) and (i[-1:] in [\"0\", \"1\", \"2\", \"3\"]))\n",
+    "            else i\n",
+    "        )\n",
     "        for i in df.index\n",
     "    ]\n",
     "\n",
@@ -396,9 +398,11 @@
     "\n",
     "    toprow_kwargs = (\n",
     "        dict(\n",
-    "            title=\"with\\nhydrogen grid\\n\"\n",
-    "            if y[1] == \"H2 grid\"\n",
-    "            else \"without\\nhydrogen grid\\n\"\n",
+    "            title=(\n",
+    "                \"with\\nhydrogen grid\\n\"\n",
+    "                if y[1] == \"H2 grid\"\n",
+    "                else \"without\\nhydrogen grid\\n\"\n",
+    "            )\n",
     "        )\n",
     "        if x[0] == 0\n",
     "        else {}\n",
@@ -704,9 +708,11 @@
    "outputs": [],
    "source": [
     "df.index = [\n",
-    "    i[:-1]\n",
-    "    if ((i not in [\"co2\", \"NH3\", \"H2\"]) and (i[-1:] in [\"0\", \"1\", \"2\", \"3\"]))\n",
-    "    else i\n",
+    "    (\n",
+    "        i[:-1]\n",
+    "        if ((i not in [\"co2\", \"NH3\", \"H2\"]) and (i[-1:] in [\"0\", \"1\", \"2\", \"3\"]))\n",
+    "        else i\n",
+    "    )\n",
     "    for i in df.index\n",
     "]"
    ]
@@ -917,9 +923,11 @@
    "outputs": [],
    "source": [
     "df.index = [\n",
-    "    i[:-1]\n",
-    "    if ((i not in [\"co2\", \"NH3\", \"H2\"]) and (i[-1:] in [\"0\", \"1\", \"2\", \"3\"]))\n",
-    "    else i\n",
+    "    (\n",
+    "        i[:-1]\n",
+    "        if ((i not in [\"co2\", \"NH3\", \"H2\"]) and (i[-1:] in [\"0\", \"1\", \"2\", \"3\"]))\n",
+    "        else i\n",
+    "    )\n",
     "    for i in df.index\n",
     "]"
    ]

notebooks/preprocess-dashboard.ipynb

@@ -396,9 +396,11 @@
    "source": [
     "kwargs = dict(index_col=0, header=0)\n",
     "ts = {\n",
-    "    k: pd.read_csv(v + \"edges-hydrogen.csv\", **kwargs)\n",
-    "    if os.path.exists(v + \"edges-hydrogen.csv\")\n",
-    "    else None\n",
+    "    k: (\n",
+    "        pd.read_csv(v + \"edges-hydrogen.csv\", **kwargs)\n",
+    "        if os.path.exists(v + \"edges-hydrogen.csv\")\n",
+    "        else None\n",
+    "    )\n",
     "    for k, v in SCENARIOS.items()\n",
     "}\n",
     "\n",

notebooks/resources.py.ipynb

@@ -27,7 +27,6 @@
     "from shapely import wkt\n",
     "import sys, os\n",
     "\n",
-    "\n",
     "PATH = \"../workflows/\"\n",
     "SCRIPTS_PATH = \"pypsa-eur-sec/scripts/\"\n",
     "\n",

notebooks/sankey.ipynb

@@ -229,9 +229,9 @@
     "    df.loc[df.label.str.contains(\"heat pump\"), \"value\"] -= hp_elec[\"value\"].values\n",
     "\n",
     "    df.loc[df.label.str.contains(\"air heat pump\"), \"source\"] = \"air-sourced ambient\"\n",
-    "    df.loc[\n",
-    "        df.label.str.contains(\"ground heat pump\"), \"source\"\n",
-    "    ] = \"ground-sourced ambient\"\n",
+    "    df.loc[df.label.str.contains(\"ground heat pump\"), \"source\"] = (\n",
+    "        \"ground-sourced ambient\"\n",
+    "    )\n",
     "\n",
     "    df = pd.concat([df, hp_elec])\n",
     "    df = df.set_index([\"label\", \"source\", \"target\"]).squeeze()\n",

notebooks/scenarios.py.ipynb

@@ -705,9 +705,11 @@
     "\n",
     "    df = df.loc[carrier].groupby(level=2).sum().div(1e6)  # TWh / MtCO2\n",
     "    df.index = [\n",
-    "        i[:-1]\n",
-    "        if ((i not in [\"co2\", \"NH3\", \"H2\"]) and (i[-1:] in [\"0\", \"1\", \"2\", \"3\"]))\n",
-    "        else i\n",
+    "        (\n",
+    "            i[:-1]\n",
+    "            if ((i not in [\"co2\", \"NH3\", \"H2\"]) and (i[-1:] in [\"0\", \"1\", \"2\", \"3\"]))\n",
+    "            else i\n",
+    "        )\n",
     "        for i in df.index\n",
     "    ]\n",
     "\n",
@@ -771,9 +773,11 @@
     "    df = df.groupby(level=2).sum().div(1e6)\n",
     "\n",
     "    df.index = [\n",
-    "        i[:-1]\n",
-    "        if ((i not in [\"co2\", \"NH3\", \"H2\"]) and (i[-1:] in [\"0\", \"1\", \"2\", \"3\"]))\n",
-    "        else i\n",
+    "        (\n",
+    "            i[:-1]\n",
+    "            if ((i not in [\"co2\", \"NH3\", \"H2\"]) and (i[-1:] in [\"0\", \"1\", \"2\", \"3\"]))\n",
+    "            else i\n",
+    "        )\n",
     "        for i in df.index\n",
     "    ]\n",
     "\n",
@@ -845,9 +849,11 @@
     "    df = df.groupby(level=2).sum().div(1e6)\n",
     "\n",
     "    df.index = [\n",
-    "        i[:-1]\n",
-    "        if ((i not in [\"co2\", \"NH3\", \"H2\"]) and (i[-1:] in [\"0\", \"1\", \"2\", \"3\"]))\n",
-    "        else i\n",
+    "        (\n",
+    "            i[:-1]\n",
+    "            if ((i not in [\"co2\", \"NH3\", \"H2\"]) and (i[-1:] in [\"0\", \"1\", \"2\", \"3\"]))\n",
+    "            else i\n",
+    "        )\n",
     "        for i in df.index\n",
     "    ]\n",
     "\n",
@@ -3458,9 +3464,11 @@
     "\n",
     "    toprow_kwargs = (\n",
     "        dict(\n",
-    "            title=\"with\\nhydrogen grid\\n\"\n",
-    "            if y[1] == \"H2 grd\"\n",
-    "            else \"without\\nhydrogen grid\\n\"\n",
+    "            title=(\n",
+    "                \"with\\nhydrogen grid\\n\"\n",
+    "                if y[1] == \"H2 grd\"\n",
+    "                else \"without\\nhydrogen grid\\n\"\n",
+    "            )\n",
     "        )\n",
     "        if x[0] == 0\n",
     "        else {}\n",

notebooks/single.py.ipynb

@@ -3301,10 +3301,12 @@
     "\n",
     "    # Create tick labels from timestamps\n",
     "    labels = [\n",
-    "        ts.strftime(f\"{minor_fmt}\\n{major_fmt}\")\n",
-    "        if (getattr(ts, major_attr) != getattr(timestamps[idx - 1], major_attr))\n",
-    "        | (idx == 0)  # | (idx == len(timestamps)-1)\n",
-    "        else ts.strftime(minor_fmt)\n",
+    "        (\n",
+    "            ts.strftime(f\"{minor_fmt}\\n{major_fmt}\")\n",
+    "            if (getattr(ts, major_attr) != getattr(timestamps[idx - 1], major_attr))\n",
+    "            | (idx == 0)  # | (idx == len(timestamps)-1)\n",
+    "            else ts.strftime(minor_fmt)\n",
+    "        )\n",
     "        for idx, ts in enumerate(timestamps)\n",
     "    ]\n",
     "\n",