🧹 Upgrade syntax to py310 using pyupgrade

.pre-commit-config.yaml

@@ -21,7 +21,7 @@ repos:
       - id: pyupgrade
         types: [file]
         types_or: [python, pyi]
-        args: [--py38-plus]
+        args: [--py310-plus]
         exclude: "glotaran.model.item"
 
   - repo: https://github.com/MarcoGorelli/absolufy-imports

changelog.md

@@ -49,6 +49,7 @@
 - ♻️🚇 Use GITHUB_OUTPUT instead of set-output in github actions (#1166)
 - 🚧 Add pinned version of odfpy to requirements_dev.txt (#1164)
 - ♻️ Use validation action and validation as a git submodule (#1165)
+- 🧹 Upgrade syntax to py310 using pyupgrade
 
 (changes-0_6_0)=
 

glotaran/builtin/io/yml/test/test_model_parser.py

@@ -1,4 +1,3 @@
-from os.path import abspath
 from os.path import dirname
 from os.path import join
 
@@ -15,7 +14,7 @@
 from glotaran.model import Weight
 from glotaran.model import ZeroConstraint
 
-THIS_DIR = dirname(abspath(__file__))
+THIS_DIR = dirname(__file__)
 
 
 @pytest.fixture

glotaran/builtin/io/yml/utils.py

@@ -8,9 +8,9 @@
 from ruamel.yaml.compat import StringIO
 
 if TYPE_CHECKING:
+    from collections.abc import Mapping
+    from collections.abc import Sequence
     from typing import Any
-    from typing import Mapping
-    from typing import Sequence
 
     from ruamel.yaml.nodes import ScalarNode
     from ruamel.yaml.representer import BaseRepresenter

glotaran/cli/commands/optimize.py

@@ -1,5 +1,4 @@
 import sys
-import typing
 
 import click
 
@@ -53,7 +52,7 @@
 @util.signature_analysis
 def optimize_cmd(
     dataformat: str,
-    data: typing.List[str],
+    data: list[str],
     out: str,
     outformat: str,
     nfev: int,

glotaran/cli/commands/util.py

@@ -1,7 +1,7 @@
 from __future__ import annotations
 
 import sys
-from typing import Iterable
+from collections.abc import Iterable
 
 import click
 from click import echo

glotaran/deprecation/deprecation_utils.py

@@ -5,16 +5,16 @@
 import os
 import re
 import sys
+from collections.abc import Callable
+from collections.abc import Hashable
+from collections.abc import Mapping
+from collections.abc import MutableMapping
 from functools import wraps
 from importlib import import_module
 from importlib.metadata import distribution
 from types import ModuleType
 from typing import TYPE_CHECKING
 from typing import Any
-from typing import Callable
-from typing import Hashable
-from typing import Mapping
-from typing import MutableMapping
 from typing import TypeVar
 from typing import cast
 from warnings import warn
@@ -26,8 +26,8 @@
 )  # decorated function or class
 
 if TYPE_CHECKING:
+    from collections.abc import Sequence
     from typing import NoReturn
-    from typing import Sequence
 
 
 class OverDueDeprecation(Exception):
@@ -740,10 +740,11 @@ def deprecate_submodule(
 
     .. # noqa: DAR402
     """
-    if module_load_overwrite == "":
-        new_module = import_module(new_module_name)
-    else:
-        new_module = import_module(module_load_overwrite)
+    new_module = (
+        import_module(module_load_overwrite)
+        if module_load_overwrite
+        else import_module(new_module_name)
+    )
 
     deprecated_module = ModuleType(
         deprecated_module_name,

glotaran/deprecation/modules/builtin_io_yml.py

@@ -6,8 +6,8 @@
 from glotaran.deprecation import deprecate_dict_entry
 
 if TYPE_CHECKING:
+    from collections.abc import MutableMapping
     from typing import Any
-    from typing import MutableMapping
 
 
 def model_spec_deprecations(spec: MutableMapping[Any, Any]) -> None:

glotaran/deprecation/modules/test/__init__.py

@@ -9,10 +9,10 @@
 from glotaran.deprecation.deprecation_utils import GlotaranApiDeprecationWarning
 
 if TYPE_CHECKING:
+    from collections.abc import Callable
+    from collections.abc import Mapping
+    from collections.abc import Sequence
     from typing import Any
-    from typing import Callable
-    from typing import Mapping
-    from typing import Sequence
 
     from _pytest.recwarn import WarningsRecorder
 

glotaran/deprecation/test/test_deprecation_utils.py

@@ -20,9 +20,9 @@
 from glotaran.deprecation.deprecation_utils import warn_deprecated
 
 if TYPE_CHECKING:
+    from collections.abc import Hashable
+    from collections.abc import Mapping
     from typing import Any
-    from typing import Hashable
-    from typing import Mapping
 
     from _pytest.monkeypatch import MonkeyPatch
     from _pytest.recwarn import WarningsRecorder

glotaran/io/interface.py

@@ -16,7 +16,7 @@
 from typing import TYPE_CHECKING
 
 if TYPE_CHECKING:
-    from typing import Callable
+    from collections.abc import Callable
     from typing import Literal
     from typing import Union
 

glotaran/io/prepare_dataset.py

@@ -6,7 +6,7 @@
 import xarray as xr
 
 if TYPE_CHECKING:
-    from typing import Hashable
+    from collections.abc import Hashable
 
 
 def prepare_time_trace_dataset(

glotaran/model/dataset_model.py

@@ -2,8 +2,8 @@
 
 from __future__ import annotations
 
+from collections.abc import Generator
 from typing import TYPE_CHECKING
-from typing import Generator
 
 import xarray as xr
 

glotaran/model/megacomplex.py

@@ -1,8 +1,8 @@
 """This module contains the megacomplex."""
 from __future__ import annotations
 
+from collections.abc import Callable
 from typing import TYPE_CHECKING
-from typing import Callable
 from typing import ClassVar
 
 import numpy as np

glotaran/model/model.py

@@ -1,11 +1,11 @@
 """This module contains the model."""
 from __future__ import annotations
 
+from collections.abc import Callable
+from collections.abc import Generator
+from collections.abc import Mapping
 from typing import Any
-from typing import Callable
 from typing import ClassVar
-from typing import Generator
-from typing import Mapping
 from uuid import uuid4
 
 from attr import asdict
@@ -276,7 +276,7 @@ def create_class_from_megacomplexes(
                 dataset_types |= {
                     dataset_model_type,
                 }
-            attributes.update(_create_attributes_for_item(megacomplex))
+            attributes |= _create_attributes_for_item(megacomplex)
 
         dataset_type = (
             DatasetModel

glotaran/parameter/parameters.py

@@ -1,10 +1,10 @@
 """The parameters class."""
 from __future__ import annotations
 
+from collections.abc import Generator
 from textwrap import indent
 from typing import TYPE_CHECKING
 from typing import Any
-from typing import Generator
 
 import asteval
 import numpy as np

glotaran/plugin_system/base_registry.py

@@ -12,18 +12,17 @@
 from warnings import warn
 
 if TYPE_CHECKING:
+    from collections.abc import Callable
+    from collections.abc import MutableMapping
+    from collections.abc import Sequence
     from typing import Any
-    from typing import Callable
-    from typing import MutableMapping
-    from typing import Sequence
-    from typing import Type
     from typing import TypeVar
 
     from glotaran.io.interface import DataIoInterface
     from glotaran.io.interface import ProjectIoInterface
     from glotaran.model.megacomplex import Megacomplex
 
-    _PluginType = TypeVar("_PluginType", Type[Megacomplex], DataIoInterface, ProjectIoInterface)
+    _PluginType = TypeVar("_PluginType", type[Megacomplex], DataIoInterface, ProjectIoInterface)
     _PluginInstantiableType = TypeVar(
         "_PluginInstantiableType", DataIoInterface, ProjectIoInterface
     )

glotaran/plugin_system/data_io_registration.py

@@ -31,8 +31,8 @@
 from glotaran.utils.ipython import MarkdownStr
 
 if TYPE_CHECKING:
+    from collections.abc import Callable
     from typing import Any
-    from typing import Callable
     from typing import Literal
 
     from glotaran.io.interface import DataLoader

glotaran/plugin_system/io_plugin_utils.py

@@ -3,19 +3,19 @@
 from __future__ import annotations
 
 import os
+from collections.abc import Callable
 from functools import partial
 from functools import wraps
 from typing import TYPE_CHECKING
 from typing import Any
-from typing import Callable
 from typing import TypeVar
 from typing import cast
 
 DecoratedFunc = TypeVar("DecoratedFunc", bound=Callable[..., Any])  # decorated function
 
 if TYPE_CHECKING:
-    from typing import Iterable
-    from typing import Iterator
+    from collections.abc import Iterable
+    from collections.abc import Iterator
 
     from glotaran.typing import StrOrPath
 

glotaran/plugin_system/project_io_registration.py

@@ -33,8 +33,8 @@
 from glotaran.utils.ipython import MarkdownStr
 
 if TYPE_CHECKING:
+    from collections.abc import Callable
     from typing import Any
-    from typing import Callable
     from typing import Literal
 
     from glotaran.model import Model

glotaran/plugin_system/test/test_base_registry.py

@@ -1,9 +1,8 @@
 from __future__ import annotations
 
+from collections.abc import MutableMapping
 from copy import copy
 from typing import TYPE_CHECKING
-from typing import MutableMapping
-from typing import Type
 from typing import cast
 from warnings import warn
 
@@ -66,7 +65,7 @@ def some_method(self):
 mock_registry_project_io = cast(
     MutableMapping[str, ProjectIoInterface], copy(mock_registry_data_io)
 )
-mock_registry_model = cast(MutableMapping[str, Type[Megacomplex]], copy(mock_registry_data_io))
+mock_registry_model = cast(MutableMapping[str, type[Megacomplex]], copy(mock_registry_data_io))
 
 
 @pytest.mark.parametrize(

glotaran/plugin_system/test/test_project_io_registration.py

@@ -32,8 +32,8 @@
 from glotaran.plugin_system.project_io_registration import show_project_io_method_help
 
 if TYPE_CHECKING:
+    from collections.abc import Callable
     from typing import Any
-    from typing import Callable
 
     from _pytest.capture import CaptureFixture
     from _pytest.monkeypatch import MonkeyPatch

glotaran/project/dataclass_helpers.py

@@ -13,8 +13,8 @@
 from glotaran.utils.io import relative_posix_path
 
 if TYPE_CHECKING:
+    from collections.abc import Callable
     from typing import Any
-    from typing import Callable
     from typing import TypeVar
 
     from glotaran.typing.protocols import FileLoadable

glotaran/project/generators/generator.py

@@ -1,8 +1,8 @@
 """The glotaran generator module."""
 from __future__ import annotations
 
+from collections.abc import Callable
 from typing import Any
-from typing import Callable
 from typing import TypedDict
 from typing import cast
 

glotaran/project/project_registry.py

@@ -1,9 +1,9 @@
 """The glotaran registry module."""
 from __future__ import annotations
 
+from collections.abc import Callable
 from pathlib import Path
 from typing import Any
-from typing import Callable
 
 from glotaran.utils.ipython import MarkdownStr
 

glotaran/project/result.py

@@ -6,7 +6,6 @@
 from dataclasses import replace
 from typing import TYPE_CHECKING
 from typing import Any
-from typing import List
 from typing import cast
 
 import numpy as np
@@ -32,8 +31,8 @@
 
 if TYPE_CHECKING:
 
-    from typing import Callable
-    from typing import Mapping
+    from collections.abc import Callable
+    from collections.abc import Mapping
 
     from glotaran.typing import StrOrPath
 
@@ -285,7 +284,7 @@ def save(
             Paths to all the saved files.
         """
         return cast(
-            List[str],
+            list[str],
             save_result(
                 result_path=path,
                 result=self,

glotaran/project/scheme.py

@@ -15,9 +15,9 @@
 
 if TYPE_CHECKING:
 
-    from typing import Callable
+    from collections.abc import Callable
+    from collections.abc import Mapping
     from typing import Literal
-    from typing import Mapping
 
     import xarray as xr