Dependency upgrade/cleanup after dropping py3.9

pyproject.toml

@@ -31,20 +31,18 @@ classifiers = [
 dependencies = [
   'alembic~=1.8',
   'archive-path~=0.4.2',
-  "asyncssh~=2.21.0",
+  "asyncssh~=2.22.0",
   'circus~=0.19.0',
   'click-spinner~=0.1.8',
   'click>=8.1.0,<8.3',
   'disk-objectstore~=1.5.0',
   'docstring-parser',
-  'get-annotations~=0.1;python_version<"3.10"',
   'graphviz~=0.19',
   'plumpy~=0.26.0',
   'ipython>=7.6',
   'jedi<0.19',
   'jinja2~=3.0',
   'kiwipy[rmq]~=0.9.0',
-  'importlib-metadata~=6.0',
   'numpy>=1.21,<3',
   'paramiko~=3.0',
   'pgsu~=0.3.0',
@@ -382,7 +380,6 @@ module = [
   'bs4.*',
   'circus.*',
   'flask_restful.*',
-  'get_annotations.*',
   'graphviz.*',
   'kiwipy.*',
   'mayavi.*',

src/aiida/cmdline/params/types/identifier.py

@@ -20,7 +20,7 @@
 from aiida.plugins.entry_point import get_entry_point_from_string
 
 if t.TYPE_CHECKING:
-    from importlib_metadata import EntryPoint
+    from importlib.metadata import EntryPoint
 
     from aiida.orm.utils.loaders import OrmEntityLoader
 

src/aiida/cmdline/params/types/plugin.py

@@ -32,7 +32,7 @@
 from .strings import EntryPointType
 
 if t.TYPE_CHECKING:
-    from importlib_metadata import EntryPoint
+    from importlib.metadata import EntryPoint
 
 __all__ = ('PluginParamType',)
 
@@ -239,7 +239,7 @@ def convert(  # type: ignore[override]
         """Convert the string value to an entry point instance, if the value can be successfully parsed
         into an actual entry point. Will raise click.BadParameter if validation fails.
         """
-        from importlib_metadata import EntryPoint
+        from importlib.metadata import EntryPoint
 
         # If the value is already of the expected return type, simply return it. This behavior is new in `click==8.0`:
         # https://click.palletsprojects.com/en/8.0.x/parameters/#implementing-custom-types

src/aiida/engine/processes/functions.py

@@ -17,7 +17,7 @@
 import signal
 import types
 import typing as t
-from typing import TYPE_CHECKING
+from typing import TYPE_CHECKING, ParamSpec
 
 import docstring_parser
 
@@ -41,20 +41,10 @@
 from .process import Process
 from .process_spec import ProcessSpec
 
-try:
-    UnionType = types.UnionType
-except AttributeError:
-    # This type is not available for Python 3.9 and older
-    UnionType = None  # type: ignore[assignment,misc]
+UnionType = types.UnionType
 
-# Fallback for Python 3.9 and older
-from typing_extensions import ParamSpec
 
-try:
-    get_annotations = inspect.get_annotations
-except AttributeError:
-    # This is the backport for Python 3.9 and older
-    from get_annotations import get_annotations  # type: ignore[no-redef]
+get_annotations = inspect.get_annotations
 
 if TYPE_CHECKING:
     from .exit_code import ExitCode

src/aiida/manage/tests/pytest_fixtures.py

@@ -32,11 +32,11 @@
 import typing as t
 import uuid
 import warnings
+from importlib.metadata import EntryPoint, EntryPoints
 
 import plumpy
 import pytest
 import wrapt
-from importlib_metadata import EntryPoint, EntryPoints
 
 from aiida import plugins
 from aiida.common.exceptions import NotExistent

src/aiida/orm/groups.py

@@ -25,7 +25,7 @@
 from . import convert, entities, extras, users
 
 if TYPE_CHECKING:
-    from importlib_metadata import EntryPoint
+    from importlib.metadata import EntryPoint
 
     from aiida.orm import Node, User
     from aiida.orm.implementation import StorageBackend

src/aiida/orm/nodes/node.py

@@ -43,7 +43,7 @@
 from .links import NodeLinks
 
 if TYPE_CHECKING:
-    from importlib_metadata import EntryPoint
+    from importlib.metadata import EntryPoint
 
     from aiida.common.log import AiidaLoggerType
 

src/aiida/plugins/entry_point.py

@@ -21,10 +21,7 @@
 from . import factories
 
 if TYPE_CHECKING:
-    # importlib.metadata was introduced into the standard library in python 3.8,
-    # but was then updated in python 3.10 to use an improved API.
-    # So for now we use the backport importlib_metadata package.
-    from importlib_metadata import EntryPoint, EntryPoints
+    from importlib.metadata import EntryPoint, EntryPoints
 
 __all__ = ('get_entry_points', 'load_entry_point', 'load_entry_point_from_string', 'parse_entry_point')
 
@@ -43,10 +40,17 @@ def eps() -> EntryPoints:
     which will always iterate over all entry points since it looks for
     possible duplicate entries.
     """
-    from importlib_metadata import EntryPoints, entry_points
+    from importlib.metadata import EntryPoints, entry_points
 
     all_eps = entry_points()
-    return EntryPoints(sorted(all_eps, key=lambda x: x.group))
+    # In Python 3.10-3.11, entry_points() returns a SelectableGroups dict
+    # (iterating yields group name strings). In 3.12+ it returns a flat
+    # EntryPoints sequence. Normalise to a flat list in both cases.
+    if isinstance(all_eps, dict):
+        flat = [ep for group_eps in all_eps.values() for ep in group_eps]
+    else:
+        flat = list(all_eps)
+    return EntryPoints(sorted(flat, key=lambda x: x.group))
 
 
 @functools.lru_cache(maxsize=100)
@@ -154,7 +158,7 @@ class EntryPointFormat(enum.Enum):
 
 def parse_entry_point(group: str, spec: str) -> EntryPoint:
     """Return an entry point, given its group and spec (as formatted in the setup)"""
-    from importlib_metadata import EntryPoint
+    from importlib.metadata import EntryPoint
 
     name, value = spec.split('=', maxsplit=1)
     return EntryPoint(group=group, name=name.strip(), value=value.strip())

src/aiida/plugins/factories.py

@@ -32,7 +32,7 @@
 )
 
 if TYPE_CHECKING:
-    from importlib_metadata import EntryPoint
+    from importlib.metadata import EntryPoint
 
     from aiida.brokers import Broker
     from aiida.engine import CalcJob, CalcJobImporter, WorkChain

src/aiida/tools/pytest_fixtures/entry_points.py

@@ -2,22 +2,22 @@
 
 from __future__ import annotations
 
+import importlib.metadata
 import typing as t
 
-import importlib_metadata
 import pytest
 
 
 class EntryPointManager:
     """Manager to temporarily add or remove entry points."""
 
-    def __init__(self, entry_points: importlib_metadata.EntryPoints):
+    def __init__(self, entry_points: importlib.metadata.EntryPoints):
         self.entry_points = entry_points
 
-    def eps(self) -> importlib_metadata.EntryPoints:
+    def eps(self) -> importlib.metadata.EntryPoints:
         return self.entry_points
 
-    def eps_select(self, group, name=None) -> importlib_metadata.EntryPoints:
+    def eps_select(self, group, name=None) -> importlib.metadata.EntryPoints:
         if name is None:
             return self.eps().select(group=group)
         return self.eps().select(group=group, name=name)
@@ -77,8 +77,8 @@ def add(
             value = f'{value.__module__}:{value.__name__}'
 
         group, name = self._validate_entry_point(entry_point_string, group, name)
-        entry_point = importlib_metadata.EntryPoint(name, value, group)
-        self.entry_points = importlib_metadata.EntryPoints(self.entry_points + (entry_point,))
+        entry_point = importlib.metadata.EntryPoint(name=name, value=value, group=group)
+        self.entry_points = importlib.metadata.EntryPoints(self.entry_points + (entry_point,))
 
     def remove(
         self, entry_point_string: str | None = None, *, name: str | None = None, group: str | None = None
@@ -99,7 +99,7 @@ def remove(
             self.entry_points[name]
         except KeyError:
             raise KeyError(f'entry point `{name}` does not exist in group `{group}`.')
-        self.entry_points = importlib_metadata.EntryPoints(
+        self.entry_points = importlib.metadata.EntryPoints(
             (ep for ep in self.entry_points if not (ep.name == name and ep.group == group))
         )
 

tests/orm/test_fields.py

@@ -9,9 +9,9 @@
 """Test for entity fields"""
 
 import sys
+from importlib.metadata import entry_points
 
 import pytest
-from importlib_metadata import entry_points
 
 from aiida import orm
 from aiida.common.pydantic import MetadataField

tests/plugins/test_entry_point.py

@@ -8,9 +8,10 @@
 ###########################################################################
 """Tests for the :mod:`~aiida.plugins.entry_point` module."""
 
+from importlib.metadata import EntryPoint as EP  # noqa: N817
+from importlib.metadata import EntryPoints
+
 import pytest
-from importlib_metadata import EntryPoint as EP  # noqa: N817
-from importlib_metadata import EntryPoints
 
 from aiida.common.exceptions import MissingEntryPointError, MultipleEntryPointError
 from aiida.common.warnings import AiidaDeprecationWarning

tests/test_conftest.py

@@ -1,7 +1,8 @@
 """Tests for fixtures in the ``conftest.py``."""
 
+from importlib.metadata import EntryPoint
+
 import pytest
-from importlib_metadata import EntryPoint
 
 from aiida.common.exceptions import MissingEntryPointError
 from aiida.plugins.entry_point import get_entry_point, load_entry_point