Merge pull request #356 from EnergySystemsModellingLab/pyupgrade

Enable pyupgrade in ruff and fix the issues that pop up

Author: dalonsoa

docs/advanced-guide/extending-muse.ipynb

@@ -89,7 +89,7 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "from typing import List, Optional, Text\n",
+    "from typing import Optional\n",
     "\n",
     "from muse.outputs.sector import market_quantity, register_output_quantity\n",
     "from xarray import DataArray, Dataset\n",
@@ -137,7 +137,7 @@
     "\n",
     "@register_output_sink(name=\"txt\")\n",
     "@sink_to_file(\".txt\")\n",
-    "def text_dump(data: Any, filename: Text) -> None:\n",
+    "def text_dump(data: Any, filename: str) -> None:\n",
     "    from pathlib import Path\n",
     "\n",
     "    Path(filename).write_text(f\"Hello world!\\n\\n{data}\")"
@@ -286,7 +286,7 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "from typing import MutableMapping, Text\n",
+    "from collections.abc import MutableMapping\n",
     "\n",
     "import pandas as pd\n",
     "import xarray as xr\n",
@@ -295,13 +295,13 @@
     "\n",
     "@register_cached_quantity(overwrite=True)\n",
     "def capacity(\n",
-    "    cached: List[xr.DataArray],\n",
-    "    agents: MutableMapping[Text, MutableMapping[Text, Text]],\n",
+    "    cached: list[xr.DataArray],\n",
+    "    agents: MutableMapping[str, MutableMapping[str, str]],\n",
     ") -> pd.DataFrame:\n",
     "    \"\"\"Consolidates the cached capacity into a single DataFrame to save.\n",
     "\n",
     "    Args:\n",
-    "        cached (List[xr.DataArray]): The list of cached arrays during the calculation of\n",
+    "        cached (list[xr.DataArray]): The list of cached arrays during the calculation of\n",
     "        the time period with the capacity.\n",
     "        agents (MutableMapping[Text, MutableMapping[Text, Text]]): Agents' metadata.\n",
     "\n",
@@ -453,8 +453,8 @@
     "    market: Dataset,\n",
     "    capacity: DataArray,\n",
     "    technologies: Dataset,\n",
-    "    sum_over: Optional[List[Text]] = None,\n",
-    "    drop: Optional[List[Text]] = None,\n",
+    "    sum_over: Optional[list[str]] = None,\n",
+    "    drop: Optional[list[str]] = None,\n",
     "    rounding: int = 4,\n",
     "):\n",
     "    \"\"\"Current consumption.\"\"\"\n",
@@ -469,7 +469,7 @@
     "\n",
     "@register_output_sink(name=\"txt\", overwrite=True)\n",
     "@sink_to_file(\".txt\")\n",
-    "def text_dump(data: Any, filename: Text, msg: Optional[Text] = \"Hello, world!\") -> None:  # noqa: F811\n",
+    "def text_dump(data: Any, filename: str, msg: Optional[str] = \"Hello, world!\") -> None:  # noqa: F811\n",
     "    from pathlib import Path\n",
     "\n",
     "    Path(filename).write_text(f\"{msg}\\n\\n{data}\")"

docs/conf.py

@@ -4,7 +4,6 @@
 # list see the documentation:
 # http://www.sphinx-doc.org/en/master/config
 # -- Project information -----------------------------------------------------
-from typing import List
 
 project = "MUSE"
 copyright = "2022, Sustainable Gas Institute"
@@ -54,7 +53,7 @@
     "xarray": ("http://xarray.pydata.org/en/stable/", None),
 }
 
-bibtex_bibfiles: List[str] = []
+bibtex_bibfiles: list[str] = []
 
 # -- GraphViz configuration ----------------------------------
 graphviz_output_format = "svg"

docs/tutorial-code/3-add-region/visualise-new-region.ipynb

@@ -41,7 +41,7 @@
     ")\n",
     "\n",
     "for name, sector in mca_capacity.groupby(\"sector\"):\n",
-    "    print(\"{} sector:\".format(name))\n",
+    "    print(f\"{name} sector:\")\n",
     "    g = sns.FacetGrid(data=sector, col=\"region\")\n",
     "    g.map(sns.lineplot, \"year\", \"capacity\", \"technology\")\n",
     "    g.add_legend()\n",

docs/tutorial-code/4-modify-timing-data/visualise-time-framework-changes.ipynb

@@ -26,7 +26,7 @@
     "limits = [20, 20, 60]\n",
     "sec_list = list(mca_capacity.groupby(\"sector\").groups.keys())\n",
     "for name, sector in mca_capacity.groupby(\"sector\"):\n",
