Bump to 1.0.5 (#17)

* Bump to 1.0.5

* Embed fixed type hints
* simplify imports (due to typing requirement)
* voting mypy

Author: penguinolog

.travis.yml

@@ -7,8 +7,8 @@ python:
 - 3.5
 - 3.6
 - &mainstream_python 3.7-dev
-- &pypy pypy
-- pypy3.5
+- pypy
+- &pypy pypy3.5
 install:
 - &upgrade_python_toolset pip install --upgrade pip setuptools wheel
 - pip install tox-travis
@@ -27,7 +27,7 @@ jobs:
     - *upgrade_python_toolset
     - pip install tox
     script:
-    - tox -e pylint,bandit
+    - tox -e pylint,bandit,mypy
     after_success: skip
 
   - stage: Code style check

advanced_descriptors/__init__.py

@@ -21,7 +21,7 @@
     'AdvancedProperty',
 )
 
-__version__ = '1.0.4'
+__version__ = '1.0.5'
 __author__ = "Alexey Stepanov"
 __author_email__ = 'penguinolog@gmail.com'
 __maintainers__ = {

advanced_descriptors/advanced_property.py

@@ -15,10 +15,7 @@
 
 """Property with class-wide getter."""
 
-try:  # pragma: no cover
-    import typing  # noqa  # pylint: disable=unused-import
-except ImportError:  # pragma: no cover
-    typing = None
+import typing  # noqa: F401  # pylint: disable=unused-import
 
 __all__ = (
     'AdvancedProperty',
@@ -153,8 +150,8 @@ def __init__(
 
     def __get__(
         self,
-        instance,  # type: typing.Optional[object]
-        owner  # type: typing.Type[object]
+        instance,  # type: typing.Optional[typing.Any]
+        owner  # type: typing.Any
     ):  # type: (...) -> typing.Any
         """Get descriptor.
 

advanced_descriptors/advanced_property.pyi

@@ -15,13 +15,9 @@
 
 """Separate class and instance methods with the same name."""
 
-import six
+import typing  # noqa: F401  # pylint: disable=unused-import
 
-try:  # pragma: no cover
-    import typing  # pylint: disable=unused-import
-except ImportError:  # pragma: no cover
-    # noinspection PyRedeclaration
-    typing = None
+import six
 
 __all__ = (
     'SeparateClassMethod',
@@ -118,8 +114,8 @@ def __init__(
 
     def __get__(
         self,
-        instance,  # type: typing.Optional[object]
-        owner  # type: typing.Type[object]
+        instance,  # type: typing.Optional[typing.Any]
+        owner  # type: typing.Any
     ):  # type: (...) -> typing.Callable[..., typing.Any]
         """Get descriptor.
 
@@ -131,16 +127,16 @@ def __get__(
                 raise AttributeError()
 
             @six.wraps(self.__class_method)
-            def class_method(*args, **kwargs):
+            def class_method(*args, **kwargs):  # type: (typing.Tuple, typing.Dict) -> typing.Any
                 """Bound class method."""
-                return self.__class_method(owner, *args, **kwargs)
+                return self.__class_method(owner, *args, **kwargs)  # type: ignore
 
             return class_method
 
         @six.wraps(self.__instance_method)
-        def instance_method(*args, **kwargs):
+        def instance_method(*args, **kwargs):  # type: (typing.Tuple, typing.Dict) -> typing.Any
             """Bound instance method."""
-            return self.__instance_method(instance, *args, **kwargs)
+            return self.__instance_method(instance, *args, **kwargs)  # type: ignore
 
         return instance_method
 

advanced_descriptors/separate_class_method.py

@@ -70,6 +70,7 @@ def _extension(modpath):
         binding=True,
         embedsignature=True,
         overflowcheck=True,
+        language_level=3,
     )
 ) if cythonize is not None and PY3 else []
 

advanced_descriptors/separate_class_method.pyi

@@ -5,7 +5,7 @@
 
 [tox]
 minversion = 2.0
-envlist = pep8, pep257, py{27,34,35,36,37,py,py3}, pylint, bandit, py{34,35,36,37}-nocov, docs,
+envlist = pep8, pylint, mypy, bandit, pep257, py{27,34,35,36,37,py,py3}, py{34,35,36,37}-nocov, docs,
 skipsdist = True
 skip_missing_interpreters = True
 
@@ -87,7 +87,7 @@ commands = pip install ./ -vvv -U
 
 [testenv:pylint]
 deps =
-    pylint
+    pylint<2
     -r{toxinidir}/CI_REQUIREMENTS.txt
 commands = pylint advanced_descriptors
 
@@ -123,3 +123,9 @@ deps =
     .
     pipdeptree
 commands = pipdeptree
+
+[testenv:mypy]
+deps =
+    mypy>=0.620
+    -r{toxinidir}/CI_REQUIREMENTS.txt
+commands = mypy --strict advanced_descriptors