Merge pull request #50 from pyiron/mypy

Add mypy

Author: samwaseda

.github/workflows/push-pull.yml

@@ -22,4 +22,4 @@ jobs:
       do-codacy: false
       do-coveralls: false
       do-ruff-check: true
-
+      do-mypy: true

pyiron_snippets/factory.py

@@ -33,6 +33,7 @@ class creation via :func:`builtins.type` -- i.e. taking a class name, a tuple of
 from __future__ import annotations
 
 from abc import ABCMeta
+from collections.abc import Callable
 from functools import wraps
 from importlib import import_module
 from inspect import Parameter, signature
@@ -57,7 +58,7 @@ class _FactoryTown(metaclass=_SingleInstance):
     factory object.
     """
 
-    factories = {}
+    factories: dict[str, _ClassFactory] = {}
 
     @classmethod
     def clear(cls):
@@ -69,10 +70,12 @@ def clear(cls):
         cls.factories = {}
 
     @staticmethod
-    def _factory_address(factory_function: callable) -> str:
+    def _factory_address(factory_function: Callable) -> str:
         return f"{factory_function.__module__}.{factory_function.__qualname__}"
 
-    def get_factory(self, factory_function: callable[..., type]) -> _ClassFactory:
+    def get_factory(
+        self, factory_function: Callable[..., tuple[str, tuple[type, ...], dict, dict]]
+    ) -> _ClassFactory:
 
         self._verify_function_only_takes_positional_args(factory_function)
 
@@ -103,7 +106,7 @@ def _build_factory(factory_function):
         return wraps(factory_function)(new_factory_class())
 
     @staticmethod
-    def _verify_function_only_takes_positional_args(factory_function: callable):
+    def _verify_function_only_takes_positional_args(factory_function: Callable):
         parameters = signature(factory_function).parameters.values()
         if any(
             p.kind not in [Parameter.POSITIONAL_ONLY, Parameter.VAR_POSITIONAL]
@@ -136,7 +139,9 @@ class _ClassFactory(metaclass=_SingleInstance):
     For making dynamically created classes the same class.
     """
 
-    _decorated_as_classfactory: ClassVar[bool] = False
+    _decorated_as_classfactory: bool = False
+    factory_function: ClassVar[Callable[..., tuple[str, tuple[type, ...], dict, dict]]]
+    class_registry: ClassVar[dict[str, type[_FactoryMade]]] = {}
 
     def __init_subclass__(cls, /, factory_function, **kwargs):
         super().__init_subclass__(**kwargs)
@@ -193,7 +198,7 @@ def _build_class(
         if "__module__" not in class_dict:
             class_dict["__module__"] = self.factory_function.__module__
         if "__qualname__" not in class_dict:
-            class_dict["__qualname__"] = f"{self.__qualname__}.{name}"
+            class_dict["__qualname__"] = f"{self.factory_function.__qualname__}.{name}"
         sc_init_kwargs["class_factory"] = self
         sc_init_kwargs["class_factory_args"] = class_factory_args
 
@@ -248,7 +253,7 @@ class _FactoryMade:
     """
 
     # DEPRECATED: Use _reduce_imports_as instead
-    _class_returns_from_decorated_function: ClassVar[callable | None] = None
+    _class_returns_from_decorated_function: ClassVar[Callable | None] = None
 
     _reduce_imports_as: ClassVar[tuple[str, str] | None] = None  # Module and qualname
 
@@ -337,7 +342,7 @@ def _instantiate_from_decorated(module, qualname, newargs_ex):
 
 
 def classfactory(
-    factory_function: callable[..., tuple[str, tuple[type, ...], dict, dict]],
+    factory_function: Callable[..., tuple[str, tuple[type, ...], dict, dict]],
 ) -> _ClassFactory:
     """
     A decorator for building dynamic class factories whose classes are unique and whose
@@ -354,7 +359,7 @@ def classfactory(
     be overridden.
 
     Args:
-        factory_function (callable[..., tuple[str, tuple[type, ...], dict, dict]]):
+        factory_function (Callable[..., tuple[str, tuple[type, ...], dict, dict]]):
             A function returning arguments that would be passed to `builtins.type` to
             dynamically generate a class. The function must accept exclusively
             positional arguments

pyiron_snippets/retry.py

@@ -4,7 +4,7 @@
 import warnings
 from collections.abc import Callable
 from itertools import count
-from typing import TypeVar
+from typing import Any, TypeVar
 
 T = TypeVar("T")
 
@@ -16,7 +16,7 @@ def retry(
     at_most: int | None = None,
     delay: float = 1.0,
     delay_factor: float = 1.0,
-    log: bool | object = True,
+    log: bool | Any = True,
 ) -> T:
     """
     Try to call `func` until it no longer raises `error`.

pyiron_snippets/singleton.py

@@ -14,7 +14,7 @@ class Singleton(ABCMeta):
 
     """
 
-    _instances = {}
+    _instances: dict[type, object] = {}
 
     def __call__(cls, *args, **kwargs):
         if cls not in cls._instances:

pyproject.toml

@@ -85,3 +85,15 @@ extend-exclude = '''
   ^/docs
 )
 '''
+
+[tool.mypy]
+exclude = [
+    "^docs/conf\\.py$",
+    "^pyiron_snippets/files\\.py$",
+    "^tests/",
+]
+ignore_missing_imports = true
+strict_equality = true
+non_interactive = true
+install_types = true
+