-    "    print(\"{} sector:\".format(name))\n",
+    "    print(f\"{name} sector:\")\n",
     "    fig, ax = plt.subplots(1, 2)\n",
     "    sns.lineplot(\n",
     "        data=sector[sector.region == \"R1\"],\n",

docs/tutorial-code/4-modify-timing-data/visualise-timing-result-changes.ipynb

@@ -25,7 +25,7 @@
     ")\n",
     "\n",
     "for name, sector in mca_capacity.groupby(\"sector\"):\n",
-    "    print(\"{} sector:\".format(name))\n",
+    "    print(f\"{name} sector:\")\n",
     "\n",
     "    fig, ax = plt.subplots(1, 2)\n",
     "    sns.lineplot(\n",

docs/tutorial-code/5-add-service-demand/visualise-service-demand-addition.ipynb

@@ -26,7 +26,7 @@
     "limits = [20, 70, 60]\n",
     "sec_list = list(mca_capacity.groupby(\"sector\").groups.keys())\n",
     "for name, sector in mca_capacity.groupby(\"sector\"):\n",
-    "    print(\"{} sector:\".format(name))\n",
+    "    print(f\"{name} sector:\")\n",
     "    fig, ax = plt.subplots(1, 2)\n",
     "    sns.lineplot(\n",
     "        data=sector[sector.region == \"R1\"],\n",

docs/tutorial-code/6-add-correlation-demand/visualise-correlation-demand.ipynb

@@ -33,7 +33,7 @@
    "outputs": [],
    "source": [
     "for name, sector in mca_capacity.groupby(\"sector\"):\n",
-    "    print(\"{} sector:\".format(name))\n",
+    "    print(f\"{name} sector:\")\n",
     "    sns.lineplot(\n",
     "        data=sector[sector.region == \"R1\"], x=\"year\", y=\"capacity\", hue=\"technology\"\n",
     "    )\n",

docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/output.py

@@ -1,4 +1,4 @@
-from typing import List, Optional, Text
+from typing import Optional
 
 import xarray as xr
 from muse.outputs.sector import market_quantity, register_output_quantity
@@ -9,8 +9,8 @@ def supply_timeslice(
     market: xr.Dataset,
     capacity: xr.DataArray,
     technologies: xr.Dataset,
-    sum_over: Optional[List[Text]] = None,
-    drop: Optional[List[Text]] = None,
+    sum_over: Optional[list[str]] = None,
+    drop: Optional[list[str]] = None,
     rounding: int = 4,
 ) -> xr.DataArray:
     """Current supply."""
@@ -29,8 +29,8 @@ def consumption_timeslice(
     market: xr.Dataset,
     capacity: xr.DataArray,
     technologies: xr.Dataset,
-    sum_over: Optional[List[Text]] = None,
-    drop: Optional[List[Text]] = None,
+    sum_over: Optional[list[str]] = None,
+    drop: Optional[list[str]] = None,
     rounding: int = 4,
 ) -> xr.DataArray:
     """Current consumption."""

docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/output.py

@@ -1,4 +1,4 @@
-from typing import List, Optional, Text
+from typing import Optional
 
 import xarray as xr
 from muse.outputs.sector import market_quantity, register_output_quantity
@@ -9,8 +9,8 @@ def supply_timeslice(
     market: xr.Dataset,
     capacity: xr.DataArray,
     technologies: xr.Dataset,
-    sum_over: Optional[List[Text]] = None,
-    drop: Optional[List[Text]] = None,
+    sum_over: Optional[list[str]] = None,
+    drop: Optional[list[str]] = None,
     rounding: int = 4,
 ) -> xr.DataArray:
     """Current supply."""
@@ -29,8 +29,8 @@ def consumption_timeslice(
     market: xr.Dataset,
     capacity: xr.DataArray,
     technologies: xr.Dataset,
-    sum_over: Optional[List[Text]] = None,
-    drop: Optional[List[Text]] = None,
+    sum_over: Optional[list[str]] = None,
+    drop: Optional[list[str]] = None,
     rounding: int = 4,
 ) -> xr.DataArray:
     """Current consumption."""

pyproject.toml

@@ -108,12 +108,16 @@ files = ["src/**/*.py", "tests/**/*.py"]
 module = ["setup"]
 ignore_errors = true
 
+[tool.ruff]
+target-version = "py39"
+
 [tool.ruff.lint]
 select = [
     "D",  # pydocstyle
     "E",  # pycodestyle
     "F",  # Pyflakes
     "I",  # isort
+    "UP",  # Pyupgrade
     "RUF"  # Ruff's own checks
 ]
 ignore = [