AssertionLib 2.2.1

Author: Bas van Beek

.gitignore

@@ -106,5 +106,9 @@ venv.bak/
 
 # Visual Studio Code
 .vscode/
+
+# MyPy
 .mypy_cache/
-ipython.html
+html/
+index.html
+mypy-html.css

.travis.yml

@@ -33,15 +33,15 @@ install:
     - conda info -a
 
     # Install virtual enviroment
-    - conda create -n assertionlib python=${PYTHON_VERSION} numpy
+    - conda create -n assertionlib python=${PYTHON_VERSION}
     - source activate assertionlib
 
     # Install the tests
     - pip install .[test]
 
 script:
     # Run the unitary tests excluding the expensive computations
-    - pytest -m "not (slow or long)" --cov=assertionlib tests
+    - pytest --cov=assertionlib --mypy tests assertionlib
     - coverage xml && coverage report -m
 
 branches:

CHANGELOG.rst

@@ -6,6 +6,12 @@ All notable changes to this project will be documented in this file.
 This project adheres to `Semantic Versioning <http://semver.org/>`_.
 
 
+2.2.1
+*****
+* Added a mypy test.
+* Further refined type annotations.
+
+
 2.2.0
 *****
 * Marked AssertionLib as a typed package (`PEP 561 <https://www.python.org/dev/peps/pep-0561/>`_).

README.rst

@@ -16,7 +16,7 @@
 
 
 ##################
-AssertionLib 2.2.0
+AssertionLib 2.2.1
 ##################
 
 A package for performing assertions and providing informative exception messages.

assertionlib/__version__.py

@@ -1 +1 @@
-__version__ = '2.2.0'
+__version__ = '2.2.1'

assertionlib/dataclass.py

@@ -60,7 +60,7 @@ def decorating_function(user_function: UserFunc) -> UserFunc:
         running: Set[Tuple[int, int]] = set()
 
         @wraps(user_function)
-        def wrapper(self, *args, **kwargs):
+        def wrapper(self: Any, *args: Any, **kwargs: Any) -> T:
             key = id(self), get_ident()
             if key in running:
                 return fallback(self, *args, **kwargs)
@@ -76,22 +76,22 @@ def wrapper(self, *args, **kwargs):
 
 
 class _MetaADC(ABCMeta):
-    def __new__(mcls, name, bases, namespace, **kwargs) -> '_MetaADC':
-        cls = super().__new__(mcls, name, bases, namespace, **kwargs)
-        if not cls._HASHABLE:
+    def __new__(mcls, name, bases, namespace) -> '_MetaADC':
+        cls = cast(_MetaADC, super().__new__(mcls, name, bases, namespace))
+        if not cls._HASHABLE:  # type: ignore
             setattr(cls, '__hash__', mcls._hash_template1)
         else:
-            func = recursion_safeguard(cls._repr_fallback)(mcls._hash_template2)
+            func = recursion_safeguard(cls._repr_fallback)(mcls._hash_template2)  # type: ignore
             setattr(cls, '__hash__', func)
         return cls
 
     @staticmethod
-    def _hash_template1(self) -> NoReturn:
+    def _hash_template1(self: Any) -> NoReturn:
         """Unhashable type; raise a :exc:`TypeError`."""
         raise TypeError(f"Unhashable type: {self.__class__.__name__!r}")
 
     @staticmethod
-    def _hash_template2(self) -> int:
+    def _hash_template2(self: Any) -> int:
         """Return the hash of this instance.
 
         The returned hash is constructed from two components:
@@ -338,7 +338,10 @@ def copy(self, deep: bool = False) -> 'AbstractDataClass':
             A new instance constructed from this instance.
 
         """
-        copy_func = cast(Callable[[T], T], copy.deepcopy if deep else lambda n: n)
+        def return_arg(arg: T) -> T:
+            return arg
+
+        copy_func = cast(Callable[[T], T], copy.deepcopy if deep else return_arg)
 
         cls = type(self)
         ret = cls.__new__(cls)
@@ -406,7 +409,7 @@ def from_dict(cls, dct: Mapping[str, Any]) -> 'AbstractDataClass':
             Construct a dictionary from this instance with all non-private instance variables.
 
         """
-        return cls(**dct)
+        return cls(**dct)  # type: ignore
 
     @classmethod
     def inherit_annotations(cls) -> Callable[[UserFunc], UserFunc]:

assertionlib/functions.py

@@ -132,7 +132,7 @@ def _create_assertion_func(func: Callable) -> Tuple[types.FunctionType, str]:
         A callable object forming the basis of the to-be created assertion function.
 
     """
-    _empty = inspect._empty
+    _empty = inspect._empty  # type: ignore
 
     def _to_str(prm: inspect.Parameter) -> str:
         """Create a string from **prm**; ensure that callables are represented by their __name__."""
@@ -346,7 +346,7 @@ def get_sphinx_domain(func: Callable, module_mapping: Mapping[str, str] = MODULE
     try:
         _module = func.__module__
     except AttributeError:  # Unbound methods don't have the `__module__` attribute
-        _module = func.__objclass__.__module__
+        _module = func.__objclass__.__module__  # type: ignore
 
     # Convert the extracted __module__ into an actual valid module
     module = MODULE_DICT.get(_module, _module)

assertionlib/manager.py

@@ -253,11 +253,11 @@ def __new__(mcls, name, bases, namespace) -> '_MetaAM':
 
         # On windows os.path.isdir is an alias for the ._isdir function
         if os.name == 'nt':
-            cls.isdir = cls._isdir
-            cls.isdir.__name__ = 'isdir'
-            cls.isdir.__qualname__ = 'isdir'
-            cls.isdir.__doc__ = cls.isdir.__doc__.replace('_isdir', 'isdir')
-            del cls._isdir
+            cls.isdir = cls._isdir  # type: ignore
+            cls.isdir.__name__ = 'isdir'  # type: ignore
+            cls.isdir.__qualname__ = 'isdir'  # type: ignore
+            cls.isdir.__doc__ = cls.isdir.__doc__.replace('_isdir', 'isdir')  # type: ignore
+            del cls._isdir  # type: ignore
         return cls
 
 
@@ -349,7 +349,7 @@ def assert_(self, func: Callable[..., T], *args: Any, invert: bool = False,
 
         Parameters
         ----------
-        func : :data:`coollections.abc.Callable`
+        func : :class:`~collections.abc.Callable`
             The callable whose output will be evaluated.
 
         \*args : :data:`~typing.Any`
@@ -607,7 +607,7 @@ def _get_exc_signature(signature: inspect.Signature, args: Sequence[str],
 
         """  # noqa
         # Unpack parameters
-        empty = inspect._empty
+        empty = inspect._empty  # type: ignore
         Parameter = inspect.Parameter
         parameters = signature.parameters
         kind = Parameter.POSITIONAL_OR_KEYWORD